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)

diff --git a/CHANGES b/CHANGES
index 86da7f1b1b5e34a624db252bf8a0b059a1371222..7151e2bfb5797e365c706e785ced4d88eba49e4e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,9 @@
 
  Changes between 1.1.1 and 3.0.0 [xx XXX xxxx]
 
 
  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
   *) 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 db6d6afbdca3fdeaaeef176826ff21cc5e09825d..629e819b8a01989d118e94aba38fc81c838e3e60 100644 (file)
--- 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.
 # 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 \
         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 b28aa491da4e5fe7c37cbbb863e68468ef6f7c4a..0c362b2c6c9a007e62f1ce9e7326bc728c561e02 100644 (file)
--- 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 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
 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 c58fa07b8ac6dd7a873a94be8578ab003ed573bf..2e4503ee4dab38bb493c16914f10f77a59394627 100644 (file)
--- 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 <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
 
 /*
  * OCSP extensions and a couple of CRL entry extensions

diff --git a/crypto/x509/build.info b/crypto/x509/build.info
index afd0b6134e52814c4a1370058acedf17b6a45450..bee9f80961f1353be9b30419c7477dfc5b9c89bc 100644 (file)
--- 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 \
         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
similarity index 100%
rename from crypto/x509v3/ext_dat.h
rename to crypto/x509/ext_dat.h

diff --git a/crypto/x509v3/pcy_cache.c b/crypto/x509/pcy_cache.c
similarity index 100%
rename from crypto/x509v3/pcy_cache.c
rename to crypto/x509/pcy_cache.c

diff --git a/crypto/x509v3/pcy_data.c b/crypto/x509/pcy_data.c
similarity index 100%
rename from crypto/x509v3/pcy_data.c
rename to crypto/x509/pcy_data.c

diff --git a/crypto/x509v3/pcy_int.h b/crypto/x509/pcy_int.h
similarity index 100%
rename from crypto/x509v3/pcy_int.h
rename to crypto/x509/pcy_int.h

diff --git a/crypto/x509v3/pcy_lib.c b/crypto/x509/pcy_lib.c
similarity index 100%
rename from crypto/x509v3/pcy_lib.c
rename to crypto/x509/pcy_lib.c

diff --git a/crypto/x509v3/pcy_map.c b/crypto/x509/pcy_map.c
similarity index 100%
rename from crypto/x509v3/pcy_map.c
rename to crypto/x509/pcy_map.c

diff --git a/crypto/x509v3/pcy_node.c b/crypto/x509/pcy_node.c
similarity index 100%
rename from crypto/x509v3/pcy_node.c
rename to crypto/x509/pcy_node.c

diff --git a/crypto/x509v3/pcy_tree.c b/crypto/x509/pcy_tree.c
similarity index 100%
rename from crypto/x509v3/pcy_tree.c
rename to crypto/x509/pcy_tree.c

diff --git a/crypto/x509v3/standard_exts.h b/crypto/x509/standard_exts.h
similarity index 100%
rename from crypto/x509v3/standard_exts.h
rename to crypto/x509/standard_exts.h

diff --git a/crypto/x509v3/v3_addr.c b/crypto/x509/v3_addr.c
similarity index 100%
rename from crypto/x509v3/v3_addr.c
rename to crypto/x509/v3_addr.c

diff --git a/crypto/x509v3/v3_admis.c b/crypto/x509/v3_admis.c
similarity index 100%
rename from crypto/x509v3/v3_admis.c
rename to crypto/x509/v3_admis.c

diff --git a/crypto/x509v3/v3_admis.h b/crypto/x509/v3_admis.h
similarity index 100%
rename from crypto/x509v3/v3_admis.h
rename to crypto/x509/v3_admis.h

diff --git a/crypto/x509v3/v3_akey.c b/crypto/x509/v3_akey.c
similarity index 100%
rename from crypto/x509v3/v3_akey.c
rename to crypto/x509/v3_akey.c

diff --git a/crypto/x509v3/v3_akeya.c b/crypto/x509/v3_akeya.c
similarity index 100%
rename from crypto/x509v3/v3_akeya.c
rename to crypto/x509/v3_akeya.c

diff --git a/crypto/x509v3/v3_alt.c b/crypto/x509/v3_alt.c
similarity index 100%
rename from crypto/x509v3/v3_alt.c
rename to crypto/x509/v3_alt.c

diff --git a/crypto/x509v3/v3_asid.c b/crypto/x509/v3_asid.c
similarity index 100%
rename from crypto/x509v3/v3_asid.c
rename to crypto/x509/v3_asid.c

diff --git a/crypto/x509v3/v3_bcons.c b/crypto/x509/v3_bcons.c
similarity index 100%
rename from crypto/x509v3/v3_bcons.c
rename to crypto/x509/v3_bcons.c

diff --git a/crypto/x509v3/v3_bitst.c b/crypto/x509/v3_bitst.c
similarity index 100%
rename from crypto/x509v3/v3_bitst.c
rename to crypto/x509/v3_bitst.c

diff --git a/crypto/x509v3/v3_conf.c b/crypto/x509/v3_conf.c
similarity index 100%
rename from crypto/x509v3/v3_conf.c
rename to crypto/x509/v3_conf.c

diff --git a/crypto/x509v3/v3_cpols.c b/crypto/x509/v3_cpols.c
similarity index 100%
rename from crypto/x509v3/v3_cpols.c
rename to crypto/x509/v3_cpols.c

diff --git a/crypto/x509v3/v3_crld.c b/crypto/x509/v3_crld.c
similarity index 100%
rename from crypto/x509v3/v3_crld.c
rename to crypto/x509/v3_crld.c

diff --git a/crypto/x509v3/v3_enum.c b/crypto/x509/v3_enum.c
similarity index 100%
rename from crypto/x509v3/v3_enum.c
rename to crypto/x509/v3_enum.c

diff --git a/crypto/x509v3/v3_extku.c b/crypto/x509/v3_extku.c
similarity index 100%
rename from crypto/x509v3/v3_extku.c
rename to crypto/x509/v3_extku.c

diff --git a/crypto/x509v3/v3_genn.c b/crypto/x509/v3_genn.c
similarity index 100%
rename from crypto/x509v3/v3_genn.c
rename to crypto/x509/v3_genn.c

diff --git a/crypto/x509v3/v3_ia5.c b/crypto/x509/v3_ia5.c
similarity index 100%
rename from crypto/x509v3/v3_ia5.c
rename to crypto/x509/v3_ia5.c

diff --git a/crypto/x509v3/v3_info.c b/crypto/x509/v3_info.c
similarity index 100%
rename from crypto/x509v3/v3_info.c
rename to crypto/x509/v3_info.c

diff --git a/crypto/x509v3/v3_int.c b/crypto/x509/v3_int.c
similarity index 100%
rename from crypto/x509v3/v3_int.c
rename to crypto/x509/v3_int.c

diff --git a/crypto/x509v3/v3_lib.c b/crypto/x509/v3_lib.c
similarity index 100%
rename from crypto/x509v3/v3_lib.c
rename to crypto/x509/v3_lib.c

diff --git a/crypto/x509v3/v3_ncons.c b/crypto/x509/v3_ncons.c
similarity index 100%
rename from crypto/x509v3/v3_ncons.c
rename to crypto/x509/v3_ncons.c

diff --git a/crypto/x509v3/v3_pci.c b/crypto/x509/v3_pci.c
similarity index 100%
rename from crypto/x509v3/v3_pci.c
rename to crypto/x509/v3_pci.c

diff --git a/crypto/x509v3/v3_pcia.c b/crypto/x509/v3_pcia.c
similarity index 100%
rename from crypto/x509v3/v3_pcia.c
rename to crypto/x509/v3_pcia.c

diff --git a/crypto/x509v3/v3_pcons.c b/crypto/x509/v3_pcons.c
similarity index 100%
rename from crypto/x509v3/v3_pcons.c
rename to crypto/x509/v3_pcons.c

diff --git a/crypto/x509v3/v3_pku.c b/crypto/x509/v3_pku.c
similarity index 100%
rename from crypto/x509v3/v3_pku.c
rename to crypto/x509/v3_pku.c

diff --git a/crypto/x509v3/v3_pmaps.c b/crypto/x509/v3_pmaps.c
similarity index 100%
rename from crypto/x509v3/v3_pmaps.c
rename to crypto/x509/v3_pmaps.c

diff --git a/crypto/x509v3/v3_prn.c b/crypto/x509/v3_prn.c
similarity index 100%
rename from crypto/x509v3/v3_prn.c
rename to crypto/x509/v3_prn.c

diff --git a/crypto/x509v3/v3_purp.c b/crypto/x509/v3_purp.c
similarity index 100%
rename from crypto/x509v3/v3_purp.c
rename to crypto/x509/v3_purp.c

diff --git a/crypto/x509v3/v3_skey.c b/crypto/x509/v3_skey.c
similarity index 100%
rename from crypto/x509v3/v3_skey.c
rename to crypto/x509/v3_skey.c

diff --git a/crypto/x509v3/v3_sxnet.c b/crypto/x509/v3_sxnet.c
similarity index 100%
rename from crypto/x509v3/v3_sxnet.c
rename to crypto/x509/v3_sxnet.c

diff --git a/crypto/x509v3/v3_tlsf.c b/crypto/x509/v3_tlsf.c
similarity index 100%
rename from crypto/x509v3/v3_tlsf.c
rename to crypto/x509/v3_tlsf.c

diff --git a/crypto/x509v3/v3_utl.c b/crypto/x509/v3_utl.c
similarity index 100%
rename from crypto/x509v3/v3_utl.c
rename to crypto/x509/v3_utl.c

diff --git a/crypto/x509v3/v3err.c b/crypto/x509/v3err.c
similarity index 100%
rename from crypto/x509v3/v3err.c
rename to crypto/x509/v3err.c

diff --git a/crypto/x509v3/build.info b/crypto/x509v3/build.info
deleted file mode 100644 (file)
index 4ab6488..0000000
--- 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 d6b4f4f4aa019521cd48a22f2c7bd2f946cf4d04..a17dfd9398098698ed602b5a3dec121f698c9457 100644 (file)
--- 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)
 {
 
 static int test_standard_exts(void)
 {