Join the x509 and x509v3 directories

This has been long overdue.

Note that this does not join the X509 and X509V3 error modules, that
will be too many macro changes at this stage.

Fixes #8919

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8925)

48 files changed, 16 insertions, 14 deletions

diff --git a/CHANGES b/CHANGES
index 86da7f1b1b..7151e2bfb5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,9 @@
 
  Changes between 1.1.1 and 3.0.0 [xx XXX xxxx]
 
+  *) Join the directories crypto/x509 and crypto/x509v3
+     [Richard Levitte]
+
   *) Change the default RSA, DSA and DH size to 2048 bit instead of 1024.
      This changes the size when using the genpkey app when no size is given. It
      fixes an omission in earlier changes that changed all RSA, DSA and DH
diff --git a/crypto/build.info b/crypto/build.info
index db6d6afbdc..629e819b8a 100644
--- a/crypto/build.info
+++ b/crypto/build.info
@@ -1,6 +1,6 @@
 # Note that these directories are filtered in Configure.  Look for %skipdir
 # there for further explanations.
-SUBDIRS=objects buffer bio stack lhash rand evp asn1 pem x509 x509v3 conf \
+SUBDIRS=objects buffer bio stack lhash rand evp asn1 pem x509 conf \
         txt_db pkcs7 pkcs12 ui kdf store property \
         md2 md4 md5 sha mdc2 gmac hmac ripemd whrlpool poly1305 blake2 \
         siphash sm3 des aes rc2 rc4 rc5 idea aria bf cast camellia \
diff --git a/crypto/err/openssl.ec b/crypto/err/openssl.ec
index b28aa491da..0c362b2c6c 100644
--- a/crypto/err/openssl.ec
+++ b/crypto/err/openssl.ec
@@ -19,7 +19,7 @@ L EC            include/openssl/ec.h            crypto/ec/ec_err.c
 L SSL           include/openssl/ssl.h           ssl/ssl_err.c
 L BIO           include/openssl/bio.h           crypto/bio/bio_err.c
 L PKCS7         include/openssl/pkcs7.h         crypto/pkcs7/pkcs7err.c
-L X509V3        include/openssl/x509v3.h        crypto/x509v3/v3err.c
+L X509V3        include/openssl/x509v3.h        crypto/x509/v3err.c
 L PKCS12        include/openssl/pkcs12.h        crypto/pkcs12/pk12err.c
 L RAND          include/openssl/rand.h          crypto/rand/rand_err.c
 L DSO           include/internal/dso.h          crypto/dso/dso_err.c
diff --git a/crypto/ocsp/v3_ocsp.c b/crypto/ocsp/v3_ocsp.c
index c58fa07b8a..2e4503ee4d 100644
--- a/crypto/ocsp/v3_ocsp.c
+++ b/crypto/ocsp/v3_ocsp.c
@@ -14,7 +14,7 @@
 # include <openssl/ocsp.h>
 # include "ocsp_lcl.h"
 # include <openssl/x509v3.h>
-# include "../x509v3/ext_dat.h"
+# include "../x509/ext_dat.h"
 
 /*
  * OCSP extensions and a couple of CRL entry extensions
diff --git a/crypto/x509/build.info b/crypto/x509/build.info
index afd0b6134e..bee9f80961 100644
--- a/crypto/x509/build.info
+++ b/crypto/x509/build.info
@@ -7,4 +7,11 @@ SOURCE[../../libcrypto]=\
         x509type.c x509_meth.c x509_lu.c x_all.c x509_txt.c \
         x509_trs.c by_file.c by_dir.c x509_vpm.c \
         x_crl.c t_crl.c x_req.c t_req.c x_x509.c t_x509.c \
-        x_pubkey.c x_x509a.c x_attrib.c x_exten.c x_name.c
+        x_pubkey.c x_x509a.c x_attrib.c x_exten.c x_name.c \
+        v3_bcons.c v3_bitst.c v3_conf.c v3_extku.c v3_ia5.c v3_lib.c \
+        v3_prn.c v3_utl.c v3err.c v3_genn.c v3_alt.c v3_skey.c v3_akey.c \
+        v3_pku.c v3_int.c v3_enum.c v3_sxnet.c v3_cpols.c v3_crld.c v3_purp.c \
+        v3_info.c v3_akeya.c v3_pmaps.c v3_pcons.c v3_ncons.c \
+        v3_pcia.c v3_pci.c \
+        pcy_cache.c pcy_node.c pcy_data.c pcy_map.c pcy_tree.c pcy_lib.c \
+        v3_asid.c v3_addr.c v3_tlsf.c v3_admis.c
diff --git a/crypto/x509v3/ext_dat.h b/crypto/x509/ext_dat.h
index aa6fa79774..aa6fa79774 100644
--- a/crypto/x509v3/ext_dat.h
+++ b/crypto/x509/ext_dat.h
diff --git a/crypto/x509v3/pcy_cache.c b/crypto/x509/pcy_cache.c
index 21a89e62c0..21a89e62c0 100644
--- a/crypto/x509v3/pcy_cache.c
+++ b/crypto/x509/pcy_cache.c
diff --git a/crypto/x509v3/pcy_data.c b/crypto/x509/pcy_data.c
index c1d56bdcde..c1d56bdcde 100644
--- a/crypto/x509v3/pcy_data.c
+++ b/crypto/x509/pcy_data.c
diff --git a/crypto/x509v3/pcy_int.h b/crypto/x509/pcy_int.h
index 0deee52c1b..0deee52c1b 100644
--- a/crypto/x509v3/pcy_int.h
+++ b/crypto/x509/pcy_int.h
diff --git a/crypto/x509v3/pcy_lib.c b/crypto/x509/pcy_lib.c
index deee8f6c0c..deee8f6c0c 100644
--- a/crypto/x509v3/pcy_lib.c
+++ b/crypto/x509/pcy_lib.c
diff --git a/crypto/x509v3/pcy_map.c b/crypto/x509/pcy_map.c
index 243d6e2b7c..243d6e2b7c 100644
--- a/crypto/x509v3/pcy_map.c
+++ b/crypto/x509/pcy_map.c
diff --git a/crypto/x509v3/pcy_node.c b/crypto/x509/pcy_node.c
index 005d1de7e3..005d1de7e3 100644
--- a/crypto/x509v3/pcy_node.c
+++ b/crypto/x509/pcy_node.c
diff --git a/crypto/x509v3/pcy_tree.c b/crypto/x509/pcy_tree.c
index 0c5887c25a..0c5887c25a 100644
--- a/crypto/x509v3/pcy_tree.c
+++ b/crypto/x509/pcy_tree.c
diff --git a/crypto/x509v3/standard_exts.h b/crypto/x509/standard_exts.h
index bc63696799..bc63696799 100644
--- a/crypto/x509v3/standard_exts.h
+++ b/crypto/x509/standard_exts.h
diff --git a/crypto/x509v3/v3_addr.c b/crypto/x509/v3_addr.c
index 9e6bffed28..9e6bffed28 100644
--- a/crypto/x509v3/v3_addr.c
+++ b/crypto/x509/v3_addr.c
diff --git a/crypto/x509v3/v3_admis.c b/crypto/x509/v3_admis.c
index d6e4bc4166..d6e4bc4166 100644
--- a/crypto/x509v3/v3_admis.c
+++ b/crypto/x509/v3_admis.c
diff --git a/crypto/x509v3/v3_admis.h b/crypto/x509/v3_admis.h
index 9d1535c3ae..9d1535c3ae 100644
--- a/crypto/x509v3/v3_admis.h
+++ b/crypto/x509/v3_admis.h
diff --git a/crypto/x509v3/v3_akey.c b/crypto/x509/v3_akey.c
index b656b4b502..b656b4b502 100644
--- a/crypto/x509v3/v3_akey.c
+++ b/crypto/x509/v3_akey.c
diff --git a/crypto/x509v3/v3_akeya.c b/crypto/x509/v3_akeya.c
index aae8c21e73..aae8c21e73 100644
--- a/crypto/x509v3/v3_akeya.c
+++ b/crypto/x509/v3_akeya.c
diff --git a/crypto/x509v3/v3_alt.c b/crypto/x509/v3_alt.c
index 9b627e071c..9b627e071c 100644
--- a/crypto/x509v3/v3_alt.c
+++ b/crypto/x509/v3_alt.c
diff --git a/crypto/x509v3/v3_asid.c b/crypto/x509/v3_asid.c
index 1d41380c41..1d41380c41 100644
--- a/crypto/x509v3/v3_asid.c
+++ b/crypto/x509/v3_asid.c
diff --git a/crypto/x509v3/v3_bcons.c b/crypto/x509/v3_bcons.c
index 02e300229c..02e300229c 100644
--- a/crypto/x509v3/v3_bcons.c
+++ b/crypto/x509/v3_bcons.c
diff --git a/crypto/x509v3/v3_bitst.c b/crypto/x509/v3_bitst.c
index 81cdcfb6cf..81cdcfb6cf 100644
--- a/crypto/x509v3/v3_bitst.c
+++ b/crypto/x509/v3_bitst.c
diff --git a/crypto/x509v3/v3_conf.c b/crypto/x509/v3_conf.c
index b7b74c4f25..b7b74c4f25 100644
--- a/crypto/x509v3/v3_conf.c
+++ b/crypto/x509/v3_conf.c
diff --git a/crypto/x509v3/v3_cpols.c b/crypto/x509/v3_cpols.c
index 595de62361..595de62361 100644
--- a/crypto/x509v3/v3_cpols.c
+++ b/crypto/x509/v3_cpols.c
diff --git a/crypto/x509v3/v3_crld.c b/crypto/x509/v3_crld.c
index 766bf0e5c8..766bf0e5c8 100644
--- a/crypto/x509v3/v3_crld.c
+++ b/crypto/x509/v3_crld.c
diff --git a/crypto/x509v3/v3_enum.c b/crypto/x509/v3_enum.c
index 5dfb257fb4..5dfb257fb4 100644
--- a/crypto/x509v3/v3_enum.c
+++ b/crypto/x509/v3_enum.c
diff --git a/crypto/x509v3/v3_extku.c b/crypto/x509/v3_extku.c
index 8d0dfcf300..8d0dfcf300 100644
--- a/crypto/x509v3/v3_extku.c
+++ b/crypto/x509/v3_extku.c
diff --git a/crypto/x509v3/v3_genn.c b/crypto/x509/v3_genn.c
index 867b9a9070..867b9a9070 100644
--- a/crypto/x509v3/v3_genn.c
+++ b/crypto/x509/v3_genn.c
diff --git a/crypto/x509v3/v3_ia5.c b/crypto/x509/v3_ia5.c
index 23c24e03b2..23c24e03b2 100644
--- a/crypto/x509v3/v3_ia5.c
+++ b/crypto/x509/v3_ia5.c
diff --git a/crypto/x509v3/v3_info.c b/crypto/x509/v3_info.c
index 0b97c9663f..0b97c9663f 100644
--- a/crypto/x509v3/v3_info.c
+++ b/crypto/x509/v3_info.c
diff --git a/crypto/x509v3/v3_int.c b/crypto/x509/v3_int.c
index bd8debfafa..bd8debfafa 100644
--- a/crypto/x509v3/v3_int.c
+++ b/crypto/x509/v3_int.c
diff --git a/crypto/x509v3/v3_lib.c b/crypto/x509/v3_lib.c
index 71ba7a3282..71ba7a3282 100644
--- a/crypto/x509v3/v3_lib.c
+++ b/crypto/x509/v3_lib.c
diff --git a/crypto/x509v3/v3_ncons.c b/crypto/x509/v3_ncons.c
index 9a8ca16685..9a8ca16685 100644
--- a/crypto/x509v3/v3_ncons.c
+++ b/crypto/x509/v3_ncons.c
diff --git a/crypto/x509v3/v3_pci.c b/crypto/x509/v3_pci.c
index 856b70d9b5..856b70d9b5 100644
--- a/crypto/x509v3/v3_pci.c
+++ b/crypto/x509/v3_pci.c
diff --git a/crypto/x509v3/v3_pcia.c b/crypto/x509/v3_pcia.c
index 7f5985f5e8..7f5985f5e8 100644
--- a/crypto/x509v3/v3_pcia.c
+++ b/crypto/x509/v3_pcia.c
diff --git a/crypto/x509v3/v3_pcons.c b/crypto/x509/v3_pcons.c
index e6d50a6fe7..e6d50a6fe7 100644
--- a/crypto/x509v3/v3_pcons.c
+++ b/crypto/x509/v3_pcons.c
diff --git a/crypto/x509v3/v3_pku.c b/crypto/x509/v3_pku.c
index 484dda813f..484dda813f 100644
--- a/crypto/x509v3/v3_pku.c
+++ b/crypto/x509/v3_pku.c
diff --git a/crypto/x509v3/v3_pmaps.c b/crypto/x509/v3_pmaps.c
index 2b4784027c..2b4784027c 100644
--- a/crypto/x509v3/v3_pmaps.c
+++ b/crypto/x509/v3_pmaps.c
diff --git a/crypto/x509v3/v3_prn.c b/crypto/x509/v3_prn.c
index 2ef76c1b5b..2ef76c1b5b 100644
--- a/crypto/x509v3/v3_prn.c
+++ b/crypto/x509/v3_prn.c
diff --git a/crypto/x509v3/v3_purp.c b/crypto/x509/v3_purp.c
index d0ac7e6ed9..d0ac7e6ed9 100644
--- a/crypto/x509v3/v3_purp.c
+++ b/crypto/x509/v3_purp.c
diff --git a/crypto/x509v3/v3_skey.c b/crypto/x509/v3_skey.c
index f8a780d916..f8a780d916 100644
--- a/crypto/x509v3/v3_skey.c
+++ b/crypto/x509/v3_skey.c
diff --git a/crypto/x509v3/v3_sxnet.c b/crypto/x509/v3_sxnet.c
index ddb2a0312e..ddb2a0312e 100644
--- a/crypto/x509v3/v3_sxnet.c
+++ b/crypto/x509/v3_sxnet.c
diff --git a/crypto/x509v3/v3_tlsf.c b/crypto/x509/v3_tlsf.c
index d3ab3f81ad..d3ab3f81ad 100644
--- a/crypto/x509v3/v3_tlsf.c
+++ b/crypto/x509/v3_tlsf.c
diff --git a/crypto/x509v3/v3_utl.c b/crypto/x509/v3_utl.c
index 24f50a13b7..24f50a13b7 100644
--- a/crypto/x509v3/v3_utl.c
+++ b/crypto/x509/v3_utl.c
diff --git a/crypto/x509v3/v3err.c b/crypto/x509/v3err.c
index 421d9366e8..421d9366e8 100644
--- a/crypto/x509v3/v3err.c
+++ b/crypto/x509/v3err.c
diff --git a/crypto/x509v3/build.info b/crypto/x509v3/build.info
deleted file mode 100644
index 4ab6488493..0000000000
--- a/crypto/x509v3/build.info
+++ /dev/null
@@ -1,8 +0,0 @@
-LIBS=../../libcrypto
-SOURCE[../../libcrypto]=\
-  v3_bcons.c v3_bitst.c v3_conf.c v3_extku.c v3_ia5.c v3_lib.c \
-  v3_prn.c v3_utl.c v3err.c v3_genn.c v3_alt.c v3_skey.c v3_akey.c v3_pku.c \
-  v3_int.c v3_enum.c v3_sxnet.c v3_cpols.c v3_crld.c v3_purp.c v3_info.c \
-  v3_akeya.c v3_pmaps.c v3_pcons.c v3_ncons.c v3_pcia.c v3_pci.c \
-  pcy_cache.c pcy_node.c pcy_data.c pcy_map.c pcy_tree.c pcy_lib.c \
-  v3_asid.c v3_addr.c v3_tlsf.c v3_admis.c
diff --git a/test/x509_internal_test.c b/test/x509_internal_test.c
index d6b4f4f4aa..a17dfd9398 100644
--- a/test/x509_internal_test.c
+++ b/test/x509_internal_test.c
@@ -23,8 +23,8 @@
  *
  ***/
 
-#include "../crypto/x509v3/ext_dat.h"
-#include "../crypto/x509v3/standard_exts.h"
+#include "../crypto/x509/ext_dat.h"
+#include "../crypto/x509/standard_exts.h"
 
 static int test_standard_exts(void)
 {