Join the x509 and x509v3 directories
authorRichard Levitte <levitte@openssl.org>
Mon, 13 May 2019 16:07:45 +0000 (09:07 -0700)
committerRichard Levitte <levitte@openssl.org>
Wed, 29 May 2019 07:32:50 +0000 (09:32 +0200)
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:
CHANGES
crypto/build.info
crypto/err/openssl.ec
crypto/ocsp/v3_ocsp.c
crypto/x509/build.info
crypto/x509/ext_dat.h [moved from crypto/x509v3/ext_dat.h with 100% similarity]
crypto/x509/pcy_cache.c [moved from crypto/x509v3/pcy_cache.c with 100% similarity]
crypto/x509/pcy_data.c [moved from crypto/x509v3/pcy_data.c with 100% similarity]
crypto/x509/pcy_int.h [moved from crypto/x509v3/pcy_int.h with 100% similarity]
crypto/x509/pcy_lib.c [moved from crypto/x509v3/pcy_lib.c with 100% similarity]
crypto/x509/pcy_map.c [moved from crypto/x509v3/pcy_map.c with 100% similarity]
crypto/x509/pcy_node.c [moved from crypto/x509v3/pcy_node.c with 100% similarity]
crypto/x509/pcy_tree.c [moved from crypto/x509v3/pcy_tree.c with 100% similarity]
crypto/x509/standard_exts.h [moved from crypto/x509v3/standard_exts.h with 100% similarity]
crypto/x509/v3_addr.c [moved from crypto/x509v3/v3_addr.c with 100% similarity]
crypto/x509/v3_admis.c [moved from crypto/x509v3/v3_admis.c with 100% similarity]
crypto/x509/v3_admis.h [moved from crypto/x509v3/v3_admis.h with 100% similarity]
crypto/x509/v3_akey.c [moved from crypto/x509v3/v3_akey.c with 100% similarity]
crypto/x509/v3_akeya.c [moved from crypto/x509v3/v3_akeya.c with 100% similarity]
crypto/x509/v3_alt.c [moved from crypto/x509v3/v3_alt.c with 100% similarity]
crypto/x509/v3_asid.c [moved from crypto/x509v3/v3_asid.c with 100% similarity]
crypto/x509/v3_bcons.c [moved from crypto/x509v3/v3_bcons.c with 100% similarity]
crypto/x509/v3_bitst.c [moved from crypto/x509v3/v3_bitst.c with 100% similarity]
crypto/x509/v3_conf.c [moved from crypto/x509v3/v3_conf.c with 100% similarity]
crypto/x509/v3_cpols.c [moved from crypto/x509v3/v3_cpols.c with 100% similarity]
crypto/x509/v3_crld.c [moved from crypto/x509v3/v3_crld.c with 100% similarity]
crypto/x509/v3_enum.c [moved from crypto/x509v3/v3_enum.c with 100% similarity]
crypto/x509/v3_extku.c [moved from crypto/x509v3/v3_extku.c with 100% similarity]
crypto/x509/v3_genn.c [moved from crypto/x509v3/v3_genn.c with 100% similarity]
crypto/x509/v3_ia5.c [moved from crypto/x509v3/v3_ia5.c with 100% similarity]
crypto/x509/v3_info.c [moved from crypto/x509v3/v3_info.c with 100% similarity]
crypto/x509/v3_int.c [moved from crypto/x509v3/v3_int.c with 100% similarity]
crypto/x509/v3_lib.c [moved from crypto/x509v3/v3_lib.c with 100% similarity]
crypto/x509/v3_ncons.c [moved from crypto/x509v3/v3_ncons.c with 100% similarity]
crypto/x509/v3_pci.c [moved from crypto/x509v3/v3_pci.c with 100% similarity]
crypto/x509/v3_pcia.c [moved from crypto/x509v3/v3_pcia.c with 100% similarity]
crypto/x509/v3_pcons.c [moved from crypto/x509v3/v3_pcons.c with 100% similarity]
crypto/x509/v3_pku.c [moved from crypto/x509v3/v3_pku.c with 100% similarity]
crypto/x509/v3_pmaps.c [moved from crypto/x509v3/v3_pmaps.c with 100% similarity]
crypto/x509/v3_prn.c [moved from crypto/x509v3/v3_prn.c with 100% similarity]
crypto/x509/v3_purp.c [moved from crypto/x509v3/v3_purp.c with 100% similarity]
crypto/x509/v3_skey.c [moved from crypto/x509v3/v3_skey.c with 100% similarity]
crypto/x509/v3_sxnet.c [moved from crypto/x509v3/v3_sxnet.c with 100% similarity]
crypto/x509/v3_tlsf.c [moved from crypto/x509v3/v3_tlsf.c with 100% similarity]
crypto/x509/v3_utl.c [moved from crypto/x509v3/v3_utl.c with 100% similarity]
crypto/x509/v3err.c [moved from crypto/x509v3/v3err.c with 100% similarity]
crypto/x509v3/build.info [deleted file]
test/x509_internal_test.c

diff --git a/CHANGES b/CHANGES
index 86da7f1..7151e2b 100644 (file)
--- 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
index db6d6af..629e819 100644 (file)
@@ -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 \
index b28aa49..0c362b2 100644 (file)
@@ -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
index c58fa07..2e4503e 100644 (file)
@@ -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
index afd0b61..bee9f80 100644 (file)
@@ -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
similarity index 100%
rename from crypto/x509v3/v3_alt.c
rename to crypto/x509/v3_alt.c
similarity index 100%
rename from crypto/x509v3/v3_ia5.c
rename to crypto/x509/v3_ia5.c
similarity index 100%
rename from crypto/x509v3/v3_int.c
rename to crypto/x509/v3_int.c
similarity index 100%
rename from crypto/x509v3/v3_lib.c
rename to crypto/x509/v3_lib.c
similarity index 100%
rename from crypto/x509v3/v3_pci.c
rename to crypto/x509/v3_pci.c
similarity index 100%
rename from crypto/x509v3/v3_pku.c
rename to crypto/x509/v3_pku.c
similarity index 100%
rename from crypto/x509v3/v3_prn.c
rename to crypto/x509/v3_prn.c
similarity index 100%
rename from crypto/x509v3/v3_utl.c
rename to crypto/x509/v3_utl.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
+++ /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
index d6b4f4f..a17dfd9 100644 (file)
@@ -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)
 {