diff options
author | djm <> | 2009-04-06 06:33:20 +0000 |
---|---|---|
committer | djm <> | 2009-04-06 06:33:20 +0000 |
commit | ee26f086217016f09154412b171ad62a33a346f6 (patch) | |
tree | 647f179fa8dcccf50c436cc0165a1d67476a936e /src/lib/libcrypto/pkcs7/pk7_smime.c | |
parent | f929570d17be2469dc7104fcdf26fdaddf3dbb65 (diff) | |
download | openbsd-ee26f086217016f09154412b171ad62a33a346f6.tar.gz openbsd-ee26f086217016f09154412b171ad62a33a346f6.tar.bz2 openbsd-ee26f086217016f09154412b171ad62a33a346f6.zip |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/pkcs7/pk7_smime.c')
-rw-r--r-- | src/lib/libcrypto/pkcs7/pk7_smime.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/libcrypto/pkcs7/pk7_smime.c b/src/lib/libcrypto/pkcs7/pk7_smime.c index c34db1d6fe..fd18ec3d95 100644 --- a/src/lib/libcrypto/pkcs7/pk7_smime.c +++ b/src/lib/libcrypto/pkcs7/pk7_smime.c | |||
@@ -229,8 +229,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, | |||
229 | sk_X509_free(signers); | 229 | sk_X509_free(signers); |
230 | return 0; | 230 | return 0; |
231 | } | 231 | } |
232 | X509_STORE_CTX_set_purpose(&cert_ctx, | 232 | X509_STORE_CTX_set_default(&cert_ctx, "smime_sign"); |
233 | X509_PURPOSE_SMIME_SIGN); | ||
234 | } else if(!X509_STORE_CTX_init (&cert_ctx, store, signer, NULL)) { | 233 | } else if(!X509_STORE_CTX_init (&cert_ctx, store, signer, NULL)) { |
235 | PKCS7err(PKCS7_F_PKCS7_VERIFY,ERR_R_X509_LIB); | 234 | PKCS7err(PKCS7_F_PKCS7_VERIFY,ERR_R_X509_LIB); |
236 | sk_X509_free(signers); | 235 | sk_X509_free(signers); |