summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2024-08-28 08:22:57 +0000
committertb <>2024-08-28 08:22:57 +0000
commit23be65173b8fc22f98a4dce92bcf8522144ce650 (patch)
treea50792c517f9c6f713e51a17c59bac54fefbd69d
parent23a332a1da95c4b3d49acb1aa6ffd49e1b5e3b92 (diff)
downloadopenbsd-23be65173b8fc22f98a4dce92bcf8522144ce650.tar.gz
openbsd-23be65173b8fc22f98a4dce92bcf8522144ce650.tar.bz2
openbsd-23be65173b8fc22f98a4dce92bcf8522144ce650.zip
Annotate X509V3_CONF_CTX and its only instance for removal
A comment saying /* Maybe more here */ in a public also goes (yuck). Of course the promise was fulfilled by OpenSSL 3. ok beck jsing
-rw-r--r--src/lib/libcrypto/x509/x509v3.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/libcrypto/x509/x509v3.h b/src/lib/libcrypto/x509/x509v3.h
index 1004f6f15b..b38e175954 100644
--- a/src/lib/libcrypto/x509/x509v3.h
+++ b/src/lib/libcrypto/x509/x509v3.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509v3.h,v 1.29 2024/03/02 10:43:52 tb Exp $ */ 1/* $OpenBSD: x509v3.h,v 1.30 2024/08/28 08:22:57 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 1999. 3 * project 1999.
4 */ 4 */
@@ -120,6 +120,7 @@ struct v3_ext_method {
120 void *usr_data; /* Any extension specific data */ 120 void *usr_data; /* Any extension specific data */
121}; 121};
122 122
123/* XXX - remove in next bump. */
123typedef struct X509V3_CONF_METHOD_st { 124typedef struct X509V3_CONF_METHOD_st {
124 char *(*get_string)(void *db, const char *section, const char *value); 125 char *(*get_string)(void *db, const char *section, const char *value);
125 STACK_OF(CONF_VALUE) *(*get_section)(void *db, const char *section); 126 STACK_OF(CONF_VALUE) *(*get_section)(void *db, const char *section);
@@ -127,7 +128,6 @@ typedef struct X509V3_CONF_METHOD_st {
127 void (*free_section)(void *db, STACK_OF(CONF_VALUE) *section); 128 void (*free_section)(void *db, STACK_OF(CONF_VALUE) *section);
128} X509V3_CONF_METHOD; 129} X509V3_CONF_METHOD;
129 130
130/* Context specific info */
131struct v3_ext_ctx { 131struct v3_ext_ctx {
132 #define CTX_TEST 0x1 132 #define CTX_TEST 0x1
133 int flags; 133 int flags;
@@ -135,9 +135,8 @@ struct v3_ext_ctx {
135 X509 *subject_cert; 135 X509 *subject_cert;
136 X509_REQ *subject_req; 136 X509_REQ *subject_req;
137 X509_CRL *crl; 137 X509_CRL *crl;
138 X509V3_CONF_METHOD *db_meth; 138 X509V3_CONF_METHOD *db_meth; /* XXX - remove in next bump. */
139 void *db; 139 void *db;
140 /* Maybe more here */
141}; 140};
142 141
143typedef struct v3_ext_method X509V3_EXT_METHOD; 142typedef struct v3_ext_method X509V3_EXT_METHOD;