aboutsummaryrefslogtreecommitdiff
path: root/patches
diff options
context:
space:
mode:
authorTheo Buehler <tb@openbsd.org>2023-05-25 09:11:58 +0200
committerTheo Buehler <tb@openbsd.org>2023-05-25 09:13:36 +0200
commit1581cb1823377220ed1976451615a1f5e856adf0 (patch)
tree52a7e1991a9bed749f4e5e6f18ec69f30991f9c8 /patches
parenta5f207bea5b54c5066ac99cc8112a5aa0b56dec4 (diff)
downloadportable-1581cb1823377220ed1976451615a1f5e856adf0.tar.gz
portable-1581cb1823377220ed1976451615a1f5e856adf0.tar.bz2
portable-1581cb1823377220ed1976451615a1f5e856adf0.zip
Fix urllib3 CN without SAN tests for LibreSSL 3.7
This is a port of a patch by Christian Heimes and fixes an issue flagged by Quentin Pradet: https://bugs.python.org/issue43522
Diffstat (limited to 'patches')
-rw-r--r--patches/x509_vpm.c.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/patches/x509_vpm.c.patch b/patches/x509_vpm.c.patch
new file mode 100644
index 0000000..8809471
--- /dev/null
+++ b/patches/x509_vpm.c.patch
@@ -0,0 +1,21 @@
1--- crypto/x509/x509_vpm.c.orig Thu May 25 09:08:38 2023
2+++ crypto/x509/x509_vpm.c Thu May 25 09:08:48 2023
3@@ -330,7 +330,9 @@ X509_VERIFY_PARAM_inherit(X509_VERIFY_PARAM *dest, con
4 return 0;
5 }
6
7- /* Copy the host flags if and only if we're copying the host list */
8+ if (test_x509_verify_param_copy_id(hostflags, 0))
9+ dest->id->hostflags = id->hostflags;
10+
11 if (test_x509_verify_param_copy_id(hosts, NULL)) {
12 if (dest->id->hosts) {
13 string_stack_free(dest->id->hosts);
14@@ -341,7 +343,6 @@ X509_VERIFY_PARAM_inherit(X509_VERIFY_PARAM *dest, con
15 sk_deep_copy(id->hosts, strdup, str_free);
16 if (dest->id->hosts == NULL)
17 return 0;
18- dest->id->hostflags = id->hostflags;
19 }
20 }
21