Various fixes...

[openssl.git] / crypto / x509 / x509_trs.c

diff --git a/crypto/x509/x509_trs.c b/crypto/x509/x509_trs.c
index 9f7d67952db8f33476e2b5a8116e9996d73e8224..a7b1543461b9ee6790d0f36ef4865c84908cf72a 100644 (file)
--- a/crypto/x509/x509_trs.c
+++ b/crypto/x509/x509_trs.c
@@ -61,11 +61,12 @@
 #include <openssl/x509v3.h>
 
 
-static int tr_cmp(X509_TRUST **a, X509_TRUST **b);
+static int tr_cmp(const X509_TRUST * const *a,
+               const X509_TRUST * const *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 +77,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},
@@ -88,7 +89,8 @@ IMPLEMENT_STACK_OF(X509_TRUST)
 
 static STACK_OF(X509_TRUST) *trtable = NULL;
 
-static int tr_cmp(X509_TRUST **a, X509_TRUST **b)
+static int tr_cmp(const X509_TRUST * const *a,
+               const X509_TRUST * const *b)
 {
        return (*a)->trust - (*b)->trust;
 }
@@ -107,8 +109,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);
 }
@@ -152,15 +154,15 @@ int X509_TRUST_add(int id, int flags, int (*ck)(X509_TRUST *, X509 *, int),
        idx = X509_TRUST_get_by_id(id);
        /* Need a new entry */
        if(idx == -1) {
-               if(!(trtmp = Malloc(sizeof(X509_TRUST)))) {
+               if(!(trtmp = OPENSSL_malloc(sizeof(X509_TRUST)))) {
                        X509err(X509_F_X509_TRUST_ADD,ERR_R_MALLOC_FAILURE);
                        return 0;
                }
                trtmp->flags = X509_TRUST_DYNAMIC;
        } else trtmp = X509_TRUST_get0(idx);
 
-       /* Free existing name if dynamic */
-       if(trtmp->flags & X509_TRUST_DYNAMIC_NAME) Free(trtmp->name);
+       /* OPENSSL_free existing name if dynamic */
+       if(trtmp->flags & X509_TRUST_DYNAMIC_NAME) OPENSSL_free(trtmp->name);
        /* dup supplied name */
        if(!(trtmp->name = BUF_strdup(name))) {
                X509err(X509_F_X509_TRUST_ADD,ERR_R_MALLOC_FAILURE);
@@ -196,8 +198,8 @@ static void trtable_free(X509_TRUST *p)
        if (p->flags & X509_TRUST_DYNAMIC) 
                {
                if (p->flags & X509_TRUST_DYNAMIC_NAME)
-                       Free(p->name);
-               Free(p);
+                       OPENSSL_free(p->name);
+               OPENSSL_free(p);
                }
        }
 
@@ -230,6 +232,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 +264,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;
-}