From 878dc8dd9572a719d3b481e7f68af8bf17f4c68e Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 13 May 2019 09:07:45 -0700 Subject: [PATCH] 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 (Merged from https://github.com/openssl/openssl/pull/8925) --- CHANGES | 3 +++ crypto/build.info | 2 +- crypto/err/openssl.ec | 2 +- crypto/ocsp/v3_ocsp.c | 2 +- crypto/x509/build.info | 9 ++++++++- crypto/{x509v3 => x509}/ext_dat.h | 0 crypto/{x509v3 => x509}/pcy_cache.c | 0 crypto/{x509v3 => x509}/pcy_data.c | 0 crypto/{x509v3 => x509}/pcy_int.h | 0 crypto/{x509v3 => x509}/pcy_lib.c | 0 crypto/{x509v3 => x509}/pcy_map.c | 0 crypto/{x509v3 => x509}/pcy_node.c | 0 crypto/{x509v3 => x509}/pcy_tree.c | 0 crypto/{x509v3 => x509}/standard_exts.h | 0 crypto/{x509v3 => x509}/v3_addr.c | 0 crypto/{x509v3 => x509}/v3_admis.c | 0 crypto/{x509v3 => x509}/v3_admis.h | 0 crypto/{x509v3 => x509}/v3_akey.c | 0 crypto/{x509v3 => x509}/v3_akeya.c | 0 crypto/{x509v3 => x509}/v3_alt.c | 0 crypto/{x509v3 => x509}/v3_asid.c | 0 crypto/{x509v3 => x509}/v3_bcons.c | 0 crypto/{x509v3 => x509}/v3_bitst.c | 0 crypto/{x509v3 => x509}/v3_conf.c | 0 crypto/{x509v3 => x509}/v3_cpols.c | 0 crypto/{x509v3 => x509}/v3_crld.c | 0 crypto/{x509v3 => x509}/v3_enum.c | 0 crypto/{x509v3 => x509}/v3_extku.c | 0 crypto/{x509v3 => x509}/v3_genn.c | 0 crypto/{x509v3 => x509}/v3_ia5.c | 0 crypto/{x509v3 => x509}/v3_info.c | 0 crypto/{x509v3 => x509}/v3_int.c | 0 crypto/{x509v3 => x509}/v3_lib.c | 0 crypto/{x509v3 => x509}/v3_ncons.c | 0 crypto/{x509v3 => x509}/v3_pci.c | 0 crypto/{x509v3 => x509}/v3_pcia.c | 0 crypto/{x509v3 => x509}/v3_pcons.c | 0 crypto/{x509v3 => x509}/v3_pku.c | 0 crypto/{x509v3 => x509}/v3_pmaps.c | 0 crypto/{x509v3 => x509}/v3_prn.c | 0 crypto/{x509v3 => x509}/v3_purp.c | 0 crypto/{x509v3 => x509}/v3_skey.c | 0 crypto/{x509v3 => x509}/v3_sxnet.c | 0 crypto/{x509v3 => x509}/v3_tlsf.c | 0 crypto/{x509v3 => x509}/v3_utl.c | 0 crypto/{x509v3 => x509}/v3err.c | 0 crypto/x509v3/build.info | 8 -------- test/x509_internal_test.c | 4 ++-- 48 files changed, 16 insertions(+), 14 deletions(-) rename crypto/{x509v3 => x509}/ext_dat.h (100%) rename crypto/{x509v3 => x509}/pcy_cache.c (100%) rename crypto/{x509v3 => x509}/pcy_data.c (100%) rename crypto/{x509v3 => x509}/pcy_int.h (100%) rename crypto/{x509v3 => x509}/pcy_lib.c (100%) rename crypto/{x509v3 => x509}/pcy_map.c (100%) rename crypto/{x509v3 => x509}/pcy_node.c (100%) rename crypto/{x509v3 => x509}/pcy_tree.c (100%) rename crypto/{x509v3 => x509}/standard_exts.h (100%) rename crypto/{x509v3 => x509}/v3_addr.c (100%) rename crypto/{x509v3 => x509}/v3_admis.c (100%) rename crypto/{x509v3 => x509}/v3_admis.h (100%) rename crypto/{x509v3 => x509}/v3_akey.c (100%) rename crypto/{x509v3 => x509}/v3_akeya.c (100%) rename crypto/{x509v3 => x509}/v3_alt.c (100%) rename crypto/{x509v3 => x509}/v3_asid.c (100%) rename crypto/{x509v3 => x509}/v3_bcons.c (100%) rename crypto/{x509v3 => x509}/v3_bitst.c (100%) rename crypto/{x509v3 => x509}/v3_conf.c (100%) rename crypto/{x509v3 => x509}/v3_cpols.c (100%) rename crypto/{x509v3 => x509}/v3_crld.c (100%) rename crypto/{x509v3 => x509}/v3_enum.c (100%) rename crypto/{x509v3 => x509}/v3_extku.c (100%) rename crypto/{x509v3 => x509}/v3_genn.c (100%) rename crypto/{x509v3 => x509}/v3_ia5.c (100%) rename crypto/{x509v3 => x509}/v3_info.c (100%) rename crypto/{x509v3 => x509}/v3_int.c (100%) rename crypto/{x509v3 => x509}/v3_lib.c (100%) rename crypto/{x509v3 => x509}/v3_ncons.c (100%) rename crypto/{x509v3 => x509}/v3_pci.c (100%) rename crypto/{x509v3 => x509}/v3_pcia.c (100%) rename crypto/{x509v3 => x509}/v3_pcons.c (100%) rename crypto/{x509v3 => x509}/v3_pku.c (100%) rename crypto/{x509v3 => x509}/v3_pmaps.c (100%) rename crypto/{x509v3 => x509}/v3_prn.c (100%) rename crypto/{x509v3 => x509}/v3_purp.c (100%) rename crypto/{x509v3 => x509}/v3_skey.c (100%) rename crypto/{x509v3 => x509}/v3_sxnet.c (100%) rename crypto/{x509v3 => x509}/v3_tlsf.c (100%) rename crypto/{x509v3 => x509}/v3_utl.c (100%) rename crypto/{x509v3 => x509}/v3err.c (100%) delete mode 100644 crypto/x509v3/build.info 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 # include "ocsp_lcl.h" # include -# 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 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 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) {