diff options
| author | tb <> | 2025-10-24 11:33:38 +0000 |
|---|---|---|
| committer | tb <> | 2025-10-24 11:33:38 +0000 |
| commit | f77c42a93e09c937696f65c6aefd2b3120a20cff (patch) | |
| tree | 8caa19f0bf9d3c53e5002a0ce6f375a37d971e7c /src/lib | |
| parent | 8cbd4e746f40c750809e34d04c0298e0a5ff6f42 (diff) | |
| download | openbsd-f77c42a93e09c937696f65c6aefd2b3120a20cff.tar.gz openbsd-f77c42a93e09c937696f65c6aefd2b3120a20cff.tar.bz2 openbsd-f77c42a93e09c937696f65c6aefd2b3120a20cff.zip | |
Expose X509_VERIFY_PARAM_get_hostflags()
This is needed by Python 3.14, extending the urllib3 nonsense further.
This is a trivial getter and it is exercised by the libssl unit test
I added for urllib3 (which can now use dynamic linking for libcrypto).
Fixes https://github.com/libressl/portable/issues/1202
Thanks to @orbea for the report.
ok kenjiro
PS: X509_VERIFY_PARAM_get_flags() and X509_VERIFY_PARAM_get_peername()
aren't const correct. Fixing this will require some doing...
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/libcrypto/Symbols.list | 1 | ||||
| -rw-r--r-- | src/lib/libcrypto/hidden/openssl/x509_vfy.h | 3 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/x509_vfy.h | 3 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509/x509_vpm.c | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list index 33668f24c5..d85922e12e 100644 --- a/src/lib/libcrypto/Symbols.list +++ b/src/lib/libcrypto/Symbols.list | |||
| @@ -2654,6 +2654,7 @@ X509_VERIFY_PARAM_get0_peername | |||
| 2654 | X509_VERIFY_PARAM_get_count | 2654 | X509_VERIFY_PARAM_get_count |
| 2655 | X509_VERIFY_PARAM_get_depth | 2655 | X509_VERIFY_PARAM_get_depth |
| 2656 | X509_VERIFY_PARAM_get_flags | 2656 | X509_VERIFY_PARAM_get_flags |
| 2657 | X509_VERIFY_PARAM_get_hostflags | ||
| 2657 | X509_VERIFY_PARAM_get_time | 2658 | X509_VERIFY_PARAM_get_time |
| 2658 | X509_VERIFY_PARAM_inherit | 2659 | X509_VERIFY_PARAM_inherit |
| 2659 | X509_VERIFY_PARAM_lookup | 2660 | X509_VERIFY_PARAM_lookup |
diff --git a/src/lib/libcrypto/hidden/openssl/x509_vfy.h b/src/lib/libcrypto/hidden/openssl/x509_vfy.h index cc0991518f..d0c46b655e 100644 --- a/src/lib/libcrypto/hidden/openssl/x509_vfy.h +++ b/src/lib/libcrypto/hidden/openssl/x509_vfy.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_vfy.h,v 1.10 2025/03/09 15:20:20 tb Exp $ */ | 1 | /* $OpenBSD: x509_vfy.h,v 1.11 2025/10/24 11:33:38 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2022 Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2022 Bob Beck <beck@openbsd.org> |
| 4 | * | 4 | * |
| @@ -122,6 +122,7 @@ LCRYPTO_USED(X509_VERIFY_PARAM_set1_name); | |||
| 122 | LCRYPTO_USED(X509_VERIFY_PARAM_set_flags); | 122 | LCRYPTO_USED(X509_VERIFY_PARAM_set_flags); |
| 123 | LCRYPTO_USED(X509_VERIFY_PARAM_clear_flags); | 123 | LCRYPTO_USED(X509_VERIFY_PARAM_clear_flags); |
| 124 | LCRYPTO_USED(X509_VERIFY_PARAM_get_flags); | 124 | LCRYPTO_USED(X509_VERIFY_PARAM_get_flags); |
| 125 | LCRYPTO_USED(X509_VERIFY_PARAM_get_hostflags); | ||
| 125 | LCRYPTO_USED(X509_VERIFY_PARAM_set_purpose); | 126 | LCRYPTO_USED(X509_VERIFY_PARAM_set_purpose); |
| 126 | LCRYPTO_USED(X509_VERIFY_PARAM_set_trust); | 127 | LCRYPTO_USED(X509_VERIFY_PARAM_set_trust); |
| 127 | LCRYPTO_USED(X509_VERIFY_PARAM_set_depth); | 128 | LCRYPTO_USED(X509_VERIFY_PARAM_set_depth); |
diff --git a/src/lib/libcrypto/x509/x509_vfy.h b/src/lib/libcrypto/x509/x509_vfy.h index 7058bbc5b0..04e555149a 100644 --- a/src/lib/libcrypto/x509/x509_vfy.h +++ b/src/lib/libcrypto/x509/x509_vfy.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_vfy.h,v 1.70 2025/03/09 15:20:20 tb Exp $ */ | 1 | /* $OpenBSD: x509_vfy.h,v 1.71 2025/10/24 11:33:38 tb Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -441,6 +441,7 @@ int X509_VERIFY_PARAM_set1_host(X509_VERIFY_PARAM *param, const char *name, | |||
| 441 | size_t namelen); | 441 | size_t namelen); |
| 442 | int X509_VERIFY_PARAM_add1_host(X509_VERIFY_PARAM *param, const char *name, | 442 | int X509_VERIFY_PARAM_add1_host(X509_VERIFY_PARAM *param, const char *name, |
| 443 | size_t namelen); | 443 | size_t namelen); |
| 444 | unsigned int X509_VERIFY_PARAM_get_hostflags(const X509_VERIFY_PARAM *param); | ||
| 444 | void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param, | 445 | void X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param, |
| 445 | unsigned int flags); | 446 | unsigned int flags); |
| 446 | char *X509_VERIFY_PARAM_get0_peername(X509_VERIFY_PARAM *param); | 447 | char *X509_VERIFY_PARAM_get0_peername(X509_VERIFY_PARAM *param); |
diff --git a/src/lib/libcrypto/x509/x509_vpm.c b/src/lib/libcrypto/x509/x509_vpm.c index 0789a51c13..7b4ce3b7a6 100644 --- a/src/lib/libcrypto/x509/x509_vpm.c +++ b/src/lib/libcrypto/x509/x509_vpm.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509_vpm.c,v 1.57 2025/10/10 23:07:40 tb Exp $ */ | 1 | /* $OpenBSD: x509_vpm.c,v 1.58 2025/10/24 11:33:38 tb Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2004. | 3 | * project 2004. |
| 4 | */ | 4 | */ |
| @@ -543,12 +543,12 @@ X509_VERIFY_PARAM_add1_host(X509_VERIFY_PARAM *param, | |||
| 543 | } | 543 | } |
| 544 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_add1_host); | 544 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_add1_host); |
| 545 | 545 | ||
| 546 | /* Public API in OpenSSL - nothing seems to use this. */ | ||
| 547 | unsigned int | 546 | unsigned int |
| 548 | X509_VERIFY_PARAM_get_hostflags(const X509_VERIFY_PARAM *param) | 547 | X509_VERIFY_PARAM_get_hostflags(const X509_VERIFY_PARAM *param) |
| 549 | { | 548 | { |
| 550 | return param->hostflags; | 549 | return param->hostflags; |
| 551 | } | 550 | } |
| 551 | LCRYPTO_ALIAS(X509_VERIFY_PARAM_get_hostflags); | ||
| 552 | 552 | ||
| 553 | void | 553 | void |
| 554 | X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param, unsigned int flags) | 554 | X509_VERIFY_PARAM_set_hostflags(X509_VERIFY_PARAM *param, unsigned int flags) |
