OpenSSL 0.9.5a merge

5 files changed, 31 insertions, 17 deletions

diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h
index d3336d9ceb..0192272e7c 100644
--- a/src/lib/libcrypto/x509/x509.h
+++ b/src/lib/libcrypto/x509/x509.h
@@ -284,7 +284,9 @@ DECLARE_STACK_OF(X509_TRUST)
 
 /* standard trust ids */
 
-#define X509_TRUST_ANY          1
+#define X509_TRUST_DEFAULT      -1      /* Only valid in purpose settings */
+
+#define X509_TRUST_COMPAT       1
 #define X509_TRUST_SSL_CLIENT   2
 #define X509_TRUST_SSL_SERVER   3
 #define X509_TRUST_EMAIL        4
diff --git a/src/lib/libcrypto/x509/x509_err.c b/src/lib/libcrypto/x509/x509_err.c
index fdedbdac34..848add56e9 100644
--- a/src/lib/libcrypto/x509/x509_err.c
+++ b/src/lib/libcrypto/x509/x509_err.c
@@ -54,7 +54,8 @@
  */
 
 /* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file.
+ * made to it will be overwritten when the script next updates this file,
+ * only reason strings will be preserved.
  */
 
 #include <stdio.h>
diff --git a/src/lib/libcrypto/x509/x509_trs.c b/src/lib/libcrypto/x509/x509_trs.c
index 9f7d67952d..c779aaf94d 100644
--- a/src/lib/libcrypto/x509/x509_trs.c
+++ b/src/lib/libcrypto/x509/x509_trs.c
@@ -65,7 +65,7 @@ static int tr_cmp(X509_TRUST **a, X509_TRUST **b);
 static void trtable_free(X509_TRUST *p);
 
 static int trust_1oidany(X509_TRUST *trust, X509 *x, int flags);
-static int trust_any(X509_TRUST *trust, X509 *x, int flags);
+static int trust_compat(X509_TRUST *trust, X509 *x, int flags);
 
 static int obj_trust(int id, X509 *x, int flags);
 static int (*default_trust)(int id, X509 *x, int flags) = obj_trust;
@@ -76,7 +76,7 @@ static int (*default_trust)(int id, X509 *x, int flags) = obj_trust;
  */
 
 static X509_TRUST trstandard[] = {
-{X509_TRUST_ANY, 0, trust_any, "Any", 0, NULL},
+{X509_TRUST_COMPAT, 0, trust_compat, "compatible", 0, NULL},
 {X509_TRUST_SSL_CLIENT, 0, trust_1oidany, "SSL Client", NID_client_auth, NULL},
 {X509_TRUST_SSL_SERVER, 0, trust_1oidany, "SSL Client", NID_server_auth, NULL},
 {X509_TRUST_EMAIL, 0, trust_1oidany, "S/MIME email", NID_email_protect, NULL},
@@ -107,8 +107,8 @@ int X509_check_trust(X509 *x, int id, int flags)
         X509_TRUST *pt;
         int idx;
         if(id == -1) return 1;
-        if(!(idx = X509_TRUST_get_by_id(id)))
-                        return default_trust(id, x, flags);
+        idx = X509_TRUST_get_by_id(id);
+        if(idx == -1) return default_trust(id, x, flags);
         pt = X509_TRUST_get0(idx);
         return pt->check_trust(pt, x, flags);
 }
@@ -230,6 +230,11 @@ static int trust_1oidany(X509_TRUST *trust, X509 *x, int flags)
         /* we don't have any trust settings: for compatibility
          * we return trusted if it is self signed
          */
+        return trust_compat(trust, x, flags);
+}
+
+static int trust_compat(X509_TRUST *trust, X509 *x, int flags)
+{
         X509_check_purpose(x, -1, 0);
         if(x->ex_flags & EXFLAG_SS) return X509_TRUST_TRUSTED;
         else return X509_TRUST_UNTRUSTED;
@@ -257,7 +262,3 @@ static int obj_trust(int id, X509 *x, int flags)
         return X509_TRUST_UNTRUSTED;
 }
 
-static int trust_any(X509_TRUST *trust, X509 *x, int flags)
-{
-        return X509_TRUST_TRUSTED;
-}
diff --git a/src/lib/libcrypto/x509/x509_vfy.c b/src/lib/libcrypto/x509/x509_vfy.c
index 4fdff54124..3ddb2303d3 100644
--- a/src/lib/libcrypto/x509/x509_vfy.c
+++ b/src/lib/libcrypto/x509/x509_vfy.c
@@ -436,11 +436,14 @@ static int internal_verify(X509_STORE_CTX *ctx)
                                 }
                         if (X509_verify(xs,pkey) <= 0)
                                 {
-                                EVP_PKEY_free(pkey);
                                 ctx->error=X509_V_ERR_CERT_SIGNATURE_FAILURE;
                                 ctx->current_cert=xs;
                                 ok=(*cb)(0,ctx);
-                                if (!ok) goto end;
+                                if (!ok)
+                                        {
+                                        EVP_PKEY_free(pkey);
+                                        goto end;
+                                        }
                                 }
                         EVP_PKEY_free(pkey);
                         pkey=NULL;
@@ -768,18 +771,25 @@ int X509_STORE_CTX_purpose_inherit(X509_STORE_CTX *ctx, int def_purpose,
         if(!purpose) purpose = def_purpose;
         /* If we have a purpose then check it is valid */
         if(purpose) {
+                X509_PURPOSE *ptmp;
                 idx = X509_PURPOSE_get_by_id(purpose);
                 if(idx == -1) {
                         X509err(X509_F_X509_STORE_CTX_PURPOSE_INHERIT,
                                                 X509_R_UNKNOWN_PURPOSE_ID);
                         return 0;
                 }
-                /* If trust not set then get from purpose default */
-                if(!trust) {
-                        X509_PURPOSE *ptmp;
+                ptmp = X509_PURPOSE_get0(idx);
+                if(ptmp->trust == X509_TRUST_DEFAULT) {
+                        idx = X509_PURPOSE_get_by_id(def_purpose);
+                        if(idx == -1) {
+                                X509err(X509_F_X509_STORE_CTX_PURPOSE_INHERIT,
+                                                X509_R_UNKNOWN_PURPOSE_ID);
+                                return 0;
+                        }
                         ptmp = X509_PURPOSE_get0(idx);
-                        trust = ptmp->trust;
                 }
+                /* If trust not set then get from purpose default */
+                if(!trust) trust = ptmp->trust;
         }
         if(trust) {
                 idx = X509_TRUST_get_by_id(trust);
diff --git a/src/lib/libcrypto/x509/x509name.c b/src/lib/libcrypto/x509/x509name.c
index cf2382d42c..4c20e03ece 100644
--- a/src/lib/libcrypto/x509/x509name.c
+++ b/src/lib/libcrypto/x509/x509name.c
@@ -352,7 +352,7 @@ int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type,
         int i;
 
         if ((ne == NULL) || ((bytes == NULL) && (len != 0))) return(0);
-        if(type & MBSTRING_FLAG) 
+        if((type > 0) && (type & MBSTRING_FLAG)) 
                 return ASN1_STRING_set_by_NID(&ne->value, bytes,
                                                 len, type,
                                         OBJ_obj2nid(ne->object)) ? 1 : 0;