diff options
| -rw-r--r-- | crypto/pkcs12/p12_key.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/crypto/pkcs12/p12_key.c b/crypto/pkcs12/p12_key.c index a40ae4cbe8..bbe212d125 100644 --- a/crypto/pkcs12/p12_key.c +++ b/crypto/pkcs12/p12_key.c @@ -33,10 +33,8 @@ int PKCS12_key_gen_asc(const char *pass, int passlen, unsigned char *salt, } ret = PKCS12_key_gen_uni(unipass, uniplen, salt, saltlen, id, iter, n, out, md_type); - if (ret <= 0) - return 0; OPENSSL_clear_free(unipass, uniplen); - return ret; + return ret > 0; } int PKCS12_key_gen_utf8(const char *pass, int passlen, unsigned char *salt, @@ -56,10 +54,8 @@ int PKCS12_key_gen_utf8(const char *pass, int passlen, unsigned char *salt, } ret = PKCS12_key_gen_uni(unipass, uniplen, salt, saltlen, id, iter, n, out, md_type); - if (ret <= 0) - return 0; OPENSSL_clear_free(unipass, uniplen); - return ret; + return ret > 0; } int PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt, |