More crypto cleanup.

Author: linuscu

packages/crypto/include/crypto/Crypto.h

@@ -15,7 +15,7 @@
 namespace l::crypto {
 
 	template<bool PUBLIC = true, bool X25519 = false, size_t SIZE = (PUBLIC ? 12 : 16)>
-	const std::array<unsigned char, SIZE>& GetPemPrefix() {
+	const std::array<unsigned char, SIZE>& Get25519PemPrefix() {
 
 		// secret x25519 pem key in hex
 		// 302e020100300506032b65 6e 04220420 
@@ -67,7 +67,7 @@ namespace l::crypto {
 
 	};
 
-	std::string ToPublicKeyFormat(std::string_view pkcsFormat);
+	std::string ToPKCSFormat(std::string_view content, bool publicKey = true);
 	std::string To25519PemKey(std::string_view rawkey, bool x25519 = true, bool publicKey = true, bool b16 = false);
 
 	class CryptoHMacSha256 : public CryptoSigner {
@@ -203,8 +203,6 @@ namespace l::crypto {
 		std::string GetPriKeyHex();
 		std::string GetPubKeyHex();
 		std::string GetPubKeyPem();
-		std::string GetPubKeyPem2();
-
 
 		bool Verify(std::string_view signature, std::string_view message, std::string_view publicKey = "");
 	protected:

packages/crypto/source/common/Crypto.cpp

@@ -12,12 +12,16 @@
 namespace l::crypto {
 
 	// PKCS#8 format
-	std::string ToPublicKeyFormat(std::string_view pkcsFormat) {
+	std::string ToPKCSFormat(std::string_view content, bool publicKey) {
 		std::stringstream stream;
-		stream << "-----BEGIN PUBLIC KEY-----\n";
-		stream << pkcsFormat;
+		stream << "-----BEGIN ";
+		stream << (publicKey ? "PUBLIC" : "PRIVATE");
+		stream << " KEY---- - \n";
+		stream << content;
 		stream << "\n";
-		stream << "-----END PUBLIC KEY-----\n";
+		stream << "-----END ";
+		stream << (publicKey ? "PUBLIC" : "PRIVATE");
+		stream << " KEY---- - \n";
 		return stream.str();
 	}
 
@@ -26,25 +30,25 @@ namespace l::crypto {
 		size_t prefixSize = 0;
 		if (x25519) {
 			if (publicKey) {
-				auto& prefix = GetPemPrefix<true, true>();
+				auto& prefix = Get25519PemPrefix<true, true>();
 				memcpy(pem.data(), prefix.data(), prefix.size());
 				prefixSize = prefix.size();
 			}
 			else {
-				auto& prefix = GetPemPrefix<false, true>();
+				auto& prefix = Get25519PemPrefix<false, true>();
 				memcpy(pem.data(), prefix.data(), prefix.size());
 				memcpy(pem.data() + prefix.size(), rawkey.data(), rawkey.size());
 				prefixSize = prefix.size();
 			}
 		}
 		else {
 			if (publicKey) {
-				auto& prefix = GetPemPrefix<true, false>();
+				auto& prefix = Get25519PemPrefix<true, false>();
 				memcpy(pem.data(), prefix.data(), prefix.size());
 				prefixSize = prefix.size();
 			}
 			else {
-				auto& prefix = GetPemPrefix<false, false>();
+				auto& prefix = Get25519PemPrefix<false, false>();
 				memcpy(pem.data(), prefix.data(), prefix.size());
 				prefixSize = prefix.size();
 			}
@@ -281,20 +285,9 @@ namespace l::crypto {
 	}
 
 	std::string CryptoXED25519::GetPublicKeyPKCS8() {
-		return ToPublicKeyFormat(To25519PemKey(std::string_view(reinterpret_cast<const char*>(mPublicKey), 32), true, true));
+		return ToPKCSFormat(To25519PemKey(std::string_view(reinterpret_cast<const char*>(mPublicKey), 32), true, true));
 	}
 
-
-
-
-
-
-
-
-
-
-
-
 	bool CryptoED25519::Init() {
 		memset(mSeed, 0, 32);
 		if (ed25519_create_seed(&mSeed[0])) {
@@ -399,22 +392,8 @@ namespace l::crypto {
 	}
 
 	std::string CryptoED25519::GetPubKeyPem() {
-		memcpy(mPemKey, "id-Ed25519", 10);
-		mPemKey[10] = 1;
-		mPemKey[11] = 3;
-		mPemKey[12] = 101;
-		mPemKey[13] = 112;
-		memcpy(mPemKey + 10 + 4, mPubKey, 32);
-		auto pemKey = std::string_view(reinterpret_cast<const char*>(mPemKey), 46);
-		return l::serialization::base64_encode(pemKey);
-	}
-
-	std::string CryptoED25519::GetPubKeyPem2() {
-		static const std::array<unsigned char, 12> mED25519Prefix = { 0x30,0x2a,0x30,0x05,0x06,0x03,0x2b,0x65,0x70,0x03,0x21,0x00 };
-		memcpy(mPemKey, mED25519Prefix.data(), mED25519Prefix.size());
-		memcpy(mPemKey + 12, mPubKey, 32);
-		auto pemKey = std::string_view(reinterpret_cast<const char*>(mPemKey), 12 + 32);
-		return l::serialization::base64_encode(pemKey);
+		auto rawKey = std::string_view(reinterpret_cast<const char*>(mPemKey), 32);
+		return To25519PemKey(rawKey, false, true);
 	}
 
 	/*
@@ -426,8 +405,6 @@ namespace l::crypto {
 	  privateKeyEncoding: {
 		type: 'pkcs8',
 		format: 'pem'
-	
-	
 	*/
 	bool CryptoED25519::Verify(std::string_view signature, std::string_view message, std::string_view publicKey) {
 		unsigned char* pubKey = reinterpret_cast<unsigned char*>(const_cast<char*>(publicKey.data()));

packages/crypto/tests/common/CryptoppTest.cpp

@@ -14,7 +14,6 @@
 
 using namespace l;
 
-
 TEST(CryptoPP, hmacsha256) {
 
 	CryptoPP::HMAC<CryptoPP::SHA256> mHmac;

packages/crypto/tests/common/ed25519Test.cpp

@@ -69,8 +69,7 @@ TEST(Crypto, ed2519) {
 	LOG(LogTest) << "private key base64: " << ed25519.GetPriKeyBase64();
 	LOG(LogTest) << "public key hex: " << ed25519.GetPubKeyHex();
 	LOG(LogTest) << "private key hex: " << ed25519.GetPriKeyHex();
-	LOG(LogTest) << "public key pem: " << ed25519.GetPubKeyPem();
-	LOG(LogTest) << "public key pem2: " << ed25519.GetPubKeyPem2();
+	LOG(LogTest) << "public key pem2: " << ed25519.GetPubKeyPem();
 
 	auto signature = ed25519.GetSign(message);