From 70478619cec751d9ba6c87ac1d034f1cf8df47be Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 25 Jan 2020 20:54:39 -0800 Subject: libcrypto-compat: add extra functions Added extra functions. The next commit will switch to them. Signed-off-by: Rosen Penev Reviewed-by: Anderson Toshiyuki Sasaki --- src/libcrypto-compat.c | 14 ++++++++++++++ src/libcrypto-compat.h | 6 ++++++ 2 files changed, 20 insertions(+) (limited to 'src') diff --git a/src/libcrypto-compat.c b/src/libcrypto-compat.c index 048d1781..3604763f 100644 --- a/src/libcrypto-compat.c +++ b/src/libcrypto-compat.c @@ -280,6 +280,11 @@ void EVP_MD_CTX_free(EVP_MD_CTX *ctx) OPENSSL_free(ctx); } +int EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *ctx) +{ + EVP_CIPHER_CTX_init(ctx); +} + HMAC_CTX *HMAC_CTX_new(void) { HMAC_CTX *ctx = OPENSSL_zalloc(sizeof(HMAC_CTX)); @@ -394,3 +399,12 @@ int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key) } return 1; } + +const char *OpenSSL_version(int type) +{ + return SSLeay_version(type); +} +unsigned long OpenSSL_version_num(void) +{ + return SSLeay(); +} diff --git a/src/libcrypto-compat.h b/src/libcrypto-compat.h index bda0473e..0082e207 100644 --- a/src/libcrypto-compat.h +++ b/src/libcrypto-compat.h @@ -34,6 +34,8 @@ int EVP_MD_CTX_reset(EVP_MD_CTX *ctx); EVP_MD_CTX *EVP_MD_CTX_new(void); void EVP_MD_CTX_free(EVP_MD_CTX *ctx); +int EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *ctx); + HMAC_CTX *HMAC_CTX_new(void); int HMAC_CTX_reset(HMAC_CTX *ctx); void HMAC_CTX_free(HMAC_CTX *ctx); @@ -44,6 +46,10 @@ int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g); void DH_get0_key(const DH *dh, const BIGNUM **pub_key, const BIGNUM **priv_key); int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key); + +const char *OpenSSL_version(int type); +unsigned long OpenSSL_version_num(void); + #endif /* OPENSSL_VERSION_NUMBER */ #endif /* LIBCRYPTO_COMPAT_H */ -- cgit v1.2.3