Merge branch 'galk.encryption_2.0' of github.com:galkahana/PDF-Writer into galk.encryption_2.0

Author: galkahana

PDFWriter/XCryptionCommon2_0.cpp

@@ -71,55 +71,35 @@ static ByteList byteArrayToByteList(const Byte* inArray, size_t inSize) {
     return result;
 }
 
-
-
-static ByteList createSHA256(const ByteList& inKey) {
+static ByteList createSHA(const ByteList& inKey, const EVP_MD* inMd) {
     ByteList result;
 
-    Byte* buffer = byteListToNewByteArray(inKey);
-    Byte bufferResult[SHA256_DIGEST_LENGTH];
+    Byte bufferResult[EVP_MAX_MD_SIZE];
+    unsigned int hash_len = 0;
 
+    Byte* buffer = byteListToNewByteArray(inKey);
 
-    SHA256_CTX ctx;
-    SHA256_Init(&ctx);
-    SHA256_Update(&ctx, buffer, inKey.size());
-    SHA256_Final(bufferResult, &ctx);
+    EVP_MD_CTX *ctx = EVP_MD_CTX_new();
+    EVP_DigestInit_ex(ctx, inMd, NULL);
+    EVP_DigestUpdate(ctx, buffer, inKey.size()); // data: pointer to your data, data_len: length
+    EVP_DigestFinal_ex(ctx, bufferResult, &hash_len);
+    EVP_MD_CTX_free(ctx);    
 
     delete[] buffer;
-    return byteArrayToByteList(bufferResult, SHA256_DIGEST_LENGTH);
+    return byteArrayToByteList(bufferResult, hash_len);
 }
 
+static ByteList createSHA256(const ByteList& inKey) {
+    return createSHA(inKey, EVP_sha256());
+}
 
-static ByteList createSHA384(const ByteList& inKey) {
-    ByteList result;
-
-    Byte* buffer = byteListToNewByteArray(inKey);
-    Byte bufferResult[SHA384_DIGEST_LENGTH];
-
-    SHA512_CTX ctx;
-    SHA384_Init(&ctx);
-    SHA384_Update(&ctx, buffer, inKey.size());
-    SHA384_Final(bufferResult, &ctx);
 
-    delete[] buffer;
-    return byteArrayToByteList(bufferResult, SHA384_DIGEST_LENGTH);
+static ByteList createSHA384(const ByteList& inKey) {
+    return createSHA(inKey, EVP_sha384());
 }
 
 static ByteList createSHA512(const ByteList& inKey) {
-    ByteList result;
-
-    Byte* buffer = byteListToNewByteArray(inKey);
-    Byte bufferResult[SHA512_DIGEST_LENGTH];
-
-    SHA512_CTX ctx;
-    SHA512_Init(&ctx);
-    SHA512_Update(&ctx, buffer, inKey.size());
-    SHA512_Final(bufferResult, &ctx);
-
-    delete[] buffer;
-    return byteArrayToByteList(bufferResult, SHA512_DIGEST_LENGTH);
-
-    return result;
+    return createSHA(inKey, EVP_sha512());
 }
 
 static ByteList encryptKeyCBC(const ByteList& inKey, const ByteList& inData, Byte* inIV) {