2 files changed, 105 insertions, 4 deletions

diff --git a/src/regress/lib/libcrypto/x509/callback.c b/src/regress/lib/libcrypto/x509/callback.c
index 24339e7613..a021115531 100644
--- a/src/regress/lib/libcrypto/x509/callback.c
+++ b/src/regress/lib/libcrypto/x509/callback.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: callback.c,v 1.7 2026/05/04 13:49:07 tb Exp $ */
+/* $OpenBSD: callback.c,v 1.8 2026/05/04 13:52:39 tb Exp $ */
 /*
  * Copyright (c) 2020 Joel Sing <jsing@openbsd.org>
  * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org>
@@ -177,6 +177,7 @@ verify_cert(const char *roots_dir, const char *roots_file,
 }
 
 struct verify_cert_test {
+        const char *desc;
         const char *id;
         int set_depth;
         int want_chains;
@@ -193,6 +194,24 @@ struct verify_cert_test verify_cert_tests[] = {
                 .want_chains = 1,
         },
         {
+                .desc = "2a with depth 2",
+                .id = "2a",
+                .set_depth = 2,
+                .want_chains = 1,
+        },
+        {
+                .desc = "2a with depth 1",
+                .id = "2a",
+                .set_depth = 1,
+                .want_chains = 0,
+        },
+        {
+                .desc = "2a with depth 1",
+                .id = "2a",
+                .set_depth = 1,
+                .want_chains = 0,
+        },
+        {
                 .id = "2b",
                 .want_chains = 0,
         },
@@ -380,7 +399,8 @@ verify_cert_test(const char *certs_path, int mode)
                 if (asprintf(&roots_dir, "./%s/roots", vct->id) == -1)
                         errx(1, "asprintf");
 
-                fprintf(output, "== Test %zu (%s)\n", i, vct->id);
+                fprintf(output, "== Test %zu (%s)\n", i,
+                    vct->desc != NULL ? vct->desc : vct->id);
                 fprintf(output, "== Legacy:\n");
                 mode = MODE_LEGACY_VFY;
                 verify_cert(roots_dir, roots_file, bundle_file, &chains,
diff --git a/src/regress/lib/libcrypto/x509/verify.c b/src/regress/lib/libcrypto/x509/verify.c
index c65c988948..8696209922 100644
--- a/src/regress/lib/libcrypto/x509/verify.c
+++ b/src/regress/lib/libcrypto/x509/verify.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: verify.c,v 1.15 2026/05/04 13:49:07 tb Exp $ */
+/* $OpenBSD: verify.c,v 1.16 2026/05/04 13:52:39 tb Exp $ */
 /*
  * Copyright (c) 2020 Joel Sing <jsing@openbsd.org>
  * Copyright (c) 2020-2021 Bob Beck <beck@openbsd.org>
@@ -102,6 +102,41 @@ verify_cert_cb(int ok, X509_STORE_CTX *xsc)
         return ok;
 }
 
+static int
+verify_cert_depth_cb(int ok, X509_STORE_CTX *xsc)
+{
+        int verify_err;
+
+        ok = verify_cert_cb(ok, xsc);
+
+        verify_err = X509_STORE_CTX_get_error(xsc);
+        if (verify_err == X509_V_ERR_CERT_CHAIN_TOO_LONG) {
+                fprintf(stderr, "overriding verify error at depth %d: %s\n",
+                    X509_STORE_CTX_get_error_depth(xsc),
+                    X509_verify_cert_error_string(verify_err));
+                ok = 1;
+        }
+
+        return ok;
+}
+
+static int
+verify_cert_yolo_cb(int ok, X509_STORE_CTX *xsc)
+{
+        int verify_err;
+
+        verify_cert_cb(ok, xsc);
+
+        verify_err = X509_STORE_CTX_get_error(xsc);
+        if (verify_err != X509_V_OK) {
+                fprintf(stderr, "overriding verify error at depth %d: %s\n",
+                    X509_STORE_CTX_get_error_depth(xsc),
+                    X509_verify_cert_error_string(verify_err));
+        }
+
+        return 1;
+}
+
 static void
 verify_cert(const char *roots_dir, const char *roots_file,
     const char *bundle_file, int *chains, int *error, int *error_depth,
@@ -251,6 +286,7 @@ verify_cert_new(const char *roots_file, const char *bundle_file, int *chains,
 }
 
 struct verify_cert_test {
+        const char *desc;
         const char *id;
         int (*verify_cb)(int, X509_STORE_CTX *);
         int want_chains;
@@ -272,6 +308,32 @@ struct verify_cert_test verify_cert_tests[] = {
                 .want_chains = 1,
         },
         {
+                .desc = "2a with depth 2",
+                .id = "2a",
+                .set_depth = 2,
+                .want_chains = 1,
+        },
+        {
+                .desc = "2a with depth 1",
+                .id = "2a",
+                .set_depth = 1,
+                .want_chains = 0,
+                .want_error = X509_V_ERR_CERT_CHAIN_TOO_LONG,
+                .want_error_depth = 1,
+                .want_legacy_error = X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY,
+                .want_legacy_error_depth = 1,
+        },
+        {
+                .desc = "2a with depth 1 and depth callback",
+                .id = "2a",
+                .verify_cb = verify_cert_depth_cb,
+                .set_depth = 1,
+                .want_chains = 1,
+                .want_legacy_error = X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY,
+                .want_legacy_error_depth = 1,
+                .failing = 1,
+        },
+        {
                 .id = "2b",
                 .want_chains = 0,
                 .want_error = X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY,
@@ -482,6 +544,13 @@ struct verify_cert_test verify_cert_tests[] = {
                 .want_error_depth = 0,
         },
         {
+                .desc = "14a with yolo callback",
+                .id = "14a",
+                .verify_cb = verify_cert_yolo_cb,
+                .want_chains = 1,
+                .want_error_depth = 0,
+        },
+        {
                 .id = "14b",
                 .want_chains = 0,
                 .want_error = X509_V_ERR_CERT_CHAIN_TOO_LONG,
@@ -490,6 +559,17 @@ struct verify_cert_test verify_cert_tests[] = {
                 .want_legacy_error_depth = 0,
                 .failing = 1,
         },
+        {
+                .desc = "14b with yolo callback",
+                .id = "14b",
+                .verify_cb = verify_cert_yolo_cb,
+                .want_chains = 0,
+                .want_error = X509_V_ERR_CERT_CHAIN_TOO_LONG,
+                .want_error_depth = 32,
+                .want_legacy_error = 0,
+                .want_legacy_error_depth = 0,
+                .failing = 1,
+        },
 };
 
 #define N_VERIFY_CERT_TESTS \
@@ -519,7 +599,8 @@ verify_cert_test(const char *certs_path, int mode)
                 error = 0;
                 error_depth = 0;
 
-                fprintf(stderr, "== Test %zu (%s)\n", i, vct->id);
+                fprintf(stderr, "== Test %zu (%s)\n", i,
+                    vct->desc != NULL ? vct->desc : vct->id);
                 if (mode == MODE_VERIFY)
                         verify_cert_new(roots_file, bundle_file, &chains,
                             vct->set_depth, vct->verify_cb);