import of OpenSSL 0.9.8k

2 files changed, 15 insertions, 4 deletions

diff --git a/src/lib/libcrypto/x509/x509_cmp.c b/src/lib/libcrypto/x509/x509_cmp.c
index e4c682fc44..2faf92514a 100644
--- a/src/lib/libcrypto/x509/x509_cmp.c
+++ b/src/lib/libcrypto/x509/x509_cmp.c
@@ -288,7 +288,8 @@ int X509_NAME_cmp(const X509_NAME *a, const X509_NAME *b)
                         if (!(nabit & STR_TYPE_CMP) ||
                                 !(nbbit & STR_TYPE_CMP))
                                 return j;
-                        j = asn1_string_memcmp(na->value, nb->value);
+                        if (!asn1_string_memcmp(na->value, nb->value))
+                                j = 0;
                         }
                 else if (na->value->type == V_ASN1_PRINTABLESTRING)
                         j=nocase_spacenorm_cmp(na->value, nb->value);
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 */