diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2014-07-09 22:55:18 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2014-07-09 22:55:18 +0000 |
| commit | a57699c1800cbef0cf07cffaf9eef7e921835d2b (patch) | |
| tree | 288f7cbb8bdca4ad3af95ff887311921608d12b3 /lib/libcrypto/asn1/p5_pbe.c | |
| parent | 3fe81a8154c8dbfc402f9e330c634c52df3b5b79 (diff) | |
ASN1_STRING_free can handle NULL, so callers don't need to check. ok miod
Diffstat (limited to 'lib/libcrypto/asn1/p5_pbe.c')
| -rw-r--r-- | lib/libcrypto/asn1/p5_pbe.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/libcrypto/asn1/p5_pbe.c b/lib/libcrypto/asn1/p5_pbe.c index 2b538caac3c..19a88c20f1a 100644 --- a/lib/libcrypto/asn1/p5_pbe.c +++ b/lib/libcrypto/asn1/p5_pbe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p5_pbe.c,v 1.13 2014/06/12 15:49:27 deraadt Exp $ */ +/* $OpenBSD: p5_pbe.c,v 1.14 2014/07/09 22:55:17 tedu Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -119,8 +119,7 @@ PKCS5_pbe_set0_algor(X509_ALGOR *algor, int alg, int iter, err: if (pbe != NULL) PBEPARAM_free(pbe); - if (pbe_str != NULL) - ASN1_STRING_free(pbe_str); + ASN1_STRING_free(pbe_str); return 0; } |