diff options
| author | djm <> | 2009-04-06 06:33:20 +0000 |
|---|---|---|
| committer | djm <> | 2009-04-06 06:33:20 +0000 |
| commit | 02266ad76553362863ec35a28c86ea7a4f5acdf9 (patch) | |
| tree | 647f179fa8dcccf50c436cc0165a1d67476a936e /src/lib/libcrypto/pkcs12 | |
| parent | d9de323e6e6b00c0f5eda2fd1399c8c51cdb19c4 (diff) | |
| download | openbsd-02266ad76553362863ec35a28c86ea7a4f5acdf9.tar.gz openbsd-02266ad76553362863ec35a28c86ea7a4f5acdf9.tar.bz2 openbsd-02266ad76553362863ec35a28c86ea7a4f5acdf9.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/pkcs12')
| -rw-r--r-- | src/lib/libcrypto/pkcs12/p12_crt.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_crt.c b/src/lib/libcrypto/pkcs12/p12_crt.c index e863de52ce..9522342fa5 100644 --- a/src/lib/libcrypto/pkcs12/p12_crt.c +++ b/src/lib/libcrypto/pkcs12/p12_crt.c | |||
| @@ -170,6 +170,9 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, | |||
| 170 | 170 | ||
| 171 | p12 = PKCS12_add_safes(safes, 0); | 171 | p12 = PKCS12_add_safes(safes, 0); |
| 172 | 172 | ||
| 173 | if (!p12) | ||
| 174 | goto err; | ||
| 175 | |||
| 173 | sk_PKCS7_pop_free(safes, PKCS7_free); | 176 | sk_PKCS7_pop_free(safes, PKCS7_free); |
| 174 | 177 | ||
| 175 | safes = NULL; | 178 | safes = NULL; |