|
|
|
@ -42,15 +42,19 @@ bool OldEncrypt(const CKeyingMaterial& vchPlaintext, std::vector<unsigned char>
@@ -42,15 +42,19 @@ bool OldEncrypt(const CKeyingMaterial& vchPlaintext, std::vector<unsigned char>
|
|
|
|
|
int nCLen = nLen + AES_BLOCK_SIZE, nFLen = 0; |
|
|
|
|
vchCiphertext = std::vector<unsigned char> (nCLen); |
|
|
|
|
|
|
|
|
|
EVP_CIPHER_CTX ctx; |
|
|
|
|
EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new(); |
|
|
|
|
|
|
|
|
|
if (!ctx) return false; |
|
|
|
|
|
|
|
|
|
bool fOk = true; |
|
|
|
|
|
|
|
|
|
EVP_CIPHER_CTX_init(&ctx); |
|
|
|
|
if (fOk) fOk = EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, chKey, chIV) != 0; |
|
|
|
|
if (fOk) fOk = EVP_EncryptUpdate(&ctx, &vchCiphertext[0], &nCLen, &vchPlaintext[0], nLen) != 0; |
|
|
|
|
if (fOk) fOk = EVP_EncryptFinal_ex(&ctx, (&vchCiphertext[0]) + nCLen, &nFLen) != 0; |
|
|
|
|
EVP_CIPHER_CTX_cleanup(&ctx); |
|
|
|
|
EVP_CIPHER_CTX_init(ctx); |
|
|
|
|
if (fOk) fOk = EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, chKey, chIV) != 0; |
|
|
|
|
if (fOk) fOk = EVP_EncryptUpdate(ctx, &vchCiphertext[0], &nCLen, &vchPlaintext[0], nLen) != 0; |
|
|
|
|
if (fOk) fOk = EVP_EncryptFinal_ex(ctx, (&vchCiphertext[0]) + nCLen, &nFLen) != 0; |
|
|
|
|
EVP_CIPHER_CTX_cleanup(ctx); |
|
|
|
|
|
|
|
|
|
EVP_CIPHER_CTX_free(ctx); |
|
|
|
|
|
|
|
|
|
if (!fOk) return false; |
|
|
|
|
|
|
|
|
@ -66,15 +70,19 @@ bool OldDecrypt(const std::vector<unsigned char>& vchCiphertext, CKeyingMaterial
@@ -66,15 +70,19 @@ bool OldDecrypt(const std::vector<unsigned char>& vchCiphertext, CKeyingMaterial
|
|
|
|
|
|
|
|
|
|
vchPlaintext = CKeyingMaterial(nPLen); |
|
|
|
|
|
|
|
|
|
EVP_CIPHER_CTX ctx; |
|
|
|
|
EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new(); |
|
|
|
|
|
|
|
|
|
if (!ctx) return false; |
|
|
|
|
|
|
|
|
|
bool fOk = true; |
|
|
|
|
|
|
|
|
|
EVP_CIPHER_CTX_init(&ctx); |
|
|
|
|
if (fOk) fOk = EVP_DecryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, chKey, chIV) != 0; |
|
|
|
|
if (fOk) fOk = EVP_DecryptUpdate(&ctx, &vchPlaintext[0], &nPLen, &vchCiphertext[0], nLen) != 0; |
|
|
|
|
if (fOk) fOk = EVP_DecryptFinal_ex(&ctx, (&vchPlaintext[0]) + nPLen, &nFLen) != 0; |
|
|
|
|
EVP_CIPHER_CTX_cleanup(&ctx); |
|
|
|
|
EVP_CIPHER_CTX_init(ctx); |
|
|
|
|
if (fOk) fOk = EVP_DecryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, chKey, chIV) != 0; |
|
|
|
|
if (fOk) fOk = EVP_DecryptUpdate(ctx, &vchPlaintext[0], &nPLen, &vchCiphertext[0], nLen) != 0; |
|
|
|
|
if (fOk) fOk = EVP_DecryptFinal_ex(ctx, (&vchPlaintext[0]) + nPLen, &nFLen) != 0; |
|
|
|
|
EVP_CIPHER_CTX_cleanup(ctx); |
|
|
|
|
|
|
|
|
|
EVP_CIPHER_CTX_free(ctx); |
|
|
|
|
|
|
|
|
|
if (!fOk) return false; |
|
|
|
|
|
|
|
|
|