diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 1999-12-11 20:04:06 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 1999-12-11 20:04:06 +0000 |
| commit | b216664f666fa6c6371d1de0f6dd6292472e7f1e (patch) | |
| tree | 5250508071030e6386dd732f27dae77df131fceb /crypto/pkcs7/pk7_smime.c | |
| parent | d8223efd04f8526b602209ee5f39c06fa300beea (diff) | |
Various S/MIME fixes.
Diffstat (limited to 'crypto/pkcs7/pk7_smime.c')
| -rw-r--r-- | crypto/pkcs7/pk7_smime.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c index 4b557f48a2..04489380b8 100644 --- a/crypto/pkcs7/pk7_smime.c +++ b/crypto/pkcs7/pk7_smime.c @@ -115,13 +115,17 @@ PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs, } #ifndef NO_DES PKCS7_simple_smimecap (smcap, NID_des_ede3_cbc, -1); - PKCS7_simple_smimecap (smcap, NID_des_cbc, -1); #endif #ifndef NO_RC2 - PKCS7_simple_smimecap (smcap, NID_rc2_cbc, 40); PKCS7_simple_smimecap (smcap, NID_rc2_cbc, 128); PKCS7_simple_smimecap (smcap, NID_rc2_cbc, 64); #endif +#ifndef NO_DES + PKCS7_simple_smimecap (smcap, NID_des_cbc, -1); +#endif +#ifndef NO_RC2 + PKCS7_simple_smimecap (smcap, NID_rc2_cbc, 40); +#endif PKCS7_add_attrib_smimecap (si, smcap); sk_pop_free(smcap, X509_ALGOR_free); } @@ -152,7 +156,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, if(!p7) { PKCS7err(PKCS7_F_PKCS7_VERIFY,PKCS7_R_INVALID_NULL_POINTER); - return NULL; + return 0; } if(!PKCS7_type_is_signed(p7)) { |