Commit 878dc8dd authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarShane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8925)
parent cdc5ae9c

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -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

































crypto/build.info



+1
−1






























Original line number
Diff line number
Diff line















# 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 \

































crypto/err/openssl.ec



+1
−1






























Original line number
Diff line number
Diff line








@@ -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

































crypto/ocsp/v3_ocsp.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -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

































crypto/x509/build.info



+8
−1






























Original line number
Diff line number
Diff line








@@ -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