Merge ext_dat.h back into x509_lib.c

There is no point in having this in a separate internal header.

discussed with jsing

diff --git a/lib/libcrypto/x509/ext_dat.h b/lib/libcrypto/x509/ext_dat.h
index 253f1f8..bbd6ccf 100644 (file)
--- a/lib/libcrypto/x509/ext_dat.h
+++ b/lib/libcrypto/x509/ext_dat.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext_dat.h,v 1.5 2023/04/16 07:49:36 tb Exp $ */
+/* $OpenBSD: ext_dat.h,v 1.6 2023/04/16 11:52:52 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -62,81 +62,6 @@ __BEGIN_HIDDEN_DECLS
 
 /* This file contains a table of "standard" extensions */
 
-extern X509V3_EXT_METHOD v3_bcons, v3_nscert, v3_key_usage, v3_ext_ku;
-extern X509V3_EXT_METHOD v3_pkey_usage_period, v3_sxnet, v3_info, v3_sinfo;
-extern X509V3_EXT_METHOD v3_ns_ia5_list[], v3_alt[], v3_skey_id, v3_akey_id;
-extern X509V3_EXT_METHOD v3_crl_num, v3_crl_reason, v3_crl_invdate;
-extern X509V3_EXT_METHOD v3_delta_crl, v3_cpols, v3_crld, v3_freshest_crl;
-extern X509V3_EXT_METHOD v3_ocsp_nonce, v3_ocsp_accresp, v3_ocsp_acutoff;
-extern X509V3_EXT_METHOD v3_ocsp_crlid, v3_ocsp_nocheck, v3_ocsp_serviceloc;
-extern X509V3_EXT_METHOD v3_crl_hold;
-extern X509V3_EXT_METHOD v3_policy_mappings, v3_policy_constraints;
-extern X509V3_EXT_METHOD v3_name_constraints, v3_inhibit_anyp, v3_idp;
-extern const X509V3_EXT_METHOD v3_addr, v3_asid;
-extern const X509V3_EXT_METHOD v3_ct_scts[3];
-
-/* This table will be searched using OBJ_bsearch so it *must* kept in
- * order of the ext_nid values.
- */
-
-static const X509V3_EXT_METHOD *standard_exts[] = {
-       &v3_nscert,
-       &v3_ns_ia5_list[0],
-       &v3_ns_ia5_list[1],
-       &v3_ns_ia5_list[2],
-       &v3_ns_ia5_list[3],
-       &v3_ns_ia5_list[4],
-       &v3_ns_ia5_list[5],
-       &v3_ns_ia5_list[6],
-       &v3_skey_id,
-       &v3_key_usage,
-       &v3_pkey_usage_period,
-       &v3_alt[0],
-       &v3_alt[1],
-       &v3_bcons,
-       &v3_crl_num,
-       &v3_cpols,
-       &v3_akey_id,
-       &v3_crld,
-       &v3_ext_ku,
-       &v3_delta_crl,
-       &v3_crl_reason,
-#ifndef OPENSSL_NO_OCSP
-       &v3_crl_invdate,
-#endif
-       &v3_sxnet,
-       &v3_info,
-#ifndef OPENSSL_NO_RFC3779
-       &v3_addr,
-       &v3_asid,
-#endif
-#ifndef OPENSSL_NO_OCSP
-       &v3_ocsp_nonce,
-       &v3_ocsp_crlid,
-       &v3_ocsp_accresp,
-       &v3_ocsp_nocheck,
-       &v3_ocsp_acutoff,
-       &v3_ocsp_serviceloc,
-#endif
-       &v3_sinfo,
-       &v3_policy_constraints,
-#ifndef OPENSSL_NO_OCSP
-       &v3_crl_hold,
-#endif
-       &v3_name_constraints,
-       &v3_policy_mappings,
-       &v3_inhibit_anyp,
-       &v3_idp,
-       &v3_alt[2],
-       &v3_freshest_crl,
-#ifndef OPENSSL_NO_CT
-       &v3_ct_scts[0],
-       &v3_ct_scts[1],
-       &v3_ct_scts[2],
-#endif
-};
-
 /* Number of standard extensions */
-#define STANDARD_EXTENSION_COUNT (sizeof(standard_exts)/sizeof(X509V3_EXT_METHOD *))
 
 __END_HIDDEN_DECLS

diff --git a/lib/libcrypto/x509/x509_lib.c b/lib/libcrypto/x509/x509_lib.c
index 97d54ed..b520e53 100644 (file)
--- a/lib/libcrypto/x509/x509_lib.c
+++ b/lib/libcrypto/x509/x509_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_lib.c,v 1.7 2023/02/16 08:38:17 tb Exp $ */
+/* $OpenBSD: x509_lib.c,v 1.8 2023/04/16 11:52:52 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -63,7 +63,6 @@
 #include <openssl/err.h>
 #include <openssl/x509v3.h>
 
-#include "ext_dat.h"
 #include "x509_local.h"
 
 static STACK_OF(X509V3_EXT_METHOD) *ext_list = NULL;
@@ -72,6 +71,82 @@ static int ext_cmp(const X509V3_EXT_METHOD * const *a,
     const X509V3_EXT_METHOD * const *b);
 static void ext_list_free(X509V3_EXT_METHOD *ext);
 
+extern X509V3_EXT_METHOD v3_bcons, v3_nscert, v3_key_usage, v3_ext_ku;
+extern X509V3_EXT_METHOD v3_pkey_usage_period, v3_sxnet, v3_info, v3_sinfo;
+extern X509V3_EXT_METHOD v3_ns_ia5_list[], v3_alt[], v3_skey_id, v3_akey_id;
+extern X509V3_EXT_METHOD v3_crl_num, v3_crl_reason, v3_crl_invdate;
+extern X509V3_EXT_METHOD v3_delta_crl, v3_cpols, v3_crld, v3_freshest_crl;
+extern X509V3_EXT_METHOD v3_ocsp_nonce, v3_ocsp_accresp, v3_ocsp_acutoff;
+extern X509V3_EXT_METHOD v3_ocsp_crlid, v3_ocsp_nocheck, v3_ocsp_serviceloc;
+extern X509V3_EXT_METHOD v3_crl_hold;
+extern X509V3_EXT_METHOD v3_policy_mappings, v3_policy_constraints;
+extern X509V3_EXT_METHOD v3_name_constraints, v3_inhibit_anyp, v3_idp;
+extern const X509V3_EXT_METHOD v3_addr, v3_asid;
+extern const X509V3_EXT_METHOD v3_ct_scts[3];
+
+/* This table will be searched using OBJ_bsearch so it *must* kept in
+ * order of the ext_nid values.
+ */
+
+static const X509V3_EXT_METHOD *standard_exts[] = {
+       &v3_nscert,
+       &v3_ns_ia5_list[0],
+       &v3_ns_ia5_list[1],
+       &v3_ns_ia5_list[2],
+       &v3_ns_ia5_list[3],
+       &v3_ns_ia5_list[4],
+       &v3_ns_ia5_list[5],
+       &v3_ns_ia5_list[6],
+       &v3_skey_id,
+       &v3_key_usage,
+       &v3_pkey_usage_period,
+       &v3_alt[0],
+       &v3_alt[1],
+       &v3_bcons,
+       &v3_crl_num,
+       &v3_cpols,
+       &v3_akey_id,
+       &v3_crld,
+       &v3_ext_ku,
+       &v3_delta_crl,
+       &v3_crl_reason,
+#ifndef OPENSSL_NO_OCSP
+       &v3_crl_invdate,
+#endif
+       &v3_sxnet,
+       &v3_info,
+#ifndef OPENSSL_NO_RFC3779
+       &v3_addr,
+       &v3_asid,
+#endif
+#ifndef OPENSSL_NO_OCSP
+       &v3_ocsp_nonce,
+       &v3_ocsp_crlid,
+       &v3_ocsp_accresp,
+       &v3_ocsp_nocheck,
+       &v3_ocsp_acutoff,
+       &v3_ocsp_serviceloc,
+#endif
+       &v3_sinfo,
+       &v3_policy_constraints,
+#ifndef OPENSSL_NO_OCSP
+       &v3_crl_hold,
+#endif
+       &v3_name_constraints,
+       &v3_policy_mappings,
+       &v3_inhibit_anyp,
+       &v3_idp,
+       &v3_alt[2],
+       &v3_freshest_crl,
+#ifndef OPENSSL_NO_CT
+       &v3_ct_scts[0],
+       &v3_ct_scts[1],
+       &v3_ct_scts[2],
+#endif
+};
+
+#define STANDARD_EXTENSION_COUNT (sizeof(standard_exts)/sizeof(X509V3_EXT_METHOD *))
+
 int
 X509V3_EXT_add(X509V3_EXT_METHOD *ext)
 {