Refactor AES128-CTR

ethereum · Mar 14, 2017 · 0dac6ca · 0dac6ca
1 parent 61ae37e
commit 0dac6ca
Show file tree

Hide file tree

Showing 8 changed files with 168 additions and 207 deletions.
diff --git a/libdevcrypto/AES.cpp b/libdevcrypto/AES.cpp
diff --git a/libdevcrypto/AES.h b/libdevcrypto/AES.h
@@ -24,12 +24,24 @@
 
 #pragma once
 
-#include "Common.h"
+#include <libdevcore/FixedHash.h>
 
 namespace dev
 {
 
-void AES128_CTR_process_buffer(uint8_t* output, const uint8_t* input, uint32_t length, const uint8_t* key, const uint8_t* iv);
+/// Encrypts payload with specified IV/ctr using AES128-CTR.
+bytes encryptAES128CTR(bytesConstRef _k, h128 const& _iv, bytesConstRef _plain);
+
+/// Decrypts payload with specified IV/ctr using AES128-CTR.
+bytesSec decryptAES128CTR(bytesConstRef _k, h128 const& _iv, bytesConstRef _cipher);
+
+/// Encrypts payload with specified IV/ctr using AES128-CTR.
+inline bytes encryptSymNoAuth(SecureFixedHash<16> const& _k, h128 const& _iv, bytesConstRef _plain) { return encryptAES128CTR(_k.ref(), _iv, _plain); }
+inline bytes encryptSymNoAuth(SecureFixedHash<32> const& _k, h128 const& _iv, bytesConstRef _plain) { return encryptAES128CTR(_k.ref(), _iv, _plain); }
+
+/// Decrypts payload with specified IV/ctr using AES128-CTR.
+inline bytesSec decryptSymNoAuth(SecureFixedHash<16> const& _k, h128 const& _iv, bytesConstRef _cipher) { return decryptAES128CTR(_k.ref(), _iv, _cipher); }
+inline bytesSec decryptSymNoAuth(SecureFixedHash<32> const& _k, h128 const& _iv, bytesConstRef _cipher) { return decryptAES128CTR(_k.ref(), _iv, _cipher); }
 
 bytes aesDecrypt(bytesConstRef _cipher, std::string const& _password, unsigned _rounds = 2000, bytesConstRef _salt = bytesConstRef());
 

diff --git a/libdevcrypto/Common.cpp b/libdevcrypto/Common.cpp
@@ -161,26 +161,6 @@ std::pair<bytes, h128> dev::encryptSymNoAuth(SecureFixedHash<16> const& _k, byte
 	return make_pair(encryptSymNoAuth(_k, iv, _plain), iv);
 }
 
-bytes dev::encryptAES128CTR(bytesConstRef _k, h128 const& _iv, bytesConstRef _plain)
-{
-	if (_k.size() != 16)
-		return {};
-
-	bytes ret(_plain.size());
-	AES128_CTR_process_buffer(ret.data(), _plain.data(), _plain.size(), _k.data(), _iv.data());
-	return ret;
-}
-
-bytesSec dev::decryptAES128CTR(bytesConstRef _k, h128 const& _iv, bytesConstRef _cipher)
-{
-	if (_k.size() != 16)
-		return {};
-
-	bytesSec ret(_cipher.size());
-	AES128_CTR_process_buffer(ret.writable().data(), _cipher.data(), _cipher.size(), _k.data(), _iv.data());
-	return ret;
-}
-
 Public dev::recover(Signature const& _sig, h256 const& _message)
 {
 	int v = _sig[64];

diff --git a/libdevcrypto/Common.h b/libdevcrypto/Common.h
@@ -115,26 +115,12 @@ bool decryptECIES(Secret const& _k, bytesConstRef _sharedMacData, bytesConstRef
 /// Encrypts payload with random IV/ctr using AES128-CTR.
 std::pair<bytes, h128> encryptSymNoAuth(SecureFixedHash<16> const& _k, bytesConstRef _plain);
 
-/// Encrypts payload with specified IV/ctr using AES128-CTR.
-bytes encryptAES128CTR(bytesConstRef _k, h128 const& _iv, bytesConstRef _plain);
-
-/// Decrypts payload with specified IV/ctr using AES128-CTR.
-bytesSec decryptAES128CTR(bytesConstRef _k, h128 const& _iv, bytesConstRef _cipher);
-
-/// Encrypts payload with specified IV/ctr using AES128-CTR.
-inline bytes encryptSymNoAuth(SecureFixedHash<16> const& _k, h128 const& _iv, bytesConstRef _plain) { return encryptAES128CTR(_k.ref(), _iv, _plain); }
-inline bytes encryptSymNoAuth(SecureFixedHash<32> const& _k, h128 const& _iv, bytesConstRef _plain) { return encryptAES128CTR(_k.ref(), _iv, _plain); }
-
-/// Decrypts payload with specified IV/ctr using AES128-CTR.
-inline bytesSec decryptSymNoAuth(SecureFixedHash<16> const& _k, h128 const& _iv, bytesConstRef _cipher) { return decryptAES128CTR(_k.ref(), _iv, _cipher); }
-inline bytesSec decryptSymNoAuth(SecureFixedHash<32> const& _k, h128 const& _iv, bytesConstRef _cipher) { return decryptAES128CTR(_k.ref(), _iv, _cipher); }
-
 /// Recovers Public key from signed message hash.
 Public recover(Signature const& _sig, h256 const& _hash);
-	
+
 /// Returns siganture of message hash.
 Signature sign(Secret const& _k, h256 const& _hash);
-	
+
 /// Verify signature.
 bool verify(Public const& _k, Signature const& _s, h256 const& _hash);
 

diff --git a/libdevcrypto/CryptoPP.cpp b/libdevcrypto/CryptoPP.cpp
@@ -27,6 +27,7 @@
 #include <libdevcore/Assertions.h>
 #include <libdevcore/SHA3.h>
 #include "ECDHE.h"
+#include "AES.h"
 
 static_assert(CRYPTOPP_VERSION == 570, "Wrong Crypto++ version");
 

diff --git a/libdevcrypto/SecretStore.cpp b/libdevcrypto/SecretStore.cpp
@@ -30,6 +30,8 @@
 #include <libdevcore/FileSystem.h>
 #include <json_spirit/JsonSpiritHeaders.h>
 #include <libdevcrypto/Exceptions.h>
+#include "AES.h"
+
 using namespace std;
 using namespace dev;
 namespace js = json_spirit;

diff --git a/libethcore/KeyManager.cpp b/libethcore/KeyManager.cpp
@@ -21,13 +21,14 @@
 
 #include "KeyManager.h"
 #include <thread>
-#include <mutex>
 #include <boost/filesystem.hpp>
 #include <json_spirit/JsonSpiritHeaders.h>
 #include <libdevcore/Log.h>
 #include <libdevcore/Guards.h>
 #include <libdevcore/RLP.h>
 #include <libdevcore/SHA3.h>
+#include <libdevcrypto/AES.h>
+
 using namespace std;
 using namespace dev;
 using namespace eth;

diff --git a/test/libdevcrypto/crypto.cpp b/test/libdevcrypto/crypto.cpp
@@ -39,6 +39,7 @@
 #include <libdevcrypto/ECDHE.h>
 #include <libdevcrypto/Hash.h>
 #include <libdevcrypto/CryptoPP.h>
+#include <libdevcrypto/AES.h>
 #include <test/libtesteth/TestHelper.h>
 
 using namespace std;