diff options
| author | djm <> | 2012-10-13 21:25:14 +0000 |
|---|---|---|
| committer | djm <> | 2012-10-13 21:25:14 +0000 |
| commit | 93723b50b639d8dc717bc1bf463fd46e1b321239 (patch) | |
| tree | 281e0a29ae8f87a8c47fbd4deaa1f3d48b8cc5c1 /src/lib/libcrypto/pkcs12/p12_kiss.c | |
| parent | 65e72ac55a6405783db7a12d7e35a7561d46005b (diff) | |
| download | openbsd-93723b50b639d8dc717bc1bf463fd46e1b321239.tar.gz openbsd-93723b50b639d8dc717bc1bf463fd46e1b321239.tar.bz2 openbsd-93723b50b639d8dc717bc1bf463fd46e1b321239.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/pkcs12/p12_kiss.c')
| -rw-r--r-- | src/lib/libcrypto/pkcs12/p12_kiss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_kiss.c b/src/lib/libcrypto/pkcs12/p12_kiss.c index 292cc3ed4a..206b1b0b18 100644 --- a/src/lib/libcrypto/pkcs12/p12_kiss.c +++ b/src/lib/libcrypto/pkcs12/p12_kiss.c | |||
| @@ -167,7 +167,7 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, | |||
| 167 | if (cert && *cert) | 167 | if (cert && *cert) |
| 168 | X509_free(*cert); | 168 | X509_free(*cert); |
| 169 | if (x) | 169 | if (x) |
| 170 | X509_free(*cert); | 170 | X509_free(x); |
| 171 | if (ocerts) | 171 | if (ocerts) |
| 172 | sk_X509_pop_free(ocerts, X509_free); | 172 | sk_X509_pop_free(ocerts, X509_free); |
| 173 | return 0; | 173 | return 0; |