This commit was generated by cvs2git to track changes on a CVS vendor

branch.

1 files changed, 13 insertions, 3 deletions

diff --git a/src/lib/libcrypto/x509/x509_vpm.c b/src/lib/libcrypto/x509/x509_vpm.c
index c92e65936f..2b06718aec 100644
--- a/src/lib/libcrypto/x509/x509_vpm.c
+++ b/src/lib/libcrypto/x509/x509_vpm.c
@@ -74,7 +74,7 @@ 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 = 0;
         param->flags = 0;
         param->depth = -1;
         if (param->policies)
@@ -320,11 +320,21 @@ static const X509_VERIFY_PARAM default_table[] = {
         0,              /* flags */
         0,              /* purpose */
         0,              /* trust */
-        9,              /* depth */
+        100,            /* depth */
         NULL            /* policies */
         },
         {
-        "pkcs7",                        /* SSL/TLS client parameters */
+        "pkcs7",                        /* S/MIME signing 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 signing parameters */
         0,                              /* Check time */
         0,                              /* internal flags */
         0,                              /* flags */