Unifdef LIBRESSL_HAS_POLICY_DAG and remove it from the Makefile

with beck

1 files changed, 1 insertions, 61 deletions

diff --git a/src/lib/libcrypto/x509/x509_vfy.c b/src/lib/libcrypto/x509/x509_vfy.c
index 76847e7224..93dc06ed05 100644
--- a/src/lib/libcrypto/x509/x509_vfy.c
+++ b/src/lib/libcrypto/x509/x509_vfy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_vfy.c,v 1.116 2023/04/26 19:11:33 beck Exp $ */
+/* $OpenBSD: x509_vfy.c,v 1.117 2023/04/28 16:30:14 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1744,7 +1744,6 @@ cert_crl(X509_STORE_CTX *ctx, X509_CRL *crl, X509 *x)
 }
 
 
-#ifdef LIBRESSL_HAS_POLICY_DAG
 int
 x509_vfy_check_policy(X509_STORE_CTX *ctx)
 {
@@ -1779,59 +1778,6 @@ x509_vfy_check_policy(X509_STORE_CTX *ctx)
 
         return 1;
 }
-#else
-int
-x509_vfy_check_policy(X509_STORE_CTX *ctx)
-{
-        int ret;
-
-        if (ctx->parent)
-                return 1;
-
-        /* X509_policy_check always allocates a new tree. */
-        X509_policy_tree_free(ctx->tree);
-        ctx->tree = NULL;
-
-        ret = X509_policy_check(&ctx->tree, &ctx->explicit_policy, ctx->chain,
-            ctx->param->policies, ctx->param->flags);
-        if (ret == 0) {
-                X509error(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;
-                        if (!ctx->verify_cb(0, ctx))
-                                return 0;
-                }
-                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;
-}
-#endif
 
 static int
 check_policy(X509_STORE_CTX *ctx)
@@ -2524,12 +2470,6 @@ X509_STORE_CTX_cleanup(X509_STORE_CTX *ctx)
                         X509_VERIFY_PARAM_free(ctx->param);
                 ctx->param = NULL;
         }
-#ifndef LIBRESSL_HAS_POLICY_DAG
-        if (ctx->tree != NULL) {
-                X509_policy_tree_free(ctx->tree);
-                ctx->tree = NULL;
-        }
-#endif
         if (ctx->chain != NULL) {
                 sk_X509_pop_free(ctx->chain, X509_free);
                 ctx->chain = NULL;