Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/10496)
@@ -75,8 +75,10 @@ static void kdf_hkdf_free(void *vctx)
{
KDF_HKDF *ctx = (KDF_HKDF *)vctx;
- kdf_hkdf_reset(ctx);
- OPENSSL_free(ctx);
+ if (ctx != NULL) {
+ kdf_hkdf_reset(ctx);
+ OPENSSL_free(ctx);
+ }
}
static void kdf_hkdf_reset(void *vctx)
@@ -113,8 +113,10 @@ static void kbkdf_free(void *vctx)
KBKDF *ctx = (KBKDF *)vctx;
- kbkdf_reset(ctx);
+ kbkdf_reset(ctx);
static void kbkdf_reset(void *vctx)
@@ -63,8 +63,10 @@ static void krb5kdf_free(void *vctx)
KRB5KDF_CTX *ctx = (KRB5KDF_CTX *)vctx;
- krb5kdf_reset(ctx);
+ krb5kdf_reset(ctx);
static void krb5kdf_reset(void *vctx)
@@ -80,8 +80,10 @@ static void kdf_pbkdf2_free(void *vctx)
KDF_PBKDF2 *ctx = (KDF_PBKDF2 *)vctx;
- kdf_pbkdf2_cleanup(ctx);
+ kdf_pbkdf2_cleanup(ctx);
static void kdf_pbkdf2_reset(void *vctx)
@@ -74,9 +74,11 @@ static void kdf_scrypt_free(void *vctx)
KDF_SCRYPT *ctx = (KDF_SCRYPT *)vctx;
- EVP_MD_meth_free(ctx->sha256);
- kdf_scrypt_reset(ctx);
+ EVP_MD_meth_free(ctx->sha256);
+ kdf_scrypt_reset(ctx);
static void kdf_scrypt_reset(void *vctx)
@@ -63,8 +63,10 @@ static void kdf_sshkdf_free(void *vctx)
KDF_SSHKDF *ctx = (KDF_SSHKDF *)vctx;
- kdf_sshkdf_reset(ctx);
+ kdf_sshkdf_reset(ctx);
static void kdf_sshkdf_reset(void *vctx)
@@ -315,8 +315,10 @@ static void sskdf_free(void *vctx)
KDF_SSKDF *ctx = (KDF_SSKDF *)vctx;
- sskdf_reset(ctx);
+ sskdf_reset(ctx);
static int sskdf_set_buffer(unsigned char **out, size_t *out_len,
@@ -106,8 +106,10 @@ static void kdf_tls1_prf_free(void *vctx)
TLS1_PRF *ctx = (TLS1_PRF *)vctx;
- kdf_tls1_prf_reset(ctx);
+ kdf_tls1_prf_reset(ctx);
static void kdf_tls1_prf_reset(void *vctx)
@@ -266,8 +266,10 @@ static void x942kdf_free(void *vctx)
KDF_X942 *ctx = (KDF_X942 *)vctx;
- x942kdf_reset(ctx);
+ x942kdf_reset(ctx);
static int x942kdf_set_buffer(unsigned char **out, size_t *out_len,