aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/x509/x509_vpm.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2009-03-15 13:37:34 +0000
committerDr. Stephen Henson <steve@openssl.org>2009-03-15 13:37:34 +0000
commit237d7b6caee75d64cf8cbbd424afa7627e05be26 (patch)
tree522516624254a4a38f513e61d43177868661964b /crypto/x509/x509_vpm.c
parent854a225a2737e6252772821b86c1200c92f60e53 (diff)
downloadopenssl-237d7b6caee75d64cf8cbbd424afa7627e05be26.tar.gz
Fix from stable branch.
Diffstat (limited to 'crypto/x509/x509_vpm.c')
-rw-r--r--crypto/x509/x509_vpm.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c
index a80f8e9478..acc50f97d5 100644
--- a/crypto/x509/x509_vpm.c
+++ b/crypto/x509/x509_vpm.c
@@ -74,7 +74,8 @@ static void x509_verify_param_zero(X509_VERIFY_PARAM *param)
param->name = NULL;
param->purpose = 0;
param->trust = 0;
- param->inh_flags = X509_VP_FLAG_DEFAULT;
+ /*param->inh_flags = X509_VP_FLAG_DEFAULT;*/
+ param->inh_flags = 0;
param->flags = 0;
param->depth = -1;
if (param->policies)
@@ -324,7 +325,17 @@ static const X509_VERIFY_PARAM default_table[] = {
NULL /* policies */
},
{
- "pkcs7", /* SSL/TLS client parameters */
+ "pkcs7", /* S/MIME sign parameters */
+ 0, /* Check time */
+ 0, /* internal flags */
+ 0, /* flags */
+ X509_PURPOSE_SMIME_SIGN, /* purpose */
+ X509_TRUST_EMAIL, /* trust */
+ -1, /* depth */
+ NULL /* policies */
+ },
+ {
+ "smime_sign", /* S/MIME sign parameters */
0, /* Check time */
0, /* internal flags */
0, /* flags */