summaryrefslogtreecommitdiffstats
path: root/crypto/evp
diff options
context:
space:
mode:
authorJonas Maebe <jonas.maebe@elis.ugent.be>2013-12-08 18:09:20 +0100
committerKurt Roeckx <kurt@roeckx.be>2014-08-17 18:51:16 +0200
commitc84029dbdc57edfb9c6cd94f3a730749adb0236a (patch)
tree9180b66fd45cbec701e4d3eafbafc88881ea6ee4 /crypto/evp
parent750487899ad2b794078ed998b513a4a14f60f2cc (diff)
dev_crypto_init_key: return error if allocating CDATA(ctx)->key failed
Signed-off-by: Kurt Roeckx <kurt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/evp')
-rw-r--r--crypto/evp/openbsd_hw.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/evp/openbsd_hw.c b/crypto/evp/openbsd_hw.c
index 3831a5731e..93ed5d6515 100644
--- a/crypto/evp/openbsd_hw.c
+++ b/crypto/evp/openbsd_hw.c
@@ -134,6 +134,8 @@ static int dev_crypto_init_key(EVP_CIPHER_CTX *ctx,int cipher,
return 0;
CDATA(ctx)->key=OPENSSL_malloc(MAX_HW_KEY);
+ if (CDATA(ctx)->key == NULL)
+ return 0;
assert(ctx->cipher->iv_len <= MAX_HW_IV);