Merge <openssl/x509v3.h> into <openssl/x509.h>

davidben · samuel40791765 · commit cdc51f07e691 · 2024-04-16T13:33:58.000-07:00
The headers moved from x509v3 to x509 was redone to avoid unintentionally taking changes we've skipped and keep AWS-LC specific changes. Change-Id: I53147d1f96d1f99909f5c8bda00cefb088677a0e Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/64138 Reviewed-by: Bob Beck <bbe@google.com> Commit-Queue: David Benjamin <davidben@google.com> (cherry picked from commit 58906eab928fe849a55cb846fcd84fb8b64773ed)
diff --git a/crypto/decrepit/x509/x509_decrepit.c b/crypto/decrepit/x509/x509_decrepit.c
@@ -12,7 +12,7 @@
  * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
-#include <openssl/x509v3.h>
+#include <openssl/x509.h>
 
 #include <assert.h>
 
diff --git a/crypto/x509/asn1_gen.c b/crypto/x509/asn1_gen.c
@@ -65,7 +65,6 @@
 #include <openssl/bytestring.h>
 #include <openssl/err.h>
 #include <openssl/obj.h>
-#include <openssl/x509v3.h>
 
 #include "../conf/internal.h"
 #include "../internal.h"
diff --git a/crypto/x509/internal.h b/crypto/x509/internal.h
@@ -62,7 +62,6 @@
 #include <openssl/base.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
-#include <openssl/x509v3.h>
 
 #include "../asn1/internal.h"
 
diff --git a/crypto/x509/policy.c b/crypto/x509/policy.c
@@ -19,7 +19,6 @@
 #include <openssl/mem.h>
 #include <openssl/obj.h>
 #include <openssl/stack.h>
-#include <openssl/x509v3.h>
 
 #include "../internal.h"
 #include "internal.h"
diff --git a/crypto/x509/t_crl.c b/crypto/x509/t_crl.c
@@ -61,7 +61,7 @@
 #include <openssl/mem.h>
 #include <openssl/obj.h>
 #include <openssl/x509.h>
-#include <openssl/x509v3.h>
+
 
 int X509_CRL_print_fp(FILE *fp, X509_CRL *x) {
   BIO *b = BIO_new_fp(fp, BIO_NOCLOSE);
diff --git a/crypto/x509/t_req.c b/crypto/x509/t_req.c
@@ -62,7 +62,6 @@
 #include <openssl/err.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
-#include <openssl/x509v3.h>
 
 #include "internal.h"
 
diff --git a/crypto/x509/t_x509.c b/crypto/x509/t_x509.c
@@ -64,7 +64,6 @@
 #include <openssl/mem.h>
 #include <openssl/obj.h>
 #include <openssl/x509.h>
-#include <openssl/x509v3.h>
 
 #include "internal.h"
 
diff --git a/crypto/x509/tab_test.cc b/crypto/x509/tab_test.cc
@@ -60,7 +60,7 @@
 
 #include <gtest/gtest.h>
 
-#include <openssl/x509v3.h>
+#include <openssl/x509.h>
 
 #include "../internal.h"
 #include "ext_dat.h"
diff --git a/crypto/x509/v3_akey.c b/crypto/x509/v3_akey.c
@@ -63,7 +63,7 @@
 #include <openssl/err.h>
 #include <openssl/mem.h>
 #include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <openssl/x509.h>
 
 #include "internal.h"
 
diff --git a/crypto/x509/v3_akeya.c b/crypto/x509/v3_akeya.c
@@ -59,7 +59,7 @@
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
 #include <openssl/conf.h>
-#include <openssl/x509v3.h>
+#include <openssl/x509.h>
 
 
 ASN1_SEQUENCE(AUTHORITY_KEYID) = {
diff --git a/crypto/x509/v3_alt.c b/crypto/x509/v3_alt.c
@@ -61,7 +61,7 @@
 #include <openssl/err.h>
 #include <openssl/mem.h>
 #include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <openssl/x509.h>
 
 #include "internal.h"
 
diff --git a/crypto/x509/v3_bcons.c b/crypto/x509/v3_bcons.c
@@ -62,7 +62,7 @@
 #include <openssl/conf.h>
 #include <openssl/err.h>
 #include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <openssl/x509.h>
 
 #include "internal.h"
 
diff --git a/crypto/x509/v3_bitst.c b/crypto/x509/v3_bitst.c
@@ -60,7 +60,7 @@
 #include <openssl/conf.h>
 #include <openssl/err.h>
 #include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <openssl/x509.h>
 
 #include "internal.h"
 
diff --git a/crypto/x509/v3_conf.c b/crypto/x509/v3_conf.c
@@ -66,7 +66,6 @@
 #include <openssl/mem.h>
 #include <openssl/obj.h>
 #include <openssl/x509.h>
-#include <openssl/x509v3.h>
 
 #include "../internal.h"
 #include "internal.h"
diff --git a/crypto/x509/v3_cpols.c b/crypto/x509/v3_cpols.c
@@ -66,7 +66,7 @@
 #include <openssl/mem.h>
 #include <openssl/obj.h>
 #include <openssl/stack.h>
-#include <openssl/x509v3.h>
+#include <openssl/x509.h>
 
 #include "internal.h"
 
diff --git a/crypto/x509/v3_crld.c b/crypto/x509/v3_crld.c
@@ -63,7 +63,7 @@
 #include <openssl/err.h>
 #include <openssl/mem.h>
 #include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <openssl/x509.h>
 
 #include "internal.h"
 
diff --git a/crypto/x509/v3_enum.c b/crypto/x509/v3_enum.c
@@ -58,7 +58,7 @@
 
 #include <openssl/mem.h>
 #include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <openssl/x509.h>
 
 #include "internal.h"
 
diff --git a/crypto/x509/v3_extku.c b/crypto/x509/v3_extku.c
@@ -60,7 +60,7 @@
 #include <openssl/conf.h>
 #include <openssl/err.h>
 #include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <openssl/x509.h>
 
 #include "internal.h"
 
diff --git a/crypto/x509/v3_genn.c b/crypto/x509/v3_genn.c
@@ -59,7 +59,7 @@
 #include <openssl/asn1t.h>
 #include <openssl/conf.h>
 #include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <openssl/x509.h>
 
 #include "internal.h"
 
diff --git a/crypto/x509/v3_ia5.c b/crypto/x509/v3_ia5.c
@@ -64,7 +64,7 @@
 #include <openssl/err.h>
 #include <openssl/mem.h>
 #include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <openssl/x509.h>
 
 #include "../internal.h"
 
diff --git a/crypto/x509/v3_info.c b/crypto/x509/v3_info.c
@@ -65,7 +65,7 @@
 #include <openssl/err.h>
 #include <openssl/mem.h>
 #include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <openssl/x509.h>
 
 static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_INFO_ACCESS(
     const X509V3_EXT_METHOD *method, void *ext, STACK_OF(CONF_VALUE) *ret);
diff --git a/crypto/x509/v3_int.c b/crypto/x509/v3_int.c
@@ -57,7 +57,7 @@
 #include <stdio.h>
 
 #include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <openssl/x509.h>
 
 
 static char *i2s_ASN1_INTEGER_cb(const X509V3_EXT_METHOD *method, void *ext) {
diff --git a/crypto/x509/v3_lib.c b/crypto/x509/v3_lib.c
@@ -64,7 +64,7 @@
 #include <openssl/err.h>
 #include <openssl/mem.h>
 #include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <openssl/x509.h>
 
 #include "internal.h"
 
diff --git a/crypto/x509/v3_ncons.c b/crypto/x509/v3_ncons.c
@@ -62,7 +62,7 @@
 #include <openssl/err.h>
 #include <openssl/mem.h>
 #include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <openssl/x509.h>
 
 #include "../internal.h"
 #include "internal.h"
diff --git a/crypto/x509/v3_ocsp.c b/crypto/x509/v3_ocsp.c
@@ -9,7 +9,7 @@
 
 #include <string.h>
 
-#include <openssl/x509v3.h>
+#include <openssl/x509.h>
 
 #include <openssl/asn1.h>
 #include <openssl/bio.h>
diff --git a/crypto/x509/v3_pcons.c b/crypto/x509/v3_pcons.c
@@ -62,7 +62,7 @@
 #include <openssl/conf.h>
 #include <openssl/err.h>
 #include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <openssl/x509.h>
 
 #include "internal.h"
 
diff --git a/crypto/x509/v3_pmaps.c b/crypto/x509/v3_pmaps.c
@@ -60,7 +60,7 @@
 #include <openssl/conf.h>
 #include <openssl/err.h>
 #include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <openssl/x509.h>
 
 #include "internal.h"
 
diff --git a/crypto/x509/v3_prn.c b/crypto/x509/v3_prn.c
@@ -61,7 +61,7 @@
 #include <openssl/bio.h>
 #include <openssl/conf.h>
 #include <openssl/mem.h>
-#include <openssl/x509v3.h>
+#include <openssl/x509.h>
 
 // Extension printing routines
 
diff --git a/crypto/x509/v3_purp.c b/crypto/x509/v3_purp.c
@@ -63,7 +63,7 @@
 #include <openssl/mem.h>
 #include <openssl/obj.h>
 #include <openssl/thread.h>
-#include <openssl/x509v3.h>
+#include <openssl/x509.h>
 
 #include "../internal.h"
 #include "internal.h"
diff --git a/crypto/x509/v3_skey.c b/crypto/x509/v3_skey.c
@@ -62,7 +62,7 @@
 #include <openssl/err.h>
 #include <openssl/obj.h>
 #include <openssl/mem.h>
-#include <openssl/x509v3.h>
+#include <openssl/x509.h>
 
 #include "internal.h"
 
diff --git a/crypto/x509/v3_utl.c b/crypto/x509/v3_utl.c
@@ -67,7 +67,7 @@
 #include <openssl/err.h>
 #include <openssl/mem.h>
 #include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <openssl/x509.h>
 
 #include "../conf/internal.h"
 #include "../internal.h"
diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c
@@ -63,7 +63,6 @@
 #include <openssl/obj.h>
 #include <openssl/stack.h>
 #include <openssl/x509.h>
-#include <openssl/x509v3.h>
 
 #include "../internal.h"
 #include "internal.h"
diff --git a/crypto/x509/x509_ext.c b/crypto/x509/x509_ext.c
@@ -59,7 +59,6 @@
 #include <openssl/obj.h>
 #include <openssl/stack.h>
 #include <openssl/x509.h>
-#include <openssl/x509v3.h>
 
 #include "internal.h"
 
diff --git a/crypto/x509/x509_lu.c b/crypto/x509/x509_lu.c
@@ -60,7 +60,6 @@
 #include <openssl/mem.h>
 #include <openssl/thread.h>
 #include <openssl/x509.h>
-#include <openssl/x509v3.h>
 
 #include "../internal.h"
 #include "internal.h"
diff --git a/crypto/x509/x509_test.cc b/crypto/x509/x509_test.cc
@@ -32,7 +32,6 @@
 #include <openssl/pool.h>
 #include <openssl/rand.h>
 #include <openssl/x509.h>
-#include <openssl/x509v3.h>
 
 #include "internal.h"
 #include "../evp_extra/internal.h"
diff --git a/crypto/x509/x509_trs.c b/crypto/x509/x509_trs.c
@@ -57,7 +57,7 @@
 #include <openssl/err.h>
 #include <openssl/mem.h>
 #include <openssl/obj.h>
-#include <openssl/x509v3.h>
+#include <openssl/x509.h>
 
 #include "internal.h"
 
diff --git a/crypto/x509/x509_v3.c b/crypto/x509/x509_v3.c
@@ -60,7 +60,6 @@
 #include <openssl/obj.h>
 #include <openssl/stack.h>
 #include <openssl/x509.h>
-#include <openssl/x509v3.h>
 
 #include "internal.h"
 
diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
@@ -65,7 +65,6 @@
 #include <openssl/obj.h>
 #include <openssl/thread.h>
 #include <openssl/x509.h>
-#include <openssl/x509v3.h>
 
 #include "../internal.h"
 #include "internal.h"
diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c
@@ -60,7 +60,6 @@
 #include <openssl/obj.h>
 #include <openssl/stack.h>
 #include <openssl/x509.h>
-#include <openssl/x509v3.h>
 
 #include "../internal.h"
 #include "internal.h"
diff --git a/crypto/x509/x_crl.c b/crypto/x509/x_crl.c
@@ -63,7 +63,6 @@
 #include <openssl/stack.h>
 #include <openssl/thread.h>
 #include <openssl/x509.h>
-#include <openssl/x509v3.h>
 
 #include <assert.h>
 
diff --git a/crypto/x509/x_x509.c b/crypto/x509/x_x509.c
@@ -65,7 +65,6 @@
 #include <openssl/pool.h>
 #include <openssl/thread.h>
 #include <openssl/x509.h>
-#include <openssl/x509v3.h>
 
 #include "../asn1/internal.h"
 #include "../internal.h"
diff --git a/fuzz/conf.cc b/fuzz/conf.cc
@@ -15,7 +15,6 @@
 #include <openssl/bio.h>
 #include <openssl/conf.h>
 #include <openssl/x509.h>
-#include <openssl/x509v3.h>
 
 #include <algorithm>
 
diff --git a/include/openssl/x509.h b/include/openssl/x509.h
diff --git a/include/openssl/x509v3.h b/include/openssl/x509v3.h
diff --git a/include/openssl/x509v3_errors.h b/include/openssl/x509v3_errors.h
diff --git a/ssl/ssl_test.cc b/ssl/ssl_test.cc
diff --git a/ssl/ssl_x509.cc b/ssl/ssl_x509.cc
diff --git a/util/make_errors.go b/util/make_errors.go
