Merge pull request #928 from winsvega/solremove

remove sha256 and rmd160 hash

6 files changed, 16 insertions, 486 deletions

diff --git a/libdevcore/Hash.cpp b/libdevcore/Hash.cpp
deleted file mode 100644
index c6b917b9..00000000
--- a/libdevcore/Hash.cpp
+++ /dev/null
@@ -1,440 +0,0 @@
-/*
-	This file is part of cpp-ethereum.
-
-	cpp-ethereum is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	cpp-ethereum is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/** @file Hash.cpp
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- */
-
-#include "Hash.h"
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include "picosha2.h"
-using namespace std;
-using namespace dev;
-
-namespace dev
-{
-
-h256 sha256(bytesConstRef _input)
-{
-	h256 ret;
-	picosha2::hash256(_input.begin(), _input.end(), ret.data(), ret.data() + 32);
-	return ret;
-}
-
-namespace rmd160
-{
-
-/********************************************************************\
- *
- *      FILE:     rmd160.h
- *      FILE:     rmd160.c
- *
- *      CONTENTS: Header file for a sample C-implementation of the
- *                RIPEMD-160 hash-function.
- *      TARGET:   any computer with an ANSI C compiler
- *
- *      AUTHOR:   Antoon Bosselaers, ESAT-COSIC
- *      DATE:     1 March 1996
- *      VERSION:  1.0
- *
- *      Copyright (c) Katholieke Universiteit Leuven
- *      1996, All Rights Reserved
- *
- \********************************************************************/
-
-// Adapted into "header-only" format by Gav Wood.
-
-/* macro definitions */
-
-#define RMDsize 160
-
-/* collect four bytes into one word: */
-#define BYTES_TO_DWORD(strptr)                    \
-(((uint32_t) *((strptr)+3) << 24) | \
-((uint32_t) *((strptr)+2) << 16) | \
-((uint32_t) *((strptr)+1) <<  8) | \
-((uint32_t) *(strptr)))
-
-/* ROL(x, n) cyclically rotates x over n bits to the left */
-/* x must be of an unsigned 32 bits type and 0 <= n < 32. */
-#define ROL(x, n)        (((x) << (n)) | ((x) >> (32-(n))))
-
-/* the five basic functions F(), G() and H() */
-#define F(x, y, z)        ((x) ^ (y) ^ (z))
-#define G(x, y, z)        (((x) & (y)) | (~(x) & (z)))
-#define H(x, y, z)        (((x) | ~(y)) ^ (z))
-#define I(x, y, z)        (((x) & (z)) | ((y) & ~(z)))
-#define J(x, y, z)        ((x) ^ ((y) | ~(z)))
-
-/* the ten basic operations FF() through III() */
-#define FF(a, b, c, d, e, x, s)        {\
-(a) += F((b), (c), (d)) + (x);\
-(a) = ROL((a), (s)) + (e);\
-(c) = ROL((c), 10);\
-}
-#define GG(a, b, c, d, e, x, s)        {\
-(a) += G((b), (c), (d)) + (x) + 0x5a827999UL;\
-(a) = ROL((a), (s)) + (e);\
-(c) = ROL((c), 10);\
-}
-#define HH(a, b, c, d, e, x, s)        {\
-(a) += H((b), (c), (d)) + (x) + 0x6ed9eba1UL;\
-(a) = ROL((a), (s)) + (e);\
-(c) = ROL((c), 10);\
-}
-#define II(a, b, c, d, e, x, s)        {\
-(a) += I((b), (c), (d)) + (x) + 0x8f1bbcdcUL;\
-(a) = ROL((a), (s)) + (e);\
-(c) = ROL((c), 10);\
-}
-#define JJ(a, b, c, d, e, x, s)        {\
-(a) += J((b), (c), (d)) + (x) + 0xa953fd4eUL;\
-(a) = ROL((a), (s)) + (e);\
-(c) = ROL((c), 10);\
-}
-#define FFF(a, b, c, d, e, x, s)        {\
-(a) += F((b), (c), (d)) + (x);\
-(a) = ROL((a), (s)) + (e);\
-(c) = ROL((c), 10);\
-}
-#define GGG(a, b, c, d, e, x, s)        {\
-(a) += G((b), (c), (d)) + (x) + 0x7a6d76e9UL;\
-(a) = ROL((a), (s)) + (e);\
-(c) = ROL((c), 10);\
-}
-#define HHH(a, b, c, d, e, x, s)        {\
-(a) += H((b), (c), (d)) + (x) + 0x6d703ef3UL;\
-(a) = ROL((a), (s)) + (e);\
-(c) = ROL((c), 10);\
-}
-#define III(a, b, c, d, e, x, s)        {\
-(a) += I((b), (c), (d)) + (x) + 0x5c4dd124UL;\
-(a) = ROL((a), (s)) + (e);\
-(c) = ROL((c), 10);\
-}
-#define JJJ(a, b, c, d, e, x, s)        {\
-(a) += J((b), (c), (d)) + (x) + 0x50a28be6UL;\
-(a) = ROL((a), (s)) + (e);\
-(c) = ROL((c), 10);\
-}
-
-void MDinit(uint32_t *MDbuf)
-{
-	MDbuf[0] = 0x67452301UL;
-	MDbuf[1] = 0xefcdab89UL;
-	MDbuf[2] = 0x98badcfeUL;
-	MDbuf[3] = 0x10325476UL;
-	MDbuf[4] = 0xc3d2e1f0UL;
-
-	return;
-}
-
-/********************************************************************/
-
-void MDcompress(uint32_t *MDbuf, uint32_t *X)
-{
-	uint32_t aa = MDbuf[0],  bb = MDbuf[1],  cc = MDbuf[2],
-	dd = MDbuf[3],  ee = MDbuf[4];
-	uint32_t aaa = MDbuf[0], bbb = MDbuf[1], ccc = MDbuf[2],
-	ddd = MDbuf[3], eee = MDbuf[4];
-
-	/* round 1 */
-	FF(aa, bb, cc, dd, ee, X[ 0], 11);
-	FF(ee, aa, bb, cc, dd, X[ 1], 14);
-	FF(dd, ee, aa, bb, cc, X[ 2], 15);
-	FF(cc, dd, ee, aa, bb, X[ 3], 12);
-	FF(bb, cc, dd, ee, aa, X[ 4],  5);
-	FF(aa, bb, cc, dd, ee, X[ 5],  8);
-	FF(ee, aa, bb, cc, dd, X[ 6],  7);
-	FF(dd, ee, aa, bb, cc, X[ 7],  9);
-	FF(cc, dd, ee, aa, bb, X[ 8], 11);
-	FF(bb, cc, dd, ee, aa, X[ 9], 13);
-	FF(aa, bb, cc, dd, ee, X[10], 14);
-	FF(ee, aa, bb, cc, dd, X[11], 15);
-	FF(dd, ee, aa, bb, cc, X[12],  6);
-	FF(cc, dd, ee, aa, bb, X[13],  7);
-	FF(bb, cc, dd, ee, aa, X[14],  9);
-	FF(aa, bb, cc, dd, ee, X[15],  8);
-
-	/* round 2 */
-	GG(ee, aa, bb, cc, dd, X[ 7],  7);
-	GG(dd, ee, aa, bb, cc, X[ 4],  6);
-	GG(cc, dd, ee, aa, bb, X[13],  8);
-	GG(bb, cc, dd, ee, aa, X[ 1], 13);
-	GG(aa, bb, cc, dd, ee, X[10], 11);
-	GG(ee, aa, bb, cc, dd, X[ 6],  9);
-	GG(dd, ee, aa, bb, cc, X[15],  7);
-	GG(cc, dd, ee, aa, bb, X[ 3], 15);
-	GG(bb, cc, dd, ee, aa, X[12],  7);
-	GG(aa, bb, cc, dd, ee, X[ 0], 12);
-	GG(ee, aa, bb, cc, dd, X[ 9], 15);
-	GG(dd, ee, aa, bb, cc, X[ 5],  9);
-	GG(cc, dd, ee, aa, bb, X[ 2], 11);
-	GG(bb, cc, dd, ee, aa, X[14],  7);
-	GG(aa, bb, cc, dd, ee, X[11], 13);
-	GG(ee, aa, bb, cc, dd, X[ 8], 12);
-
-	/* round 3 */
-	HH(dd, ee, aa, bb, cc, X[ 3], 11);
-	HH(cc, dd, ee, aa, bb, X[10], 13);
-	HH(bb, cc, dd, ee, aa, X[14],  6);
-	HH(aa, bb, cc, dd, ee, X[ 4],  7);
-	HH(ee, aa, bb, cc, dd, X[ 9], 14);
-	HH(dd, ee, aa, bb, cc, X[15],  9);
-	HH(cc, dd, ee, aa, bb, X[ 8], 13);
-	HH(bb, cc, dd, ee, aa, X[ 1], 15);
-	HH(aa, bb, cc, dd, ee, X[ 2], 14);
-	HH(ee, aa, bb, cc, dd, X[ 7],  8);
-	HH(dd, ee, aa, bb, cc, X[ 0], 13);
-	HH(cc, dd, ee, aa, bb, X[ 6],  6);
-	HH(bb, cc, dd, ee, aa, X[13],  5);
-	HH(aa, bb, cc, dd, ee, X[11], 12);
-	HH(ee, aa, bb, cc, dd, X[ 5],  7);
-	HH(dd, ee, aa, bb, cc, X[12],  5);
-
-	/* round 4 */
-	II(cc, dd, ee, aa, bb, X[ 1], 11);
-	II(bb, cc, dd, ee, aa, X[ 9], 12);
-	II(aa, bb, cc, dd, ee, X[11], 14);
-	II(ee, aa, bb, cc, dd, X[10], 15);
-	II(dd, ee, aa, bb, cc, X[ 0], 14);
-	II(cc, dd, ee, aa, bb, X[ 8], 15);
-	II(bb, cc, dd, ee, aa, X[12],  9);
-	II(aa, bb, cc, dd, ee, X[ 4],  8);
-	II(ee, aa, bb, cc, dd, X[13],  9);
-	II(dd, ee, aa, bb, cc, X[ 3], 14);
-	II(cc, dd, ee, aa, bb, X[ 7],  5);
-	II(bb, cc, dd, ee, aa, X[15],  6);
-	II(aa, bb, cc, dd, ee, X[14],  8);
-	II(ee, aa, bb, cc, dd, X[ 5],  6);
-	II(dd, ee, aa, bb, cc, X[ 6],  5);
-	II(cc, dd, ee, aa, bb, X[ 2], 12);
-
-	/* round 5 */
-	JJ(bb, cc, dd, ee, aa, X[ 4],  9);
-	JJ(aa, bb, cc, dd, ee, X[ 0], 15);
-	JJ(ee, aa, bb, cc, dd, X[ 5],  5);
-	JJ(dd, ee, aa, bb, cc, X[ 9], 11);
-	JJ(cc, dd, ee, aa, bb, X[ 7],  6);
-	JJ(bb, cc, dd, ee, aa, X[12],  8);
-	JJ(aa, bb, cc, dd, ee, X[ 2], 13);
-	JJ(ee, aa, bb, cc, dd, X[10], 12);
-	JJ(dd, ee, aa, bb, cc, X[14],  5);
-	JJ(cc, dd, ee, aa, bb, X[ 1], 12);
-	JJ(bb, cc, dd, ee, aa, X[ 3], 13);
-	JJ(aa, bb, cc, dd, ee, X[ 8], 14);
-	JJ(ee, aa, bb, cc, dd, X[11], 11);
-	JJ(dd, ee, aa, bb, cc, X[ 6],  8);
-	JJ(cc, dd, ee, aa, bb, X[15],  5);
-	JJ(bb, cc, dd, ee, aa, X[13],  6);
-
-	/* parallel round 1 */
-	JJJ(aaa, bbb, ccc, ddd, eee, X[ 5],  8);
-	JJJ(eee, aaa, bbb, ccc, ddd, X[14],  9);
-	JJJ(ddd, eee, aaa, bbb, ccc, X[ 7],  9);
-	JJJ(ccc, ddd, eee, aaa, bbb, X[ 0], 11);
-	JJJ(bbb, ccc, ddd, eee, aaa, X[ 9], 13);
-	JJJ(aaa, bbb, ccc, ddd, eee, X[ 2], 15);
-	JJJ(eee, aaa, bbb, ccc, ddd, X[11], 15);
-	JJJ(ddd, eee, aaa, bbb, ccc, X[ 4],  5);
-	JJJ(ccc, ddd, eee, aaa, bbb, X[13],  7);
-	JJJ(bbb, ccc, ddd, eee, aaa, X[ 6],  7);
-	JJJ(aaa, bbb, ccc, ddd, eee, X[15],  8);
-	JJJ(eee, aaa, bbb, ccc, ddd, X[ 8], 11);
-	JJJ(ddd, eee, aaa, bbb, ccc, X[ 1], 14);
-	JJJ(ccc, ddd, eee, aaa, bbb, X[10], 14);
-	JJJ(bbb, ccc, ddd, eee, aaa, X[ 3], 12);
-	JJJ(aaa, bbb, ccc, ddd, eee, X[12],  6);
-
-	/* parallel round 2 */
-	III(eee, aaa, bbb, ccc, ddd, X[ 6],  9);
-	III(ddd, eee, aaa, bbb, ccc, X[11], 13);
-	III(ccc, ddd, eee, aaa, bbb, X[ 3], 15);
-	III(bbb, ccc, ddd, eee, aaa, X[ 7],  7);
-	III(aaa, bbb, ccc, ddd, eee, X[ 0], 12);
-	III(eee, aaa, bbb, ccc, ddd, X[13],  8);
-	III(ddd, eee, aaa, bbb, ccc, X[ 5],  9);
-	III(ccc, ddd, eee, aaa, bbb, X[10], 11);
-	III(bbb, ccc, ddd, eee, aaa, X[14],  7);
-	III(aaa, bbb, ccc, ddd, eee, X[15],  7);
-	III(eee, aaa, bbb, ccc, ddd, X[ 8], 12);
-	III(ddd, eee, aaa, bbb, ccc, X[12],  7);
-	III(ccc, ddd, eee, aaa, bbb, X[ 4],  6);
-	III(bbb, ccc, ddd, eee, aaa, X[ 9], 15);
-	III(aaa, bbb, ccc, ddd, eee, X[ 1], 13);
-	III(eee, aaa, bbb, ccc, ddd, X[ 2], 11);
-
-	/* parallel round 3 */
-	HHH(ddd, eee, aaa, bbb, ccc, X[15],  9);
-	HHH(ccc, ddd, eee, aaa, bbb, X[ 5],  7);
-	HHH(bbb, ccc, ddd, eee, aaa, X[ 1], 15);
-	HHH(aaa, bbb, ccc, ddd, eee, X[ 3], 11);
-	HHH(eee, aaa, bbb, ccc, ddd, X[ 7],  8);
-	HHH(ddd, eee, aaa, bbb, ccc, X[14],  6);
-	HHH(ccc, ddd, eee, aaa, bbb, X[ 6],  6);
-	HHH(bbb, ccc, ddd, eee, aaa, X[ 9], 14);
-	HHH(aaa, bbb, ccc, ddd, eee, X[11], 12);
-	HHH(eee, aaa, bbb, ccc, ddd, X[ 8], 13);
-	HHH(ddd, eee, aaa, bbb, ccc, X[12],  5);
-	HHH(ccc, ddd, eee, aaa, bbb, X[ 2], 14);
-	HHH(bbb, ccc, ddd, eee, aaa, X[10], 13);
-	HHH(aaa, bbb, ccc, ddd, eee, X[ 0], 13);
-	HHH(eee, aaa, bbb, ccc, ddd, X[ 4],  7);
-	HHH(ddd, eee, aaa, bbb, ccc, X[13],  5);
-
-	/* parallel round 4 */
-	GGG(ccc, ddd, eee, aaa, bbb, X[ 8], 15);
-	GGG(bbb, ccc, ddd, eee, aaa, X[ 6],  5);
-	GGG(aaa, bbb, ccc, ddd, eee, X[ 4],  8);
-	GGG(eee, aaa, bbb, ccc, ddd, X[ 1], 11);
-	GGG(ddd, eee, aaa, bbb, ccc, X[ 3], 14);
-	GGG(ccc, ddd, eee, aaa, bbb, X[11], 14);
-	GGG(bbb, ccc, ddd, eee, aaa, X[15],  6);
-	GGG(aaa, bbb, ccc, ddd, eee, X[ 0], 14);
-	GGG(eee, aaa, bbb, ccc, ddd, X[ 5],  6);
-	GGG(ddd, eee, aaa, bbb, ccc, X[12],  9);
-	GGG(ccc, ddd, eee, aaa, bbb, X[ 2], 12);
-	GGG(bbb, ccc, ddd, eee, aaa, X[13],  9);
-	GGG(aaa, bbb, ccc, ddd, eee, X[ 9], 12);
-	GGG(eee, aaa, bbb, ccc, ddd, X[ 7],  5);
-	GGG(ddd, eee, aaa, bbb, ccc, X[10], 15);
-	GGG(ccc, ddd, eee, aaa, bbb, X[14],  8);
-
-	/* parallel round 5 */
-	FFF(bbb, ccc, ddd, eee, aaa, X[12] ,  8);
-	FFF(aaa, bbb, ccc, ddd, eee, X[15] ,  5);
-	FFF(eee, aaa, bbb, ccc, ddd, X[10] , 12);
-	FFF(ddd, eee, aaa, bbb, ccc, X[ 4] ,  9);
-	FFF(ccc, ddd, eee, aaa, bbb, X[ 1] , 12);
-	FFF(bbb, ccc, ddd, eee, aaa, X[ 5] ,  5);
-	FFF(aaa, bbb, ccc, ddd, eee, X[ 8] , 14);
-	FFF(eee, aaa, bbb, ccc, ddd, X[ 7] ,  6);
-	FFF(ddd, eee, aaa, bbb, ccc, X[ 6] ,  8);
-	FFF(ccc, ddd, eee, aaa, bbb, X[ 2] , 13);
-	FFF(bbb, ccc, ddd, eee, aaa, X[13] ,  6);
-	FFF(aaa, bbb, ccc, ddd, eee, X[14] ,  5);
-	FFF(eee, aaa, bbb, ccc, ddd, X[ 0] , 15);
-	FFF(ddd, eee, aaa, bbb, ccc, X[ 3] , 13);
-	FFF(ccc, ddd, eee, aaa, bbb, X[ 9] , 11);
-	FFF(bbb, ccc, ddd, eee, aaa, X[11] , 11);
-
-	/* combine results */
-	ddd += cc + MDbuf[1];               /* final result for MDbuf[0] */
-	MDbuf[1] = MDbuf[2] + dd + eee;
-	MDbuf[2] = MDbuf[3] + ee + aaa;
-	MDbuf[3] = MDbuf[4] + aa + bbb;
-	MDbuf[4] = MDbuf[0] + bb + ccc;
-	MDbuf[0] = ddd;
-
-	return;
-}
-
-void MDfinish(uint32_t *MDbuf, byte const *strptr, uint32_t lswlen, uint32_t mswlen)
-{
-	unsigned int i;                                 /* counter       */
-	uint32_t        X[16];                             /* message words */
-
-	memset(X, 0, 16*sizeof(uint32_t));
-
-	/* put bytes from strptr into X */
-	for (i=0; i<(lswlen&63); i++) {
-		/* byte i goes into word X[i div 4] at pos.  8*(i mod 4)  */
-		X[i>>2] ^= (uint32_t) *strptr++ << (8 * (i&3));
-	}
-
-	/* append the bit m_n == 1 */
-	X[(lswlen>>2)&15] ^= (uint32_t)1 << (8*(lswlen&3) + 7);
-
-	if ((lswlen & 63) > 55) {
-		/* length goes to next block */
-		MDcompress(MDbuf, X);
-		memset(X, 0, 16*sizeof(uint32_t));
-	}
-
-	/* append length in bits*/
-	X[14] = lswlen << 3;
-	X[15] = (lswlen >> 29) | (mswlen << 3);
-	MDcompress(MDbuf, X);
-
-	return;
-}
-
-#undef ROL
-#undef F
-#undef G
-#undef H
-#undef I
-#undef J
-#undef FF
-#undef GG
-#undef HH
-#undef II
-#undef JJ
-#undef FFF
-#undef GGG
-#undef HHH
-#undef III
-#undef JJJ
-
-}
-
-/*
- * @returns RMD(_input)
- */
-h160 ripemd160(bytesConstRef _input)
-{
-	h160 hashcode;
-	uint32_t buffer[RMDsize / 32];		// contains (A, B, C, D(, E))
-	uint32_t current[16];				// current 16-word chunk
-
-	// initialize
-	rmd160::MDinit(buffer);
-	byte const* message = _input.data();
-	uint32_t remaining = _input.size();	// # of bytes not yet processed
-
-	// process message in 16x 4-byte chunks
-	for (; remaining >= 64; remaining -= 64)
-	{
-		for (unsigned i = 0; i < 16; i++)
-		{
-			current[i] = BYTES_TO_DWORD(message);
-			message += 4;
-		}
-		rmd160::MDcompress(buffer, current);
-	}
-	// length mod 64 bytes left
-
-	// finish:
-	rmd160::MDfinish(buffer, message, _input.size(), 0);
-
-	for (unsigned i = 0; i < RMDsize / 8; i += 4)
-	{
-		hashcode[i] = buffer[i >> 2];				//  implicit cast to byte
-		hashcode[i + 1] = (buffer[i >> 2] >> 8);	//extracts the 8 least
-		hashcode[i + 2] = (buffer[i >> 2] >> 16);	// significant bits.
-		hashcode[i + 3] = (buffer[i >> 2] >> 24);
-	}
-
-	return hashcode;
-}
-
-#undef BYTES_TO_DWORD
-#undef RMDsize
-
-}
diff --git a/libdevcore/Hash.h b/libdevcore/Hash.h
deleted file mode 100644
index d4401014..00000000
--- a/libdevcore/Hash.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-	This file is part of cpp-ethereum.
-
-	cpp-ethereum is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	cpp-ethereum is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/** @file Hash.h
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- *
- * The FixedHash fixed-size "hash" container type.
- */
-
-#pragma once
-
-#include <string>
-#include "FixedHash.h"
-#include "vector_ref.h"
-#include "SHA3.h"
-
-namespace dev
-{
-
-h256 sha256(bytesConstRef _input);
-
-h160 ripemd160(bytesConstRef _input);
-
-}
diff --git a/test/contracts/AuctionRegistrar.cpp b/test/contracts/AuctionRegistrar.cpp
index 8860727d..bb2e5663 100644
--- a/test/contracts/AuctionRegistrar.cpp
+++ b/test/contracts/AuctionRegistrar.cpp
@@ -24,7 +24,6 @@
 #include <tuple>
 #include <boost/test/unit_test.hpp>
 #include <libdevcore/ABI.h>
-#include <libdevcore/Hash.h>
 #include <test/libsolidity/SolidityExecutionFramework.h>
 
 using namespace std;
diff --git a/test/contracts/FixedFeeRegistrar.cpp b/test/contracts/FixedFeeRegistrar.cpp
index 63db0531..6d79bec6 100644
--- a/test/contracts/FixedFeeRegistrar.cpp
+++ b/test/contracts/FixedFeeRegistrar.cpp
@@ -32,7 +32,6 @@
 #pragma warning(pop)
 #endif
 
-#include <libdevcore/Hash.h>
 #include <test/libsolidity/SolidityExecutionFramework.h>
 
 using namespace std;
diff --git a/test/contracts/Wallet.cpp b/test/contracts/Wallet.cpp
index 27bdb396..7a9b0b17 100644
--- a/test/contracts/Wallet.cpp
+++ b/test/contracts/Wallet.cpp
@@ -32,7 +32,6 @@
 #pragma warning(pop)
 #endif
 
-#include <libdevcore/Hash.h>
 #include <test/libsolidity/SolidityExecutionFramework.h>
 
 using namespace std;
diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index 4e6f68b0..45f6aec5 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -25,7 +25,6 @@
 #include <string>
 #include <tuple>
 #include <boost/test/unit_test.hpp>
-#include <libdevcore/Hash.h>
 #include <libsolidity/interface/Exceptions.h>
 #include <test/libsolidity/SolidityExecutionFramework.h>
 
@@ -1700,9 +1699,15 @@ BOOST_AUTO_TEST_CASE(sha256)
 							 "  }\n"
 							 "}\n";
 	compileAndRun(sourceCode);
-	auto f = [&](u256 const& _input) -> u256
+	auto f = [&](u256 const& _x) -> bytes
 	{
-		return dev::sha256(dev::ref(toBigEndian(_input)));
+		if (_x == u256(4))
+			return fromHex("e38990d0c7fc009880a9c07c23842e886c6bbdc964ce6bdd5817ad357335ee6f");
+		if (_x == u256(5))
+			return fromHex("96de8fc8c256fa1e1556d41af431cace7dca68707c78dd88c3acab8b17164c47");
+		if (_x == u256(-1))
+			return fromHex("af9613760f72635fbdb44a5a0a63c39f12af30f950a6ee5c971be188e89c4051");
+		return fromHex("");
 	};
 	testSolidityAgainstCpp("a(bytes32)", f, u256(4));
 	testSolidityAgainstCpp("a(bytes32)", f, u256(5));
@@ -1717,9 +1722,15 @@ BOOST_AUTO_TEST_CASE(ripemd)
 							 "  }\n"
 							 "}\n";
 	compileAndRun(sourceCode);
-	auto f = [&](u256 const& _input) -> u256
+	auto f = [&](u256 const& _x) -> bytes
 	{
-		return h256(dev::ripemd160(h256(_input).ref()), h256::AlignLeft);	// This should be aligned right. i guess it's fixed elsewhere?
+		if (_x == u256(4))
+			return fromHex("1b0f3c404d12075c68c938f9f60ebea4f74941a0000000000000000000000000");
+		if (_x == u256(5))
+			return fromHex("ee54aa84fc32d8fed5a5fe160442ae84626829d9000000000000000000000000");
+		if (_x == u256(-1))
+			return fromHex("1cf4e77f5966e13e109703cd8a0df7ceda7f3dc3000000000000000000000000");
+		return fromHex("");
 	};
 	testSolidityAgainstCpp("a(bytes32)", f, u256(4));
 	testSolidityAgainstCpp("a(bytes32)", f, u256(5));