diff options
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_decr.c')
| -rw-r--r-- | src/lib/libcrypto/pkcs12/p12_decr.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_decr.c b/src/lib/libcrypto/pkcs12/p12_decr.c index 4cccf43d3f..00195f0a98 100644 --- a/src/lib/libcrypto/pkcs12/p12_decr.c +++ b/src/lib/libcrypto/pkcs12/p12_decr.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: p12_decr.c,v 1.15 2015/05/15 11:00:14 jsg Exp $ */ | 1 | /* $OpenBSD: p12_decr.c,v 1.16 2015/09/10 15:56:25 jsing Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 1999. | 3 | * project 1999. |
| 4 | */ | 4 | */ |
| @@ -57,6 +57,7 @@ | |||
| 57 | */ | 57 | */ |
| 58 | 58 | ||
| 59 | #include <stdio.h> | 59 | #include <stdio.h> |
| 60 | #include <string.h> | ||
| 60 | 61 | ||
| 61 | #include <openssl/err.h> | 62 | #include <openssl/err.h> |
| 62 | #include <openssl/pkcs12.h> | 63 | #include <openssl/pkcs12.h> |
| @@ -137,7 +138,7 @@ PKCS12_item_decrypt_d2i(X509_ALGOR *algor, const ASN1_ITEM *it, | |||
| 137 | p = out; | 138 | p = out; |
| 138 | ret = ASN1_item_d2i(NULL, &p, outlen, it); | 139 | ret = ASN1_item_d2i(NULL, &p, outlen, it); |
| 139 | if (zbuf) | 140 | if (zbuf) |
| 140 | OPENSSL_cleanse(out, outlen); | 141 | explicit_bzero(out, outlen); |
| 141 | if (!ret) | 142 | if (!ret) |
| 142 | PKCS12err(PKCS12_F_PKCS12_ITEM_DECRYPT_D2I, | 143 | PKCS12err(PKCS12_F_PKCS12_ITEM_DECRYPT_D2I, |
| 143 | PKCS12_R_DECODE_ERROR); | 144 | PKCS12_R_DECODE_ERROR); |
| @@ -176,7 +177,7 @@ PKCS12_item_i2d_encrypt(X509_ALGOR *algor, const ASN1_ITEM *it, | |||
| 176 | goto err; | 177 | goto err; |
| 177 | } | 178 | } |
| 178 | if (zbuf) | 179 | if (zbuf) |
| 179 | OPENSSL_cleanse(in, inlen); | 180 | explicit_bzero(in, inlen); |
| 180 | free(in); | 181 | free(in); |
| 181 | return oct; | 182 | return oct; |
| 182 | 183 | ||
