diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/libcrypto.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libcrypto.c b/src/libcrypto.c index e9f519ec..2ad0de83 100644 --- a/src/libcrypto.c +++ b/src/libcrypto.c @@ -541,7 +541,7 @@ static int evp_cipher_set_encrypt_key(struct ssh_cipher_struct *cipher, int rc; evp_cipher_init(cipher); - EVP_CIPHER_CTX_init(cipher->ctx); + EVP_CIPHER_CTX_reset(cipher->ctx); rc = EVP_EncryptInit_ex(cipher->ctx, cipher->cipher, NULL, key, IV); if (rc != 1){ @@ -574,7 +574,7 @@ static int evp_cipher_set_decrypt_key(struct ssh_cipher_struct *cipher, int rc; evp_cipher_init(cipher); - EVP_CIPHER_CTX_init(cipher->ctx); + EVP_CIPHER_CTX_reset(cipher->ctx); rc = EVP_DecryptInit_ex(cipher->ctx, cipher->cipher, NULL, key, IV); if (rc != 1){ @@ -657,7 +657,6 @@ static void evp_cipher_decrypt(struct ssh_cipher_struct *cipher, static void evp_cipher_cleanup(struct ssh_cipher_struct *cipher) { if (cipher->ctx != NULL) { - EVP_CIPHER_CTX_cleanup(cipher->ctx); EVP_CIPHER_CTX_free(cipher->ctx); } } @@ -1485,11 +1484,11 @@ int ssh_crypto_init(void) if (libcrypto_initialized) { return SSH_OK; } - if (SSLeay() != OPENSSL_VERSION_NUMBER){ + if (OpenSSL_version_num() != OPENSSL_VERSION_NUMBER){ SSH_LOG(SSH_LOG_WARNING, "libssh compiled with %s " "headers, currently running with %s.", OPENSSL_VERSION_TEXT, - SSLeay_version(SSLeay()) + OpenSSL_version(OpenSSL_version_num()) ); } #ifdef CAN_DISABLE_AESNI |