1 files changed, 348 insertions, 133 deletions

diff --git a/src/lib/libcrypto/x509/x509_vfy.c b/src/lib/libcrypto/x509/x509_vfy.c
index 383e082aba..9a62ebcf67 100644
--- a/src/lib/libcrypto/x509/x509_vfy.c
+++ b/src/lib/libcrypto/x509/x509_vfy.c
@@ -77,8 +77,9 @@ static int check_chain_extensions(X509_STORE_CTX *ctx);
 static int check_trust(X509_STORE_CTX *ctx);
 static int check_revocation(X509_STORE_CTX *ctx);
 static int check_cert(X509_STORE_CTX *ctx);
+static int check_policy(X509_STORE_CTX *ctx);
 static int internal_verify(X509_STORE_CTX *ctx);
-const char *X509_version="X.509" OPENSSL_VERSION_PTEXT;
+const char X509_version[]="X.509" OPENSSL_VERSION_PTEXT;
 
 
 static int null_callback(int ok, X509_STORE_CTX *e)
@@ -97,11 +98,12 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
         {
         X509 *x,*xtmp,*chain_ss=NULL;
         X509_NAME *xn;
+        int bad_chain = 0;
+        X509_VERIFY_PARAM *param = ctx->param;
         int depth,i,ok=0;
         int num;
-        int (*cb)();
+        int (*cb)(int xok,X509_STORE_CTX *xctx);
         STACK_OF(X509) *sktmp=NULL;
-
         if (ctx->cert == NULL)
                 {
                 X509err(X509_F_X509_VERIFY_CERT,X509_R_NO_CERT_SET_FOR_US_TO_VERIFY);
@@ -134,7 +136,7 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
 
         num=sk_X509_num(ctx->chain);
         x=sk_X509_value(ctx->chain,num-1);
-        depth=ctx->depth;
+        depth=param->depth;
 
 
         for (;;)
@@ -162,7 +164,7 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
                                         goto end;
                                         }
                                 CRYPTO_add(&xtmp->references,1,CRYPTO_LOCK_X509);
-                                sk_X509_delete_ptr(sktmp,xtmp);
+                                (void)sk_X509_delete_ptr(sktmp,xtmp);
                                 ctx->last_untrusted++;
                                 x=xtmp;
                                 num++;
@@ -201,6 +203,7 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
                                 ctx->current_cert=x;
                                 ctx->error_depth=i-1;
                                 if (ok == 1) X509_free(xtmp);
+                                bad_chain = 1;
                                 ok=cb(0,ctx);
                                 if (!ok) goto end;
                                 }
@@ -211,7 +214,7 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
                                  */
                                 X509_free(x);
                                 x = xtmp;
-                                sk_X509_set(ctx->chain, i - 1, x);
+                                (void)sk_X509_set(ctx->chain, i - 1, x);
                                 ctx->last_untrusted=0;
                                 }
                         }
@@ -276,6 +279,7 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
                         }
 
                 ctx->error_depth=num-1;
+                bad_chain = 1;
                 ok=cb(0,ctx);
                 if (!ok) goto end;
                 }
@@ -287,7 +291,7 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
 
         /* The chain extensions are OK: check trust */
 
-        if (ctx->trust > 0) ok = check_trust(ctx);
+        if (param->trust > 0) ok = check_trust(ctx);
 
         if (!ok) goto end;
 
@@ -301,11 +305,25 @@ int X509_verify_cert(X509_STORE_CTX *ctx)
         ok = ctx->check_revocation(ctx);
         if(!ok) goto end;
 
-        /* At this point, we have a chain and just need to verify it */
+        /* At this point, we have a chain and need to verify it */
         if (ctx->verify != NULL)
                 ok=ctx->verify(ctx);
         else
                 ok=internal_verify(ctx);
+        if(!ok) goto end;
+
+#ifndef OPENSSL_NO_RFC3779
+        /* RFC 3779 path validation, now that CRL check has been done */
+        ok = v3_asid_validate_path(ctx);
+        if (!ok) goto end;
+        ok = v3_addr_validate_path(ctx);
+        if (!ok) goto end;
+#endif
+
+        /* If we get this far evaluate policies */
+        if (!bad_chain && (ctx->param->flags & X509_V_FLAG_POLICY_CHECK))
+                ok = ctx->check_policy(ctx);
+        if(!ok) goto end;
         if (0)
                 {
 end:
@@ -342,7 +360,7 @@ static int check_issued(X509_STORE_CTX *ctx, X509 *x, X509 *issuer)
         if (ret == X509_V_OK)
                 return 1;
         /* If we haven't asked for issuer errors don't set ctx */
-        if (!(ctx->flags & X509_V_FLAG_CB_ISSUER_CHECK))
+        if (!(ctx->param->flags & X509_V_FLAG_CB_ISSUER_CHECK))
                 return 0;
 
         ctx->error = ret;
@@ -365,7 +383,7 @@ static int get_issuer_sk(X509 **issuer, X509_STORE_CTX *ctx, X509 *x)
         else
                 return 0;
 }
-
+        
 
 /* Check a certificate chains extensions for consistency
  * with the supplied purpose
@@ -378,9 +396,10 @@ static int check_chain_extensions(X509_STORE_CTX *ctx)
 #else
         int i, ok=0, must_be_ca;
         X509 *x;
-        int (*cb)();
+        int (*cb)(int xok,X509_STORE_CTX *xctx);
         int proxy_path_length = 0;
-        int allow_proxy_certs = !!(ctx->flags & X509_V_FLAG_ALLOW_PROXY_CERTS);
+        int allow_proxy_certs =
+                !!(ctx->param->flags & X509_V_FLAG_ALLOW_PROXY_CERTS);
         cb=ctx->verify_cb;
 
         /* must_be_ca can have 1 of 3 values:
@@ -403,7 +422,7 @@ static int check_chain_extensions(X509_STORE_CTX *ctx)
                 {
                 int ret;
                 x = sk_X509_value(ctx->chain, i);
-                if (!(ctx->flags & X509_V_FLAG_IGNORE_CRITICAL)
+                if (!(ctx->param->flags & X509_V_FLAG_IGNORE_CRITICAL)
                         && (x->ex_flags & EXFLAG_CRITICAL))
                         {
                         ctx->error = X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION;
@@ -424,7 +443,7 @@ static int check_chain_extensions(X509_STORE_CTX *ctx)
                 switch(must_be_ca)
                         {
                 case -1:
-                        if ((ctx->flags & X509_V_FLAG_X509_STRICT)
+                        if ((ctx->param->flags & X509_V_FLAG_X509_STRICT)
                                 && (ret != 1) && (ret != 0))
                                 {
                                 ret = 0;
@@ -444,7 +463,7 @@ static int check_chain_extensions(X509_STORE_CTX *ctx)
                         break;
                 default:
                         if ((ret == 0)
-                                || ((ctx->flags & X509_V_FLAG_X509_STRICT)
+                                || ((ctx->param->flags & X509_V_FLAG_X509_STRICT)
                                         && (ret != 1)))
                                 {
                                 ret = 0;
@@ -461,12 +480,12 @@ static int check_chain_extensions(X509_STORE_CTX *ctx)
                         ok=cb(0,ctx);
                         if (!ok) goto end;
                         }
-                if (ctx->purpose > 0)
+                if (ctx->param->purpose > 0)
                         {
-                        ret = X509_check_purpose(x, ctx->purpose,
+                        ret = X509_check_purpose(x, ctx->param->purpose,
                                 must_be_ca > 0);
                         if ((ret == 0)
-                                || ((ctx->flags & X509_V_FLAG_X509_STRICT)
+                                || ((ctx->param->flags & X509_V_FLAG_X509_STRICT)
                                         && (ret != 1)))
                                 {
                                 ctx->error = X509_V_ERR_INVALID_PURPOSE;
@@ -492,21 +511,15 @@ static int check_chain_extensions(X509_STORE_CTX *ctx)
                    CA certificate.  */
                 if (x->ex_flags & EXFLAG_PROXY)
                         {
-                        PROXY_CERT_INFO_EXTENSION *pci =
-                                X509_get_ext_d2i(x, NID_proxyCertInfo,
-                                        NULL, NULL);
-                        if (pci->pcPathLengthConstraint &&
-                                ASN1_INTEGER_get(pci->pcPathLengthConstraint)
-                                < i)
+                        if (x->ex_pcpathlen != -1 && i > x->ex_pcpathlen)
                                 {
-                                PROXY_CERT_INFO_EXTENSION_free(pci);
-                                ctx->error = X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED;
+                                ctx->error =
+                                        X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED;
                                 ctx->error_depth = i;
                                 ctx->current_cert = x;
                                 ok=cb(0,ctx);
                                 if (!ok) goto end;
                                 }
-                        PROXY_CERT_INFO_EXTENSION_free(pci);
                         proxy_path_length++;
                         must_be_ca = 0;
                         }
@@ -526,12 +539,12 @@ static int check_trust(X509_STORE_CTX *ctx)
 #else
         int i, ok;
         X509 *x;
-        int (*cb)();
+        int (*cb)(int xok,X509_STORE_CTX *xctx);
         cb=ctx->verify_cb;
 /* For now just check the last certificate in the chain */
         i = sk_X509_num(ctx->chain) - 1;
         x = sk_X509_value(ctx->chain, i);
-        ok = X509_check_trust(x, ctx->trust, 0);
+        ok = X509_check_trust(x, ctx->param->trust, 0);
         if (ok == X509_TRUST_TRUSTED)
                 return 1;
         ctx->error_depth = i;
@@ -548,9 +561,9 @@ static int check_trust(X509_STORE_CTX *ctx)
 static int check_revocation(X509_STORE_CTX *ctx)
         {
         int i, last, ok;
-        if (!(ctx->flags & X509_V_FLAG_CRL_CHECK))
+        if (!(ctx->param->flags & X509_V_FLAG_CRL_CHECK))
                 return 1;
-        if (ctx->flags & X509_V_FLAG_CRL_CHECK_ALL)
+        if (ctx->param->flags & X509_V_FLAG_CRL_CHECK_ALL)
                 last = sk_X509_num(ctx->chain) - 1;
         else
                 last = 0;
@@ -593,17 +606,124 @@ static int check_cert(X509_STORE_CTX *ctx)
 
         }
 
+/* Check CRL times against values in X509_STORE_CTX */
+
+static int check_crl_time(X509_STORE_CTX *ctx, X509_CRL *crl, int notify)
+        {
+        time_t *ptime;
+        int i;
+        ctx->current_crl = crl;
+        if (ctx->param->flags & X509_V_FLAG_USE_CHECK_TIME)
+                ptime = &ctx->param->check_time;
+        else
+                ptime = NULL;
+
+        i=X509_cmp_time(X509_CRL_get_lastUpdate(crl), ptime);
+        if (i == 0)
+                {
+                ctx->error=X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD;
+                if (!notify || !ctx->verify_cb(0, ctx))
+                        return 0;
+                }
+
+        if (i > 0)
+                {
+                ctx->error=X509_V_ERR_CRL_NOT_YET_VALID;
+                if (!notify || !ctx->verify_cb(0, ctx))
+                        return 0;
+                }
+
+        if(X509_CRL_get_nextUpdate(crl))
+                {
+                i=X509_cmp_time(X509_CRL_get_nextUpdate(crl), ptime);
+
+                if (i == 0)
+                        {
+                        ctx->error=X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD;
+                        if (!notify || !ctx->verify_cb(0, ctx))
+                                return 0;
+                        }
+
+                if (i < 0)
+                        {
+                        ctx->error=X509_V_ERR_CRL_HAS_EXPIRED;
+                        if (!notify || !ctx->verify_cb(0, ctx))
+                                return 0;
+                        }
+                }
+
+        ctx->current_crl = NULL;
+
+        return 1;
+        }
+
+/* Lookup CRLs from the supplied list. Look for matching isser name
+ * and validity. If we can't find a valid CRL return the last one
+ * with matching name. This gives more meaningful error codes. Otherwise
+ * we'd get a CRL not found error if a CRL existed with matching name but
+ * was invalid.
+ */
+
+static int get_crl_sk(X509_STORE_CTX *ctx, X509_CRL **pcrl,
+                        X509_NAME *nm, STACK_OF(X509_CRL) *crls)
+        {
+        int i;
+        X509_CRL *crl, *best_crl = NULL;
+        for (i = 0; i < sk_X509_CRL_num(crls); i++)
+                {
+                crl = sk_X509_CRL_value(crls, i);
+                if (X509_NAME_cmp(nm, X509_CRL_get_issuer(crl)))
+                        continue;
+                if (check_crl_time(ctx, crl, 0))
+                        {
+                        *pcrl = crl;
+                        CRYPTO_add(&crl->references, 1, CRYPTO_LOCK_X509);
+                        return 1;
+                        }
+                best_crl = crl;
+                }
+        if (best_crl)
+                {
+                *pcrl = best_crl;
+                CRYPTO_add(&best_crl->references, 1, CRYPTO_LOCK_X509);
+                }
+                
+        return 0;
+        }
+
 /* Retrieve CRL corresponding to certificate: currently just a
  * subject lookup: maybe use AKID later...
- * Also might look up any included CRLs too (e.g PKCS#7 signedData).
  */
-static int get_crl(X509_STORE_CTX *ctx, X509_CRL **crl, X509 *x)
+static int get_crl(X509_STORE_CTX *ctx, X509_CRL **pcrl, X509 *x)
         {
         int ok;
+        X509_CRL *crl = NULL;
         X509_OBJECT xobj;
-        ok = X509_STORE_get_by_subject(ctx, X509_LU_CRL, X509_get_issuer_name(x), &xobj);
-        if (!ok) return 0;
-        *crl = xobj.data.crl;
+        X509_NAME *nm;
+        nm = X509_get_issuer_name(x);
+        ok = get_crl_sk(ctx, &crl, nm, ctx->crls);
+        if (ok)
+                {
+                *pcrl = crl;
+                return 1;
+                }
+
+        ok = X509_STORE_get_by_subject(ctx, X509_LU_CRL, nm, &xobj);
+
+        if (!ok)
+                {
+                /* If we got a near match from get_crl_sk use that */
+                if (crl)
+                        {
+                        *pcrl = crl;
+                        return 1;
+                        }
+                return 0;
+                }
+
+        *pcrl = xobj.data.crl;
+        if (crl)
+                X509_CRL_free(crl);
         return 1;
         }
 
@@ -612,8 +732,7 @@ static int check_crl(X509_STORE_CTX *ctx, X509_CRL *crl)
         {
         X509 *issuer = NULL;
         EVP_PKEY *ikey = NULL;
-        int ok = 0, chnum, cnum, i;
-        time_t *ptime;
+        int ok = 0, chnum, cnum;
         cnum = ctx->error_depth;
         chnum = sk_X509_num(ctx->chain) - 1;
         /* Find CRL issuer: if not last certificate then issuer
@@ -665,45 +784,9 @@ static int check_crl(X509_STORE_CTX *ctx, X509_CRL *crl)
                         }
                 }
 
-        /* OK, CRL signature valid check times */
-        if (ctx->flags & X509_V_FLAG_USE_CHECK_TIME)
-                ptime = &ctx->check_time;
-        else
-                ptime = NULL;
-
-        i=X509_cmp_time(X509_CRL_get_lastUpdate(crl), ptime);
-        if (i == 0)
-                {
-                ctx->error=X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD;
-                ok = ctx->verify_cb(0, ctx);
-                if (!ok) goto err;
-                }
-
-        if (i > 0)
-                {
-                ctx->error=X509_V_ERR_CRL_NOT_YET_VALID;
-                ok = ctx->verify_cb(0, ctx);
-                if (!ok) goto err;
-                }
-
-        if(X509_CRL_get_nextUpdate(crl))
-                {
-                i=X509_cmp_time(X509_CRL_get_nextUpdate(crl), ptime);
-
-                if (i == 0)
-                        {
-                        ctx->error=X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD;
-                        ok = ctx->verify_cb(0, ctx);
-                        if (!ok) goto err;
-                        }
-
-                if (i < 0)
-                        {
-                        ctx->error=X509_V_ERR_CRL_HAS_EXPIRED;
-                        ok = ctx->verify_cb(0, ctx);
-                        if (!ok) goto err;
-                        }
-                }
+        ok = check_crl_time(ctx, crl, 1);
+        if (!ok)
+                goto err;
 
         ok = 1;
 
@@ -741,7 +824,7 @@ static int cert_crl(X509_STORE_CTX *ctx, X509_CRL *crl, X509 *x)
                 if (!ok) return 0;
                 }
 
-        if (ctx->flags & X509_V_FLAG_IGNORE_CRITICAL)
+        if (ctx->param->flags & X509_V_FLAG_IGNORE_CRITICAL)
                 return 1;
 
         /* See if we have any critical CRL extensions: since we
@@ -768,13 +851,106 @@ static int cert_crl(X509_STORE_CTX *ctx, X509_CRL *crl, X509 *x)
         return 1;
         }
 
+static int check_policy(X509_STORE_CTX *ctx)
+        {
+        int ret;
+        ret = X509_policy_check(&ctx->tree, &ctx->explicit_policy, ctx->chain,
+                                ctx->param->policies, ctx->param->flags);
+        if (ret == 0)
+                {
+                X509err(X509_F_CHECK_POLICY,ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
+        /* Invalid or inconsistent extensions */
+        if (ret == -1)
+                {
+                /* Locate certificates with bad extensions and notify
+                 * callback.
+                 */
+                X509 *x;
+                int i;
+                for (i = 1; i < sk_X509_num(ctx->chain); i++)
+                        {
+                        x = sk_X509_value(ctx->chain, i);
+                        if (!(x->ex_flags & EXFLAG_INVALID_POLICY))
+                                continue;
+                        ctx->current_cert = x;
+                        ctx->error = X509_V_ERR_INVALID_POLICY_EXTENSION;
+                        ret = ctx->verify_cb(0, ctx);
+                        }
+                return 1;
+                }
+        if (ret == -2)
+                {
+                ctx->current_cert = NULL;
+                ctx->error = X509_V_ERR_NO_EXPLICIT_POLICY;
+                return ctx->verify_cb(0, ctx);
+                }
+
+        if (ctx->param->flags & X509_V_FLAG_NOTIFY_POLICY)
+                {
+                ctx->current_cert = NULL;
+                ctx->error = X509_V_OK;
+                if (!ctx->verify_cb(2, ctx))
+                        return 0;
+                }
+
+        return 1;
+        }
+
+static int check_cert_time(X509_STORE_CTX *ctx, X509 *x)
+        {
+        time_t *ptime;
+        int i;
+
+        if (ctx->param->flags & X509_V_FLAG_USE_CHECK_TIME)
+                ptime = &ctx->param->check_time;
+        else
+                ptime = NULL;
+
+        i=X509_cmp_time(X509_get_notBefore(x), ptime);
+        if (i == 0)
+                {
+                ctx->error=X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD;
+                ctx->current_cert=x;
+                if (!ctx->verify_cb(0, ctx))
+                        return 0;
+                }
+
+        if (i > 0)
+                {
+                ctx->error=X509_V_ERR_CERT_NOT_YET_VALID;
+                ctx->current_cert=x;
+                if (!ctx->verify_cb(0, ctx))
+                        return 0;
+                }
+
+        i=X509_cmp_time(X509_get_notAfter(x), ptime);
+        if (i == 0)
+                {
+                ctx->error=X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD;
+                ctx->current_cert=x;
+                if (!ctx->verify_cb(0, ctx))
+                        return 0;
+                }
+
+        if (i < 0)
+                {
+                ctx->error=X509_V_ERR_CERT_HAS_EXPIRED;
+                ctx->current_cert=x;
+                if (!ctx->verify_cb(0, ctx))
+                        return 0;
+                }
+
+        return 1;
+        }
+
 static int internal_verify(X509_STORE_CTX *ctx)
         {
-        int i,ok=0,n;
+        int ok=0,n;
         X509 *xs,*xi;
         EVP_PKEY *pkey=NULL;
-        time_t *ptime;
-        int (*cb)();
+        int (*cb)(int xok,X509_STORE_CTX *xctx);
 
         cb=ctx->verify_cb;
 
@@ -782,10 +958,7 @@ static int internal_verify(X509_STORE_CTX *ctx)
         ctx->error_depth=n-1;
         n--;
         xi=sk_X509_value(ctx->chain,n);
-        if (ctx->flags & X509_V_FLAG_USE_CHECK_TIME)
-                ptime = &ctx->check_time;
-        else
-                ptime = NULL;
+
         if (ctx->check_issued(ctx, xi, xi))
                 xs=xi;
         else
@@ -838,41 +1011,13 @@ static int internal_verify(X509_STORE_CTX *ctx)
                                 }
                         EVP_PKEY_free(pkey);
                         pkey=NULL;
-
-                        i=X509_cmp_time(X509_get_notBefore(xs), ptime);
-                        if (i == 0)
-                                {
-                                ctx->error=X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD;
-                                ctx->current_cert=xs;
-                                ok=(*cb)(0,ctx);
-                                if (!ok) goto end;
-                                }
-                        if (i > 0)
-                                {
-                                ctx->error=X509_V_ERR_CERT_NOT_YET_VALID;
-                                ctx->current_cert=xs;
-                                ok=(*cb)(0,ctx);
-                                if (!ok) goto end;
-                                }
-                        xs->valid=1;
                         }
 
-                i=X509_cmp_time(X509_get_notAfter(xs), ptime);
-                if (i == 0)
-                        {
-                        ctx->error=X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD;
-                        ctx->current_cert=xs;
-                        ok=(*cb)(0,ctx);
-                        if (!ok) goto end;
-                        }
+                xs->valid = 1;
 
-                if (i < 0)
-                        {
-                        ctx->error=X509_V_ERR_CERT_HAS_EXPIRED;
-                        ctx->current_cert=xs;
-                        ok=(*cb)(0,ctx);
-                        if (!ok) goto end;
-                        }
+                ok = check_cert_time(ctx, xs);
+                if (!ok)
+                        goto end;
 
                 /* The last error (if any) is still in the error value */
                 ctx->current_issuer=xi;
@@ -1105,6 +1250,11 @@ void X509_STORE_CTX_set_chain(X509_STORE_CTX *ctx, STACK_OF(X509) *sk)
         ctx->untrusted=sk;
         }
 
+void X509_STORE_CTX_set0_crls(X509_STORE_CTX *ctx, STACK_OF(X509_CRL) *sk)
+        {
+        ctx->crls=sk;
+        }
+
 int X509_STORE_CTX_set_purpose(X509_STORE_CTX *ctx, int purpose)
         {
         return X509_STORE_CTX_purpose_inherit(ctx, 0, purpose, 0);
@@ -1168,8 +1318,8 @@ int X509_STORE_CTX_purpose_inherit(X509_STORE_CTX *ctx, int def_purpose,
                         }
                 }
 
-        if (purpose && !ctx->purpose) ctx->purpose = purpose;
-        if (trust && !ctx->trust) ctx->trust = trust;
+        if (purpose && !ctx->param->purpose) ctx->param->purpose = purpose;
+        if (trust && !ctx->param->trust) ctx->param->trust = trust;
         return 1;
 }
 
@@ -1195,20 +1345,30 @@ void X509_STORE_CTX_free(X509_STORE_CTX *ctx)
 int X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, X509 *x509,
              STACK_OF(X509) *chain)
         {
+        int ret = 1;
         ctx->ctx=store;
         ctx->current_method=0;
         ctx->cert=x509;
         ctx->untrusted=chain;
+        ctx->crls = NULL;
         ctx->last_untrusted=0;
-        ctx->check_time=0;
         ctx->other_ctx=NULL;
         ctx->valid=0;
         ctx->chain=NULL;
-        ctx->depth=9;
         ctx->error=0;
+        ctx->explicit_policy=0;
         ctx->error_depth=0;
         ctx->current_cert=NULL;
         ctx->current_issuer=NULL;
+        ctx->tree = NULL;
+
+        ctx->param = X509_VERIFY_PARAM_new();
+
+        if (!ctx->param)
+                {
+                X509err(X509_F_X509_STORE_CTX_INIT,ERR_R_MALLOC_FAILURE);
+                return 0;
+                }
 
         /* Inherit callbacks and flags from X509_STORE if not set
          * use defaults.
@@ -1216,18 +1376,26 @@ int X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, X509 *x509,
 
 
         if (store)
+                ret = X509_VERIFY_PARAM_inherit(ctx->param, store->param);
+        else
+                ctx->param->flags |= X509_VP_FLAG_DEFAULT|X509_VP_FLAG_ONCE;
+
+        if (store)
                 {
-                ctx->purpose=store->purpose;
-                ctx->trust=store->trust;
-                ctx->flags = store->flags;
+                ctx->verify_cb = store->verify_cb;
                 ctx->cleanup = store->cleanup;
                 }
         else
-                {
-                ctx->purpose = 0;
-                ctx->trust = 0;
-                ctx->flags = 0;
                 ctx->cleanup = 0;
+
+        if (ret)
+                ret = X509_VERIFY_PARAM_inherit(ctx->param,
+                                        X509_VERIFY_PARAM_lookup("default"));
+
+        if (ret == 0)
+                {
+                X509err(X509_F_X509_STORE_CTX_INIT,ERR_R_MALLOC_FAILURE);
+                return 0;
                 }
 
         if (store && store->check_issued)
@@ -1270,6 +1438,8 @@ int X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, X509 *x509,
         else
                 ctx->cert_crl = cert_crl;
 
+        ctx->check_policy = check_policy;
+
 
         /* This memset() can't make any sense anyway, so it's removed. As
          * X509_STORE_CTX_cleanup does a proper "free" on the ex_data, we put a
@@ -1298,6 +1468,16 @@ void X509_STORE_CTX_trusted_stack(X509_STORE_CTX *ctx, STACK_OF(X509) *sk)
 void X509_STORE_CTX_cleanup(X509_STORE_CTX *ctx)
         {
         if (ctx->cleanup) ctx->cleanup(ctx);
+        if (ctx->param != NULL)
+                {
+                X509_VERIFY_PARAM_free(ctx->param);
+                ctx->param=NULL;
+                }
+        if (ctx->tree != NULL)
+                {
+                X509_policy_tree_free(ctx->tree);
+                ctx->tree=NULL;
+                }
         if (ctx->chain != NULL)
                 {
                 sk_X509_pop_free(ctx->chain,X509_free);
@@ -1307,15 +1487,19 @@ void X509_STORE_CTX_cleanup(X509_STORE_CTX *ctx)
         memset(&ctx->ex_data,0,sizeof(CRYPTO_EX_DATA));
         }
 
-void X509_STORE_CTX_set_flags(X509_STORE_CTX *ctx, long flags)
+void X509_STORE_CTX_set_depth(X509_STORE_CTX *ctx, int depth)
         {
-        ctx->flags |= flags;
+        X509_VERIFY_PARAM_set_depth(ctx->param, depth);
         }
 
-void X509_STORE_CTX_set_time(X509_STORE_CTX *ctx, long flags, time_t t)
+void X509_STORE_CTX_set_flags(X509_STORE_CTX *ctx, unsigned long flags)
         {
-        ctx->check_time = t;
-        ctx->flags |= X509_V_FLAG_USE_CHECK_TIME;
+        X509_VERIFY_PARAM_set_flags(ctx->param, flags);
+        }
+
+void X509_STORE_CTX_set_time(X509_STORE_CTX *ctx, unsigned long flags, time_t t)
+        {
+        X509_VERIFY_PARAM_set_time(ctx->param, t);
         }
 
 void X509_STORE_CTX_set_verify_cb(X509_STORE_CTX *ctx,
@@ -1324,6 +1508,37 @@ void X509_STORE_CTX_set_verify_cb(X509_STORE_CTX *ctx,
         ctx->verify_cb=verify_cb;
         }
 
+X509_POLICY_TREE *X509_STORE_CTX_get0_policy_tree(X509_STORE_CTX *ctx)
+        {
+        return ctx->tree;
+        }
+
+int X509_STORE_CTX_get_explicit_policy(X509_STORE_CTX *ctx)
+        {
+        return ctx->explicit_policy;
+        }
+
+int X509_STORE_CTX_set_default(X509_STORE_CTX *ctx, const char *name)
+        {
+        const X509_VERIFY_PARAM *param;
+        param = X509_VERIFY_PARAM_lookup(name);
+        if (!param)
+                return 0;
+        return X509_VERIFY_PARAM_inherit(ctx->param, param);
+        }
+
+X509_VERIFY_PARAM *X509_STORE_CTX_get0_param(X509_STORE_CTX *ctx)
+        {
+        return ctx->param;
+        }
+
+void X509_STORE_CTX_set0_param(X509_STORE_CTX *ctx, X509_VERIFY_PARAM *param)
+        {
+        if (ctx->param)
+                X509_VERIFY_PARAM_free(ctx->param);
+        ctx->param = param;
+        }
+
 IMPLEMENT_STACK_OF(X509)
 IMPLEMENT_ASN1_SET_OF(X509)