diff options
author | jsing <> | 2014-07-10 12:09:43 +0000 |
---|---|---|
committer | jsing <> | 2014-07-10 12:09:43 +0000 |
commit | f374a6c7fcebd44c8a8966ae1135bd8cb53e3702 (patch) | |
tree | dd901eb9c35464fd27204dd1690d7984f55e62ad | |
parent | 309bd740fa74be0b3443045b822b92676674c9ce (diff) | |
download | openbsd-f374a6c7fcebd44c8a8966ae1135bd8cb53e3702.tar.gz openbsd-f374a6c7fcebd44c8a8966ae1135bd8cb53e3702.tar.bz2 openbsd-f374a6c7fcebd44c8a8966ae1135bd8cb53e3702.zip |
One sure hopes that OPENSSL_cleanse will:
/* Clear password from memory */
-rw-r--r-- | src/lib/libcrypto/pkcs12/p12_key.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/pkcs12/p12_key.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_key.c b/src/lib/libcrypto/pkcs12/p12_key.c index a2f7db8267..ff69b8ebc5 100644 --- a/src/lib/libcrypto/pkcs12/p12_key.c +++ b/src/lib/libcrypto/pkcs12/p12_key.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p12_key.c,v 1.17 2014/07/10 10:01:23 miod Exp $ */ | 1 | /* $OpenBSD: p12_key.c,v 1.18 2014/07/10 12:09:43 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 | */ |
@@ -87,7 +87,7 @@ PKCS12_key_gen_asc(const char *pass, int passlen, unsigned char *salt, | |||
87 | if (ret <= 0) | 87 | if (ret <= 0) |
88 | return 0; | 88 | return 0; |
89 | if (unipass) { | 89 | if (unipass) { |
90 | OPENSSL_cleanse(unipass, uniplen); /* Clear password from memory */ | 90 | OPENSSL_cleanse(unipass, uniplen); |
91 | free(unipass); | 91 | free(unipass); |
92 | } | 92 | } |
93 | return ret; | 93 | return ret; |
diff --git a/src/lib/libssl/src/crypto/pkcs12/p12_key.c b/src/lib/libssl/src/crypto/pkcs12/p12_key.c index a2f7db8267..ff69b8ebc5 100644 --- a/src/lib/libssl/src/crypto/pkcs12/p12_key.c +++ b/src/lib/libssl/src/crypto/pkcs12/p12_key.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: p12_key.c,v 1.17 2014/07/10 10:01:23 miod Exp $ */ | 1 | /* $OpenBSD: p12_key.c,v 1.18 2014/07/10 12:09:43 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 | */ |
@@ -87,7 +87,7 @@ PKCS12_key_gen_asc(const char *pass, int passlen, unsigned char *salt, | |||
87 | if (ret <= 0) | 87 | if (ret <= 0) |
88 | return 0; | 88 | return 0; |
89 | if (unipass) { | 89 | if (unipass) { |
90 | OPENSSL_cleanse(unipass, uniplen); /* Clear password from memory */ | 90 | OPENSSL_cleanse(unipass, uniplen); |
91 | free(unipass); | 91 | free(unipass); |
92 | } | 92 | } |
93 | return ret; | 93 | return ret; |