diff options
| author | Simon L. B. Nielsen <simon@FreeBSD.org> | 2009-06-07 19:56:18 +0000 |
|---|---|---|
| committer | Simon L. B. Nielsen <simon@FreeBSD.org> | 2009-06-07 19:56:18 +0000 |
| commit | 518099af59fbde0e7140459c76f59c9ac24bdf9c (patch) | |
| tree | 873f9f63931a5d069bbcb053ea49eec4a92802dc /crypto/pkcs7/pk7_smime.c | |
| parent | c285625302c2411508052af6f109be9f6b789379 (diff) | |
| download | src-518099af59fbde0e7140459c76f59c9ac24bdf9c.tar.gz src-518099af59fbde0e7140459c76f59c9ac24bdf9c.zip | |
Import OpenSSL 0.9.8k.vendor/openssl/0.9.8k
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=193645
svn path=/vendor-crypto/openssl/0.9.8k/; revision=193646; tag=vendor/openssl/0.9.8k
Diffstat (limited to 'crypto/pkcs7/pk7_smime.c')
| -rw-r--r-- | crypto/pkcs7/pk7_smime.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c index 5c6b0fe24bcc..fd18ec3d95cf 100644 --- a/crypto/pkcs7/pk7_smime.c +++ b/crypto/pkcs7/pk7_smime.c @@ -1,5 +1,5 @@ /* pk7_smime.c */ -/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL +/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project. */ /* ==================================================================== @@ -229,8 +229,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, sk_X509_free(signers); return 0; } - X509_STORE_CTX_set_purpose(&cert_ctx, - X509_PURPOSE_SMIME_SIGN); + X509_STORE_CTX_set_default(&cert_ctx, "smime_sign"); } else if(!X509_STORE_CTX_init (&cert_ctx, store, signer, NULL)) { PKCS7err(PKCS7_F_PKCS7_VERIFY,ERR_R_X509_LIB); sk_X509_free(signers); @@ -282,6 +281,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, PKCS7err(PKCS7_F_PKCS7_VERIFY,ERR_R_MALLOC_FAILURE); goto err; } + BIO_set_mem_eof_return(tmpout, 0); } else tmpout = out; /* We now have to 'read' from p7bio to calculate digests etc. */ |