aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelen <jjelen@redhat.com>2016-11-02 16:20:46 +0100
committerAndreas Schneider <asn@cryptomilk.org>2016-11-07 11:42:06 +0100
commitd73f665edddfaa8f5a51e4c294d205f6e60a5854 (patch)
treebc4c98b2499a3074d6cb4f4fe1369870c41396a5
parent52efbc3a23fd62640177c96a14df76c42a1b462c (diff)
downloadlibssh-d73f665edddfaa8f5a51e4c294d205f6e60a5854.tar.gz
libssh-d73f665edddfaa8f5a51e4c294d205f6e60a5854.tar.xz
libssh-d73f665edddfaa8f5a51e4c294d205f6e60a5854.zip
libcrypto: Remove AES_ctr128_encrypt()
This is for OpenSSL 1.1.0. Signed-off-by: Jakub Jelen <jjelen@redhat.com> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
-rw-r--r--src/libcrypto.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libcrypto.c b/src/libcrypto.c
index ac950109..19065bd6 100644
--- a/src/libcrypto.c
+++ b/src/libcrypto.c
@@ -587,7 +587,11 @@ static void aes_ctr_encrypt(struct ssh_cipher_struct *cipher, void *in, void *ou
* Same for num, which is being used to store the current offset in blocksize in CTR
* function.
*/
+# if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ CRYPTO_ctr128_encrypt(in, out, len, &cipher->aes_key->key, cipher->aes_key->IV, tmp_buffer, &num, (block128_f)AES_encrypt);
+# else
AES_ctr128_encrypt(in, out, len, &cipher->aes_key->key, cipher->aes_key->IV, tmp_buffer, &num);
+# endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
}
static void aes_ctr_cleanup(struct ssh_cipher_struct *cipher){