diff options
| author | Marcin Szalowicz <marcin.szalowicz@oracle.com> | 2019-01-11 15:24:44 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2019-01-11 15:56:02 +0100 |
| commit | 4b4fb638f870d7b1c0b125caa5c1ddf0670d7e91 (patch) | |
| tree | ac370a0c6dbc31630335d18fe3c13ff0584d6c4f /src/libcrypto.c | |
| parent | f118ea010beaba565e7426b54b55f7334c10aade (diff) | |
| download | libssh-4b4fb638f870d7b1c0b125caa5c1ddf0670d7e91.tar.gz libssh-4b4fb638f870d7b1c0b125caa5c1ddf0670d7e91.tar.xz libssh-4b4fb638f870d7b1c0b125caa5c1ddf0670d7e91.zip | |
Fix cleaning up HMAC context for openssl < 1.1 remove old compatibility code for openssl < 0.9.7
Signed-off-by: Marcin Szalowicz <marcin.szalowicz@oracle.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
Diffstat (limited to 'src/libcrypto.c')
| -rw-r--r-- | src/libcrypto.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/libcrypto.c b/src/libcrypto.c index c2d91cdd..d94efbf0 100644 --- a/src/libcrypto.c +++ b/src/libcrypto.c @@ -54,10 +54,6 @@ #include <openssl/des.h> #endif -#if (OPENSSL_VERSION_NUMBER<0x00907000L) -#define OLD_CRYPTO -#endif - #if (defined(HAVE_VALGRIND_VALGRIND_H) && defined(HAVE_OPENSSL_IA32CAP_LOC)) #include <valgrind/valgrind.h> #define CAN_DISABLE_AESNI @@ -421,9 +417,6 @@ HMACCTX hmac_init(const void *key, int len, enum ssh_hmac_e type) { return NULL; } -#ifndef OLD_CRYPTO - HMAC_CTX_reset(ctx); // openssl 0.9.7 requires it. -#endif switch(type) { case SSH_HMAC_SHA1: @@ -456,14 +449,14 @@ void hmac_update(HMACCTX ctx, const void *data, unsigned long len) { void hmac_final(HMACCTX ctx, unsigned char *hashmacbuf, unsigned int *len) { HMAC_Final(ctx,hashmacbuf,len); -#ifndef OLD_CRYPTO +#if OPENSSL_VERSION_NUMBER > 0x10100000L HMAC_CTX_free(ctx); ctx = NULL; #else HMAC_cleanup(ctx); -#endif - SAFE_FREE(ctx); + ctx = NULL; +#endif } static void evp_cipher_init(struct ssh_cipher_struct *cipher) { |