Skip to content

Commit bae1eef

Browse files
committed
Fix wallet/test/crypto_tests.cpp for OpenSSL 1.1 API.
This avoids a compile failure on newly installed debian stretch systems.
1 parent 76fcd9d commit bae1eef

File tree

1 file changed

+20
-12
lines changed

1 file changed

+20
-12
lines changed

src/wallet/test/crypto_tests.cpp

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,19 @@ bool OldEncrypt(const CKeyingMaterial& vchPlaintext, std::vector<unsigned char>
4242
int nCLen = nLen + AES_BLOCK_SIZE, nFLen = 0;
4343
vchCiphertext = std::vector<unsigned char> (nCLen);
4444

45-
EVP_CIPHER_CTX ctx;
45+
EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
46+
47+
if (!ctx) return false;
4648

4749
bool fOk = true;
4850

49-
EVP_CIPHER_CTX_init(&ctx);
50-
if (fOk) fOk = EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, chKey, chIV) != 0;
51-
if (fOk) fOk = EVP_EncryptUpdate(&ctx, &vchCiphertext[0], &nCLen, &vchPlaintext[0], nLen) != 0;
52-
if (fOk) fOk = EVP_EncryptFinal_ex(&ctx, (&vchCiphertext[0]) + nCLen, &nFLen) != 0;
53-
EVP_CIPHER_CTX_cleanup(&ctx);
51+
EVP_CIPHER_CTX_init(ctx);
52+
if (fOk) fOk = EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, chKey, chIV) != 0;
53+
if (fOk) fOk = EVP_EncryptUpdate(ctx, &vchCiphertext[0], &nCLen, &vchPlaintext[0], nLen) != 0;
54+
if (fOk) fOk = EVP_EncryptFinal_ex(ctx, (&vchCiphertext[0]) + nCLen, &nFLen) != 0;
55+
EVP_CIPHER_CTX_cleanup(ctx);
56+
57+
EVP_CIPHER_CTX_free(ctx);
5458

5559
if (!fOk) return false;
5660

@@ -66,15 +70,19 @@ bool OldDecrypt(const std::vector<unsigned char>& vchCiphertext, CKeyingMaterial
6670

6771
vchPlaintext = CKeyingMaterial(nPLen);
6872

69-
EVP_CIPHER_CTX ctx;
73+
EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
74+
75+
if (!ctx) return false;
7076

7177
bool fOk = true;
7278

73-
EVP_CIPHER_CTX_init(&ctx);
74-
if (fOk) fOk = EVP_DecryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, chKey, chIV) != 0;
75-
if (fOk) fOk = EVP_DecryptUpdate(&ctx, &vchPlaintext[0], &nPLen, &vchCiphertext[0], nLen) != 0;
76-
if (fOk) fOk = EVP_DecryptFinal_ex(&ctx, (&vchPlaintext[0]) + nPLen, &nFLen) != 0;
77-
EVP_CIPHER_CTX_cleanup(&ctx);
79+
EVP_CIPHER_CTX_init(ctx);
80+
if (fOk) fOk = EVP_DecryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, chKey, chIV) != 0;
81+
if (fOk) fOk = EVP_DecryptUpdate(ctx, &vchPlaintext[0], &nPLen, &vchCiphertext[0], nLen) != 0;
82+
if (fOk) fOk = EVP_DecryptFinal_ex(ctx, (&vchPlaintext[0]) + nPLen, &nFLen) != 0;
83+
EVP_CIPHER_CTX_cleanup(ctx);
84+
85+
EVP_CIPHER_CTX_free(ctx);
7886

7987
if (!fOk) return false;
8088

0 commit comments

Comments
 (0)