diff options
author | jsing <> | 2014-06-15 15:41:25 +0000 |
---|---|---|
committer | jsing <> | 2014-06-15 15:41:25 +0000 |
commit | c14b20da98a1466c75cb26dd7c3ed81e98cd1343 (patch) | |
tree | e8556384f6ab51caa70942b79e61bda6567372f4 /src | |
parent | fcfbc2b8c849e919658e9f9b4fd91038fdd99925 (diff) | |
download | openbsd-c14b20da98a1466c75cb26dd7c3ed81e98cd1343.tar.gz openbsd-c14b20da98a1466c75cb26dd7c3ed81e98cd1343.tar.bz2 openbsd-c14b20da98a1466c75cb26dd7c3ed81e98cd1343.zip |
Add missing OPENSSL_cleanse() in aead_aes_gcm_cleanup().
ok beck@ miod@
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/evp/e_aes.c | 3 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/evp/e_aes.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/libcrypto/evp/e_aes.c b/src/lib/libcrypto/evp/e_aes.c index 07b3469f42..8ee93c4bbd 100644 --- a/src/lib/libcrypto/evp/e_aes.c +++ b/src/lib/libcrypto/evp/e_aes.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: e_aes.c,v 1.20 2014/06/15 15:39:43 jsing Exp $ */ | 1 | /* $OpenBSD: e_aes.c,v 1.21 2014/06/15 15:41:25 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2001-2011 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2001-2011 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -1323,6 +1323,7 @@ aead_aes_gcm_cleanup(EVP_AEAD_CTX *ctx) | |||
1323 | { | 1323 | { |
1324 | struct aead_aes_gcm_ctx *gcm_ctx = ctx->aead_state; | 1324 | struct aead_aes_gcm_ctx *gcm_ctx = ctx->aead_state; |
1325 | 1325 | ||
1326 | OPENSSL_cleanse(gcm_ctx, sizeof(*gcm_ctx)); | ||
1326 | free(gcm_ctx); | 1327 | free(gcm_ctx); |
1327 | } | 1328 | } |
1328 | 1329 | ||
diff --git a/src/lib/libssl/src/crypto/evp/e_aes.c b/src/lib/libssl/src/crypto/evp/e_aes.c index 07b3469f42..8ee93c4bbd 100644 --- a/src/lib/libssl/src/crypto/evp/e_aes.c +++ b/src/lib/libssl/src/crypto/evp/e_aes.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: e_aes.c,v 1.20 2014/06/15 15:39:43 jsing Exp $ */ | 1 | /* $OpenBSD: e_aes.c,v 1.21 2014/06/15 15:41:25 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 2001-2011 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 2001-2011 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -1323,6 +1323,7 @@ aead_aes_gcm_cleanup(EVP_AEAD_CTX *ctx) | |||
1323 | { | 1323 | { |
1324 | struct aead_aes_gcm_ctx *gcm_ctx = ctx->aead_state; | 1324 | struct aead_aes_gcm_ctx *gcm_ctx = ctx->aead_state; |
1325 | 1325 | ||
1326 | OPENSSL_cleanse(gcm_ctx, sizeof(*gcm_ctx)); | ||
1326 | free(gcm_ctx); | 1327 | free(gcm_ctx); |
1327 | } | 1328 | } |
1328 | 1329 | ||