diff options
102 files changed, 381 insertions, 685 deletions
@@ -4,6 +4,10 @@ Changes between 1.0.2g and 1.1.0 [xx XXX xxxx] + *) Headers are now wrapped, if necessary, with OPENSSL_NO_xxx, so + it is always safe to #include a header now. + [Rich Salz] + *) Removed the aged BC-32 config and all its supporting scripts [Richard Levitte] diff --git a/apps/apps.h b/apps/apps.h index e7ea46181c..7be7325429 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -121,12 +121,8 @@ # include <openssl/lhash.h> # include <openssl/conf.h> # include <openssl/txt_db.h> -# ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -# endif -# ifndef OPENSSL_NO_OCSP -# include <openssl/ocsp.h> -# endif +# include <openssl/engine.h> +# include <openssl/ocsp.h> # include <openssl/ossl_typ.h> # include <signal.h> diff --git a/crypto/aes/aes_locl.h b/crypto/aes/aes_locl.h index 7ab2d19eb0..e49f35702b 100644 --- a/crypto/aes/aes_locl.h +++ b/crypto/aes/aes_locl.h @@ -52,11 +52,6 @@ # define HEADER_AES_LOCL_H # include <openssl/e_os2.h> - -# ifdef OPENSSL_NO_AES -# error AES is disabled. -# endif - # include <stdio.h> # include <stdlib.h> # include <string.h> diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c index 0926a4f26c..a0c63207f9 100644 --- a/crypto/asn1/ameth_lib.c +++ b/crypto/asn1/ameth_lib.c @@ -60,9 +60,7 @@ #include "internal/cryptlib.h" #include <openssl/asn1t.h> #include <openssl/x509.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> #include "internal/asn1_int.h" #include "internal/evp_int.h" diff --git a/crypto/asn1/d2i_pr.c b/crypto/asn1/d2i_pr.c index e405b83dc8..85567cee5c 100644 --- a/crypto/asn1/d2i_pr.c +++ b/crypto/asn1/d2i_pr.c @@ -60,9 +60,7 @@ #include <openssl/bn.h> #include <openssl/evp.h> #include <openssl/objects.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> #include <openssl/x509.h> #include <openssl/asn1.h> #include "internal/asn1_int.h" diff --git a/crypto/asn1/d2i_pu.c b/crypto/asn1/d2i_pu.c index 9665ae6720..3ebdb5d150 100644 --- a/crypto/asn1/d2i_pu.c +++ b/crypto/asn1/d2i_pu.c @@ -61,15 +61,9 @@ #include <openssl/evp.h> #include <openssl/objects.h> #include <openssl/asn1.h> -#ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -#endif -#ifndef OPENSSL_NO_DSA -# include <openssl/dsa.h> -#endif -#ifndef OPENSSL_NO_EC -# include <openssl/ec.h> -#endif +#include <openssl/rsa.h> +#include <openssl/dsa.h> +#include <openssl/ec.h> #include "internal/evp_int.h" diff --git a/crypto/asn1/i2d_pu.c b/crypto/asn1/i2d_pu.c index db508ac178..c1504d8263 100644 --- a/crypto/asn1/i2d_pu.c +++ b/crypto/asn1/i2d_pu.c @@ -60,15 +60,9 @@ #include <openssl/bn.h> #include <openssl/evp.h> #include <openssl/objects.h> -#ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -#endif -#ifndef OPENSSL_NO_DSA -# include <openssl/dsa.h> -#endif -#ifndef OPENSSL_NO_EC -# include <openssl/ec.h> -#endif +#include <openssl/rsa.h> +#include <openssl/dsa.h> +#include <openssl/ec.h> int i2d_PublicKey(EVP_PKEY *a, unsigned char **pp) { diff --git a/crypto/asn1/t_spki.c b/crypto/asn1/t_spki.c index 206bd24e39..a289c7dae0 100644 --- a/crypto/asn1/t_spki.c +++ b/crypto/asn1/t_spki.c @@ -60,12 +60,8 @@ #include "internal/cryptlib.h" #include <openssl/x509.h> #include <openssl/asn1.h> -#ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -#endif -#ifndef OPENSSL_NO_DSA -# include <openssl/dsa.h> -#endif +#include <openssl/rsa.h> +#include <openssl/dsa.h> #include <openssl/bn.h> /* Print out an SPKI */ diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c index 7c88291e80..158d1d26af 100644 --- a/crypto/asn1/x_pubkey.c +++ b/crypto/asn1/x_pubkey.c @@ -61,12 +61,8 @@ #include <openssl/x509.h> #include "internal/asn1_int.h" #include "internal/evp_int.h" -#ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -#endif -#ifndef OPENSSL_NO_DSA -# include <openssl/dsa.h> -#endif +#include <openssl/rsa.h> +#include <openssl/dsa.h> /* Minor tweak to operation: free up EVP_PKEY */ static int pubkey_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, diff --git a/crypto/async/arch/async_null.c b/crypto/async/arch/async_null.c index f0b8a5c315..19fb72c2c0 100644 --- a/crypto/async/arch/async_null.c +++ b/crypto/async/arch/async_null.c @@ -54,6 +54,8 @@ #include "../async_locl.h" #ifdef ASYNC_NULL +# include <openssl/ct.h> +# include <openssl/x509v3.h> int ASYNC_is_capable(void) { diff --git a/crypto/blake2/blake2_locl.h b/crypto/blake2/blake2_locl.h index ba438f4e3e..10334b1622 100644 --- a/crypto/blake2/blake2_locl.h +++ b/crypto/blake2/blake2_locl.h @@ -18,10 +18,6 @@ #include <stddef.h> #include "e_os.h" -# ifdef OPENSSL_NO_BLAKE2 -# error BLAKE2 is disabled. -# endif - #define BLAKE2S_BLOCKBYTES 64 #define BLAKE2S_OUTBYTES 32 #define BLAKE2S_KEYBYTES 32 diff --git a/crypto/cms/cms_cd.c b/crypto/cms/cms_cd.c index 4854259881..9e120780ff 100644 --- a/crypto/cms/cms_cd.c +++ b/crypto/cms/cms_cd.c @@ -58,9 +58,7 @@ #include <openssl/err.h> #include <openssl/cms.h> #include <openssl/bio.h> -#ifndef OPENSSL_NO_COMP -# include <openssl/comp.h> -#endif +#include <openssl/comp.h> #include "cms_lcl.h" #ifdef ZLIB diff --git a/crypto/conf/conf_mall.c b/crypto/conf/conf_mall.c index 0a33368cfd..8480c2f1c5 100644 --- a/crypto/conf/conf_mall.c +++ b/crypto/conf/conf_mall.c @@ -63,9 +63,7 @@ #include <openssl/dso.h> #include <openssl/x509.h> #include <openssl/asn1.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> /* Load all OpenSSL builtin modules */ diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c index e70fb7a738..9cc7a931f5 100644 --- a/crypto/conf/conf_sap.c +++ b/crypto/conf/conf_sap.c @@ -63,9 +63,7 @@ #include <openssl/dso.h> #include <openssl/x509.h> #include <openssl/asn1.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> /* * This is the automatic configuration loader: it is called automatically by diff --git a/crypto/ct/ct_locl.h b/crypto/ct/ct_locl.h index 659120b8c2..0af4b7f830 100644 --- a/crypto/ct/ct_locl.h +++ b/crypto/ct/ct_locl.h @@ -50,10 +50,6 @@ * ==================================================================== */ -#ifdef OPENSSL_NO_CT -# error CT is disabled. -#endif - #include <stddef.h> #include <openssl/ct.h> #include <openssl/evp.h> diff --git a/crypto/dh/dh_ameth.c b/crypto/dh/dh_ameth.c index d644c86531..fc03d8fb0d 100644 --- a/crypto/dh/dh_ameth.c +++ b/crypto/dh/dh_ameth.c @@ -64,9 +64,7 @@ #include <openssl/bn.h> #include "internal/asn1_int.h" #include "internal/evp_int.h" -#ifndef OPENSSL_NO_CMS -# include <openssl/cms.h> -#endif +#include <openssl/cms.h> /* * i2d/d2i like DH parameter functions which use the appropriate routine for diff --git a/crypto/dh/dh_lib.c b/crypto/dh/dh_lib.c index d7aed6a282..1a0c054eeb 100644 --- a/crypto/dh/dh_lib.c +++ b/crypto/dh/dh_lib.c @@ -59,9 +59,7 @@ #include "internal/cryptlib.h" #include <openssl/bn.h> #include <openssl/dh.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> static const DH_METHOD *default_DH_method = NULL; diff --git a/crypto/dh/dh_pmeth.c b/crypto/dh/dh_pmeth.c index a760ff5390..93bada0058 100644 --- a/crypto/dh/dh_pmeth.c +++ b/crypto/dh/dh_pmeth.c @@ -63,9 +63,7 @@ #include <openssl/evp.h> #include <openssl/dh.h> #include <openssl/bn.h> -#ifndef OPENSSL_NO_DSA -# include <openssl/dsa.h> -#endif +#include <openssl/dsa.h> #include <openssl/objects.h> #include "internal/evp_int.h" diff --git a/crypto/dsa/dsa_ameth.c b/crypto/dsa/dsa_ameth.c index 5661af57b1..f0f28bdf2a 100644 --- a/crypto/dsa/dsa_ameth.c +++ b/crypto/dsa/dsa_ameth.c @@ -62,9 +62,7 @@ #include <openssl/asn1.h> #include <openssl/dsa.h> #include <openssl/bn.h> -#ifndef OPENSSL_NO_CMS -# include <openssl/cms.h> -#endif +#include <openssl/cms.h> #include "internal/asn1_int.h" #include "internal/evp_int.h" diff --git a/crypto/dsa/dsa_gen.c b/crypto/dsa/dsa_gen.c index 15d5116ba2..c278d9853d 100644 --- a/crypto/dsa/dsa_gen.c +++ b/crypto/dsa/dsa_gen.c @@ -62,15 +62,13 @@ */ #define xxxHASH EVP_sha1() -#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_SHA is defined */ - +#include <openssl/opensslconf.h> #include <stdio.h> #include "internal/cryptlib.h" #include <openssl/evp.h> #include <openssl/bn.h> #include <openssl/rand.h> #include <openssl/sha.h> - #include "dsa_locl.h" int DSA_generate_parameters_ex(DSA *ret, int bits, diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c index 3b99b3c2eb..fa8330fd84 100644 --- a/crypto/dsa/dsa_lib.c +++ b/crypto/dsa/dsa_lib.c @@ -62,12 +62,8 @@ #include <openssl/bn.h> #include <openssl/dsa.h> #include <openssl/asn1.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif -#ifndef OPENSSL_NO_DH -# include <openssl/dh.h> -#endif +#include <openssl/engine.h> +#include <openssl/dh.h> static const DSA_METHOD *default_DSA_method = NULL; diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c index 310bfad050..ca354c05cd 100644 --- a/crypto/ec/ec_ameth.c +++ b/crypto/ec/ec_ameth.c @@ -61,9 +61,7 @@ #include <openssl/x509.h> #include <openssl/ec.h> #include <openssl/bn.h> -#ifndef OPENSSL_NO_CMS -# include <openssl/cms.h> -#endif +#include <openssl/cms.h> #include <openssl/asn1t.h> #include "internal/asn1_int.h" #include "internal/evp_int.h" diff --git a/crypto/ec/ec_key.c b/crypto/ec/ec_key.c index 0d7370eef9..d241154630 100644 --- a/crypto/ec/ec_key.c +++ b/crypto/ec/ec_key.c @@ -64,9 +64,7 @@ #include <string.h> #include "ec_lcl.h" #include <openssl/err.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> EC_KEY *EC_KEY_new(void) { diff --git a/crypto/ec/ec_kmeth.c b/crypto/ec/ec_kmeth.c index dc097ce0dc..003421eabe 100644 --- a/crypto/ec/ec_kmeth.c +++ b/crypto/ec/ec_kmeth.c @@ -53,9 +53,7 @@ #include <string.h> #include <openssl/ec.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> #include <openssl/err.h> #include "ec_lcl.h" diff --git a/crypto/ec/ecdsa_sign.c b/crypto/ec/ecdsa_sign.c index df90175980..738c276ae9 100644 --- a/crypto/ec/ecdsa_sign.c +++ b/crypto/ec/ecdsa_sign.c @@ -54,9 +54,7 @@ #include <openssl/ec.h> #include "ec_lcl.h" -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> #include <openssl/rand.h> #include <openssl/err.h> diff --git a/crypto/ec/ecdsa_vrf.c b/crypto/ec/ecdsa_vrf.c index 0441bc0c59..f519b59807 100644 --- a/crypto/ec/ecdsa_vrf.c +++ b/crypto/ec/ecdsa_vrf.c @@ -58,9 +58,7 @@ #include <openssl/ec.h> #include "ec_lcl.h" #include <string.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> #include <openssl/err.h> /*- diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c index 4acea62f9f..34193f38ad 100644 --- a/crypto/engine/eng_cryptodev.c +++ b/crypto/engine/eng_cryptodev.c @@ -56,9 +56,7 @@ # include <errno.h> # include <string.h> #endif -#ifndef OPENSSL_NO_DH -# include <openssl/dh.h> -#endif +#include <openssl/dh.h> #include <openssl/dsa.h> #include <openssl/err.h> #include <openssl/rsa.h> diff --git a/crypto/engine/eng_openssl.c b/crypto/engine/eng_openssl.c index 914bba5b3a..2bf91b365f 100644 --- a/crypto/engine/eng_openssl.c +++ b/crypto/engine/eng_openssl.c @@ -69,15 +69,9 @@ #include <openssl/pem.h> #include <openssl/evp.h> #include <openssl/rand.h> -#ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -#endif -#ifndef OPENSSL_NO_DSA -# include <openssl/dsa.h> -#endif -#ifndef OPENSSL_NO_DH -# include <openssl/dh.h> -#endif +#include <openssl/rsa.h> +#include <openssl/dsa.h> +#include <openssl/dh.h> #include <openssl/hmac.h> #include <openssl/x509v3.h> diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index 8939c085ea..a79a84e544 100644 --- a/crypto/err/err_all.c +++ b/crypto/err/err_all.c @@ -59,23 +59,13 @@ #include <internal/err.h> #include <openssl/asn1.h> #include <openssl/bn.h> -#ifndef OPENSSL_NO_EC -# include <openssl/ec.h> -#endif +#include <openssl/ec.h> #include <openssl/buffer.h> #include <openssl/bio.h> -#ifndef OPENSSL_NO_COMP -# include <openssl/comp.h> -#endif -#ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -#endif -#ifndef OPENSSL_NO_DH -# include <openssl/dh.h> -#endif -#ifndef OPENSSL_NO_DSA -# include <openssl/dsa.h> -#endif +#include <openssl/comp.h> +#include <openssl/rsa.h> +#include <openssl/dh.h> +#include <openssl/dsa.h> #include <openssl/evp.h> #include <openssl/objects.h> #include <openssl/pem2.h> @@ -85,9 +75,7 @@ #include <openssl/pkcs12.h> #include <openssl/rand.h> #include <openssl/dso.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> #include <openssl/ui.h> #include <openssl/ocsp.h> #include <openssl/err.h> @@ -95,12 +83,8 @@ # include <openssl/fips.h> #endif #include <openssl/ts.h> -#ifndef OPENSSL_NO_CMS -# include <openssl/cms.h> -#endif -#ifndef OPENSSL_NO_CT -# include <openssl/ct.h> -#endif +#include <openssl/cms.h> +#include <openssl/ct.h> #include <openssl/async.h> #include <openssl/kdf.h> diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c index 0ed884565a..aee8127d00 100644 --- a/crypto/evp/digest.c +++ b/crypto/evp/digest.c @@ -112,9 +112,7 @@ #include "internal/cryptlib.h" #include <openssl/objects.h> #include <openssl/evp.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> #include "internal/evp_int.h" #include "evp_locl.h" diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c index 360f572731..c906e6ff87 100644 --- a/crypto/evp/e_aes.c +++ b/crypto/evp/e_aes.c @@ -50,7 +50,7 @@ #include <openssl/opensslconf.h> #ifndef OPENSSL_NO_AES -#include <openssl/crypto.h> +# include <openssl/crypto.h> # include <openssl/evp.h> # include <openssl/err.h> # include <string.h> diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index 484b024218..d7cc1f453c 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -60,9 +60,7 @@ #include <openssl/evp.h> #include <openssl/err.h> #include <openssl/rand.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> #include "internal/evp_int.h" #include "evp_locl.h" diff --git a/crypto/evp/m_md2.c b/crypto/evp/m_md2.c index 5c1ac38624..0e83dfec10 100644 --- a/crypto/evp/m_md2.c +++ b/crypto/evp/m_md2.c @@ -64,9 +64,7 @@ # include <openssl/objects.h> # include <openssl/x509.h> # include <openssl/md2.h> -# ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -# endif +# include <openssl/rsa.h> #include "internal/evp_int.h" diff --git a/crypto/evp/m_md4.c b/crypto/evp/m_md4.c index e63db4e1f9..933d82af78 100644 --- a/crypto/evp/m_md4.c +++ b/crypto/evp/m_md4.c @@ -64,9 +64,7 @@ # include <openssl/objects.h> # include <openssl/x509.h> # include <openssl/md4.h> -# ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -# endif +# include <openssl/rsa.h> # include "internal/evp_int.h" static int init(EVP_MD_CTX *ctx) diff --git a/crypto/evp/m_md5.c b/crypto/evp/m_md5.c index adaa8577eb..b28be91edd 100644 --- a/crypto/evp/m_md5.c +++ b/crypto/evp/m_md5.c @@ -64,9 +64,7 @@ # include <openssl/objects.h> # include <openssl/x509.h> # include <openssl/md5.h> -# ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -# endif +# include <openssl/rsa.h> # include "internal/evp_int.h" static int init(EVP_MD_CTX *ctx) diff --git a/crypto/evp/m_md5_sha1.c b/crypto/evp/m_md5_sha1.c index 949b0e5a16..ae28ddce09 100644 --- a/crypto/evp/m_md5_sha1.c +++ b/crypto/evp/m_md5_sha1.c @@ -60,9 +60,7 @@ # include <openssl/sha.h> # include "internal/cryptlib.h" # include "internal/evp_int.h" -# ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -# endif +# include <openssl/rsa.h> struct md5_sha1_ctx { MD5_CTX md5; diff --git a/crypto/evp/m_mdc2.c b/crypto/evp/m_mdc2.c index dbe71dffaf..f7fa60022b 100644 --- a/crypto/evp/m_mdc2.c +++ b/crypto/evp/m_mdc2.c @@ -64,9 +64,7 @@ # include <openssl/objects.h> # include <openssl/x509.h> # include <openssl/mdc2.h> -# ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -# endif +# include <openssl/rsa.h> # include "internal/evp_int.h" static int init(EVP_MD_CTX *ctx) diff --git a/crypto/evp/m_ripemd.c b/crypto/evp/m_ripemd.c index 67aa3cf202..d4488bec0e 100644 --- a/crypto/evp/m_ripemd.c +++ b/crypto/evp/m_ripemd.c @@ -64,9 +64,7 @@ # include <openssl/evp.h> # include <openssl/objects.h> # include <openssl/x509.h> -# ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -# endif +# include <openssl/rsa.h> # include "internal/evp_int.h" static int init(EVP_MD_CTX *ctx) diff --git a/crypto/evp/m_sha1.c b/crypto/evp/m_sha1.c index fb674aee5d..e673e41725 100644 --- a/crypto/evp/m_sha1.c +++ b/crypto/evp/m_sha1.c @@ -61,9 +61,7 @@ #include <openssl/evp.h> #include <openssl/objects.h> #include <openssl/sha.h> -#ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -#endif +#include <openssl/rsa.h> #include "internal/evp_int.h" static int init(EVP_MD_CTX *ctx) diff --git a/crypto/evp/p_dec.c b/crypto/evp/p_dec.c index 37f6822be4..5729ed7ac3 100644 --- a/crypto/evp/p_dec.c +++ b/crypto/evp/p_dec.c @@ -58,9 +58,7 @@ #include <stdio.h> #include "internal/cryptlib.h" #include <openssl/rand.h> -#ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -#endif +#include <openssl/rsa.h> #include <openssl/evp.h> #include <openssl/objects.h> #include <openssl/x509.h> diff --git a/crypto/evp/p_enc.c b/crypto/evp/p_enc.c index d3bcaa0b7e..f1fc818750 100644 --- a/crypto/evp/p_enc.c +++ b/crypto/evp/p_enc.c @@ -58,9 +58,7 @@ #include <stdio.h> #include "internal/cryptlib.h" #include <openssl/rand.h> -#ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -#endif +#include <openssl/rsa.h> #include <openssl/evp.h> #include <openssl/objects.h> #include <openssl/x509.h> diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c index a7d624427e..a8fa301b31 100644 --- a/crypto/evp/p_lib.c +++ b/crypto/evp/p_lib.c @@ -62,19 +62,10 @@ #include <openssl/objects.h> #include <openssl/evp.h> #include <openssl/x509.h> -#ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -#endif -#ifndef OPENSSL_NO_DSA -# include <openssl/dsa.h> -#endif -#ifndef OPENSSL_NO_DH -# include <openssl/dh.h> -#endif - -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/rsa.h> +#include <openssl/dsa.h> +#include <openssl/dh.h> +#include <openssl/engine.h> #include "internal/asn1_int.h" #include "internal/evp_int.h" diff --git a/crypto/evp/p_seal.c b/crypto/evp/p_seal.c index 52436d1244..d802d84b8f 100644 --- a/crypto/evp/p_seal.c +++ b/crypto/evp/p_seal.c @@ -58,9 +58,7 @@ #include <stdio.h> #include "internal/cryptlib.h" #include <openssl/rand.h> -#ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -#endif +#include <openssl/rsa.h> #include <openssl/evp.h> #include <openssl/objects.h> #include <openssl/x509.h> diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c index a285009ad4..ff5baa7d2c 100644 --- a/crypto/evp/pmeth_lib.c +++ b/crypto/evp/pmeth_lib.c @@ -59,9 +59,7 @@ #include <stdio.h> #include <stdlib.h> #include "internal/cryptlib.h" -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> #include <openssl/evp.h> #include <openssl/x509v3.h> #include "internal/asn1_int.h" diff --git a/crypto/include/internal/chacha.h b/crypto/include/internal/chacha.h index 98787d35b8..dacbdf59dc 100644 --- a/crypto/include/internal/chacha.h +++ b/crypto/include/internal/chacha.h @@ -57,10 +57,6 @@ extern "C" { #endif -# ifdef OPENSSL_NO_CHACHA -# error CHACHA is disabled. -# endif - /* * ChaCha20_ctr32 encrypts |len| bytes from |inp| with the given key and * nonce and writes the result to |out|, which may be equal to |inp|. diff --git a/crypto/include/internal/poly1305.h b/crypto/include/internal/poly1305.h index b6db3253f2..8e2cac5215 100644 --- a/crypto/include/internal/poly1305.h +++ b/crypto/include/internal/poly1305.h @@ -49,10 +49,6 @@ */ #include <stddef.h> -#ifdef OPENSSL_NO_POLY1305 -# error POLY1305 is disabled. -#endif - #define POLY1305_BLOCK_SIZE 16 typedef struct poly1305_context POLY1305; diff --git a/crypto/init.c b/crypto/init.c index fad7a85b82..d3167804d9 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -63,12 +63,8 @@ #include <internal/evp_int.h> #include <internal/conf.h> #include <internal/async.h> -#ifndef OPENSSL_NO_ENGINE #include <internal/engine.h> -#endif -#ifndef OPENSSL_NO_COMP #include <openssl/comp.h> -#endif #include <internal/err.h> #include <stdlib.h> #include <assert.h> diff --git a/crypto/pem/pem_all.c b/crypto/pem/pem_all.c index 9a08c02832..5967b6eb72 100644 --- a/crypto/pem/pem_all.c +++ b/crypto/pem/pem_all.c @@ -115,15 +115,9 @@ #include <openssl/x509.h> #include <openssl/pkcs7.h> #include <openssl/pem.h> -#ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -#endif -#ifndef OPENSSL_NO_DSA -# include <openssl/dsa.h> -#endif -#ifndef OPENSSL_NO_DH -# include <openssl/dh.h> -#endif +#include <openssl/rsa.h> +#include <openssl/dsa.h> +#include <openssl/dh.h> #ifndef OPENSSL_NO_RSA static RSA *pkey_get_rsa(EVP_PKEY *key, RSA **rsa); diff --git a/crypto/pem/pem_info.c b/crypto/pem/pem_info.c index 50a5051dad..1b1cde4b09 100644 --- a/crypto/pem/pem_info.c +++ b/crypto/pem/pem_info.c @@ -62,12 +62,8 @@ #include <openssl/evp.h> #include <openssl/x509.h> #include <openssl/pem.h> -#ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -#endif -#ifndef OPENSSL_NO_DSA -# include <openssl/dsa.h> -#endif +#include <openssl/rsa.h> +#include <openssl/dsa.h> #ifndef OPENSSL_NO_STDIO STACK_OF(X509_INFO) *PEM_X509_INFO_read(FILE *fp, STACK_OF(X509_INFO) *sk, diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c index 54ddc1efbb..5e7aa776d9 100644 --- a/crypto/pem/pem_lib.c +++ b/crypto/pem/pem_lib.c @@ -66,12 +66,8 @@ #include <openssl/pem.h> #include <openssl/pkcs12.h> #include "internal/asn1_int.h" -#ifndef OPENSSL_NO_DES -# include <openssl/des.h> -#endif -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/des.h> +#include <openssl/engine.h> #define MIN_LENGTH 4 diff --git a/crypto/pem/pem_pkey.c b/crypto/pem/pem_pkey.c index 8eb398d55d..ef0c0e45d8 100644 --- a/crypto/pem/pem_pkey.c +++ b/crypto/pem/pem_pkey.c @@ -64,12 +64,8 @@ #include <openssl/x509.h> #include <openssl/pkcs12.h> #include <openssl/pem.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif -#ifndef OPENSSL_NO_DH -# include <openssl/dh.h> -#endif +#include <openssl/engine.h> +#include <openssl/dh.h> #include "internal/asn1_int.h" #include "internal/evp_int.h" diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c index 63fd231775..36b41cda80 100644 --- a/crypto/rand/rand_lib.c +++ b/crypto/rand/rand_lib.c @@ -61,9 +61,7 @@ #include <openssl/opensslconf.h> #include <openssl/rand.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> #ifdef OPENSSL_FIPS # include <openssl/fips.h> diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c index 15f2194bf1..ad51a440e5 100644 --- a/crypto/rsa/rsa_ameth.c +++ b/crypto/rsa/rsa_ameth.c @@ -62,9 +62,7 @@ #include <openssl/x509.h> #include <openssl/rsa.h> #include <openssl/bn.h> -#ifndef OPENSSL_NO_CMS -# include <openssl/cms.h> -#endif +#include <openssl/cms.h> #include "internal/asn1_int.h" #include "internal/evp_int.h" diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c index 9cc88142b6..bd881ed528 100644 --- a/crypto/rsa/rsa_lib.c +++ b/crypto/rsa/rsa_lib.c @@ -62,9 +62,7 @@ #include "internal/bn_int.h" #include <openssl/rsa.h> #include <openssl/rand.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> static const RSA_METHOD *default_RSA_meth = NULL; diff --git a/crypto/rsa/rsa_pmeth.c b/crypto/rsa/rsa_pmeth.c index 93c8756068..22089a3267 100644 --- a/crypto/rsa/rsa_pmeth.c +++ b/crypto/rsa/rsa_pmeth.c @@ -64,9 +64,7 @@ #include <openssl/bn.h> #include <openssl/evp.h> #include <openssl/x509v3.h> -#ifndef OPENSSL_NO_CMS -# include <openssl/cms.h> -#endif +#include <openssl/cms.h> #include "internal/evp_int.h" #include "rsa_locl.h" diff --git a/crypto/ts/ts_conf.c b/crypto/ts/ts_conf.c index 6adea58840..e610691416 100644 --- a/crypto/ts/ts_conf.c +++ b/crypto/ts/ts_conf.c @@ -61,9 +61,7 @@ #include <openssl/crypto.h> #include "internal/cryptlib.h" #include <openssl/pem.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> #include <openssl/ts.h> /* Macro definitions for the configuration file. */ diff --git a/crypto/x509/t_req.c b/crypto/x509/t_req.c index 2c519f9785..afe59c4e9c 100644 --- a/crypto/x509/t_req.c +++ b/crypto/x509/t_req.c @@ -62,12 +62,8 @@ #include <openssl/objects.h> #include <openssl/x509.h> #include <openssl/x509v3.h> -#ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -#endif -#ifndef OPENSSL_NO_DSA -# include <openssl/dsa.h> -#endif +#include <openssl/rsa.h> +#include <openssl/dsa.h> #ifndef OPENSSL_NO_STDIO int X509_REQ_print_fp(FILE *fp, X509_REQ *x) diff --git a/crypto/x509/x_all.c b/crypto/x509/x_all.c index f62a7c86b2..c370ba94bb 100644 --- a/crypto/x509/x_all.c +++ b/crypto/x509/x_all.c @@ -64,12 +64,8 @@ #include <openssl/x509.h> #include "internal/x509_int.h" #include <openssl/ocsp.h> -#ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -#endif -#ifndef OPENSSL_NO_DSA -# include <openssl/dsa.h> -#endif +#include <openssl/rsa.h> +#include <openssl/dsa.h> int X509_verify(X509 *a, EVP_PKEY *r) { diff --git a/include/openssl/aes.h b/include/openssl/aes.h index 8c36a4d64f..f81ec0dc51 100644 --- a/include/openssl/aes.h +++ b/include/openssl/aes.h @@ -53,11 +53,11 @@ # include <openssl/opensslconf.h> -# ifdef OPENSSL_NO_AES -# error AES is disabled. -# endif - +#ifndef OPENSSL_NO_AES # include <stddef.h> +# ifdef __cplusplus +extern "C" { +# endif # define AES_ENCRYPT 1 # define AES_DECRYPT 0 @@ -69,10 +69,6 @@ # define AES_MAXNR 14 # define AES_BLOCK_SIZE 16 -#ifdef __cplusplus -extern "C" { -#endif - /* This should be a hidden type, but EVP requires that the size be known */ struct aes_key_st { # ifdef AES_LONG @@ -131,8 +127,9 @@ int AES_unwrap_key(AES_KEY *key, const unsigned char *iv, const unsigned char *in, unsigned int inlen); -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif +# endif -#endif /* !HEADER_AES_H */ +#endif diff --git a/include/openssl/blowfish.h b/include/openssl/blowfish.h index ee4afa542d..5e0af533cf 100644 --- a/include/openssl/blowfish.h +++ b/include/openssl/blowfish.h @@ -58,14 +58,12 @@ #ifndef HEADER_BLOWFISH_H # define HEADER_BLOWFISH_H -# include <openssl/e_os2.h> +# include <openssl/opensslconf.h> -#ifdef __cplusplus +# ifndef OPENSSL_NO_BF +# include <openssl/e_os2.h> +# ifdef __cplusplus extern "C" { -#endif - -# ifdef OPENSSL_NO_BF -# error BF is disabled. # endif # define BF_ENCRYPT 1 @@ -103,8 +101,9 @@ void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out, unsigned char *ivec, int *num); const char *BF_options(void); -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif +# endif #endif diff --git a/include/openssl/bn.h b/include/openssl/bn.h index 8d2d5a8be0..315b99e748 100644 --- a/include/openssl/bn.h +++ b/include/openssl/bn.h @@ -126,7 +126,7 @@ # include <openssl/e_os2.h> # ifndef OPENSSL_NO_STDIO -# include <stdio.h> /* FILE */ +# include <stdio.h> # endif # include <openssl/opensslconf.h> # include <openssl/ossl_typ.h> diff --git a/include/openssl/camellia.h b/include/openssl/camellia.h index d04d2a8b3a..d05b392549 100644 --- a/include/openssl/camellia.h +++ b/include/openssl/camellia.h @@ -53,11 +53,11 @@ # include <openssl/opensslconf.h> -# ifdef OPENSSL_NO_CAMELLIA -# error CAMELLIA is disabled. -# endif - +# ifndef OPENSSL_NO_CAMELLIA # include <stddef.h> +#ifdef __cplusplus +extern "C" { +#endif # define CAMELLIA_ENCRYPT 1 # define CAMELLIA_DECRYPT 0 @@ -67,10 +67,6 @@ * Both sizes are in bytes. */ -#ifdef __cplusplus -extern "C" { -#endif - /* This should be a hidden type, but EVP requires that the size be known */ # define CAMELLIA_BLOCK_SIZE 16 @@ -120,8 +116,9 @@ void Camellia_ctr128_encrypt(const unsigned char *in, unsigned char *out, unsigned char ecount_buf[CAMELLIA_BLOCK_SIZE], unsigned int *num); -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif +# endif -#endif /* !HEADER_Camellia_H */ +#endif diff --git a/include/openssl/cast.h b/include/openssl/cast.h index 87d1933a9b..c54d3c9219 100644 --- a/include/openssl/cast.h +++ b/include/openssl/cast.h @@ -58,14 +58,11 @@ #ifndef HEADER_CAST_H # define HEADER_CAST_H -#ifdef __cplusplus -extern "C" { -#endif - # include <openssl/opensslconf.h> -# ifdef OPENSSL_NO_CAST -# error CAST is disabled. +# ifndef OPENSSL_NO_CAST +# ifdef __cplusplus +extern "C" { # endif # define CAST_ENCRYPT 1 @@ -96,8 +93,9 @@ void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out, long length, const CAST_KEY *schedule, unsigned char *ivec, int *num); -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif +# endif #endif diff --git a/include/openssl/cms.h b/include/openssl/cms.h index f8d55d84d2..5ae701e585 100644 --- a/include/openssl/cms.h +++ b/include/openssl/cms.h @@ -54,16 +54,14 @@ #ifndef HEADER_CMS_H # define HEADER_CMS_H +# include <openssl/opensslconf.h> + +# ifndef OPENSSL_NO_CMS # include <openssl/x509.h> # include <openssl/x509v3.h> - -# ifdef OPENSSL_NO_CMS -# error CMS is disabled. -# endif - -#ifdef __cplusplus +# ifdef __cplusplus extern "C" { -#endif +# endif typedef struct CMS_ContentInfo_st CMS_ContentInfo; typedef struct CMS_SignerInfo_st CMS_SignerInfo; @@ -551,7 +549,9 @@ void ERR_load_CMS_strings(void); # define CMS_R_VERIFICATION_FAILURE 158 # define CMS_R_WRAP_ERROR 159 -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif +# endif + #endif diff --git a/include/openssl/comp.h b/include/openssl/comp.h index de16a9fcdb..de4eb32561 100644 --- a/include/openssl/comp.h +++ b/include/openssl/comp.h @@ -56,15 +56,14 @@ #ifndef HEADER_COMP_H # define HEADER_COMP_H -# include <openssl/crypto.h> +# include <openssl/opensslconf.h> -# ifdef OPENSSL_NO_COMP -# error COMP is disabled. +# ifndef OPENSSL_NO_COMP +# include <openssl/crypto.h> +# ifdef __cplusplus +extern "C" { # endif -#ifdef __cplusplus -extern "C" { -#endif COMP_CTX *COMP_CTX_new(COMP_METHOD *meth); @@ -110,5 +109,7 @@ void ERR_load_COMP_strings(void); #ifdef __cplusplus } -#endif +# endif +# endif + #endif diff --git a/include/openssl/ct.h b/include/openssl/ct.h index f148a270aa..0da3125d17 100644 --- a/include/openssl/ct.h +++ b/include/openssl/ct.h @@ -51,21 +51,20 @@ * ==================================================================== */ -#ifdef OPENSSL_NO_CT -# error "CT is disabled" -#endif - #ifndef HEADER_CT_H # define HEADER_CT_H +# include <openssl/opensslconf.h> + +# ifndef OPENSSL_NO_CT # include <openssl/ossl_typ.h> # include <openssl/safestack.h> # include <openssl/x509.h> - # ifdef __cplusplus extern "C" { # endif + /* Minimum RSA key size, from RFC6962 */ # define SCT_MIN_RSA_BITS 2048 @@ -601,7 +600,9 @@ void ERR_load_CT_strings(void); # define CT_R_UNSUPPORTED_ENTRY_TYPE 102 # define CT_R_UNSUPPORTED_VERSION 103 -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif +# endif + #endif diff --git a/include/openssl/des.h b/include/openssl/des.h index 13ce232703..633d070b39 100644 --- a/include/openssl/des.h +++ b/include/openssl/des.h @@ -55,14 +55,16 @@ * [including the GNU Public Licence.] */ -#ifndef HEADER_NEW_DES_H -# define HEADER_NEW_DES_H +#ifndef HEADER_DES_H +# define HEADER_DES_H -# include <openssl/e_os2.h> +# include <openssl/opensslconf.h> -# ifdef OPENSSL_NO_DES -# error DES is disabled. +# ifndef OPENSSL_NO_DES +# ifdef __cplusplus +extern "C" { # endif +# include <openssl/e_os2.h> typedef unsigned int DES_LONG; @@ -71,10 +73,6 @@ typedef unsigned int DES_LONG; # define OPENSSL_EXTERN OPENSSL_EXPORT # endif -#ifdef __cplusplus -extern "C" { -#endif - typedef unsigned char DES_cblock[8]; typedef /* const */ unsigned char const_DES_cblock[8]; /* @@ -228,8 +226,9 @@ int DES_read_2passwords(DES_cblock *key1, DES_cblock *key2, # define DES_fixup_key_parity DES_set_odd_parity -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif +# endif #endif diff --git a/include/openssl/dh.h b/include/openssl/dh.h index e852cbe446..2e021e235b 100644 --- a/include/openssl/dh.h +++ b/include/openssl/dh.h @@ -58,13 +58,10 @@ #ifndef HEADER_DH_H # define HEADER_DH_H -# include <openssl/e_os2.h> # include <openssl/opensslconf.h> -# ifdef OPENSSL_NO_DH -# error DH is disabled. -# endif - +# ifndef OPENSSL_NO_DH +# include <openssl/e_os2.h> # include <openssl/bio.h> # include <openssl/asn1.h> # include <openssl/ossl_typ.h> @@ -72,6 +69,10 @@ # include <openssl/bn.h> # endif +# ifdef __cplusplus +extern "C" { +# endif + # ifndef OPENSSL_DH_MAX_MODULUS_BITS # define OPENSSL_DH_MAX_MODULUS_BITS 10000 # endif @@ -79,15 +80,6 @@ # define OPENSSL_DH_FIPS_MIN_MODULUS_BITS 1024 # define DH_FLAG_CACHE_MONT_P 0x01 - -/* - * new with 0.9.7h; the built-in DH - * implementation now uses constant time - * modular exponentiation for secret exponents - * by default. This flag causes the - * faster variable sliding window method to - * be used for all exponents. - */ # define DH_FLAG_NO_EXP_CONSTTIME 0x02 /* @@ -107,10 +99,6 @@ # define DH_FLAG_NON_FIPS_ALLOW 0x0400 -#ifdef __cplusplus -extern "C" { -#endif - /* Already defined in ossl_typ.h */ /* typedef struct dh_st DH; */ /* typedef struct dh_method DH_METHOD; */ @@ -389,7 +377,9 @@ void ERR_load_DH_strings(void); # define DH_R_PEER_KEY_ERROR 111 # define DH_R_SHARED_INFO_ERROR 113 -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif +# endif + #endif diff --git a/include/openssl/dsa.h b/include/openssl/dsa.h index 865344932f..240a1afa84 100644 --- a/include/openssl/dsa.h +++ b/include/openssl/dsa.h @@ -63,22 +63,20 @@ #ifndef HEADER_DSA_H # define HEADER_DSA_H -# include <openssl/e_os2.h> +# include <openssl/opensslconf.h> -# ifdef OPENSSL_NO_DSA -# error DSA is disabled. +# ifndef OPENSSL_NO_DSA +# ifdef __cplusplus +extern "C" { # endif - +# include <openssl/e_os2.h> # include <openssl/bio.h> # include <openssl/crypto.h> # include <openssl/ossl_typ.h> # include <openssl/opensslconf.h> - # if OPENSSL_API_COMPAT < 0x10100000L # include <openssl/bn.h> -# ifndef OPENSSL_NO_DH -# include <openssl/dh.h> -# endif +# include <openssl/dh.h> # endif # ifndef OPENSSL_DSA_MAX_MODULUS_BITS @@ -113,10 +111,6 @@ # define DSA_FLAG_NON_FIPS_ALLOW 0x0400 # define DSA_FLAG_FIPS_CHECKED 0x0800 -#ifdef __cplusplus -extern "C" { -#endif - /* Already defined in ossl_typ.h */ /* typedef struct dsa_st DSA; */ /* typedef struct dsa_method DSA_METHOD; */ @@ -323,7 +317,9 @@ void ERR_load_DSA_strings(void); # define DSA_R_PARAMETER_ENCODING_ERROR 105 # define DSA_R_Q_NOT_PRIME 113 -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif +# endif + #endif diff --git a/include/openssl/ec.h b/include/openssl/ec.h index 103f718208..892239dd87 100644 --- a/include/openssl/ec.h +++ b/include/openssl/ec.h @@ -1,12 +1,6 @@ - -/* crypto/ec/ec.h */ /* * Originally written by Bodo Moeller for the OpenSSL project. */ -/** - * \file crypto/ec/ec.h Include file for the OpenSSL EC functions - * \author Originally written by Bodo Moeller for the OpenSSL project - */ /* ==================================================================== * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved. * @@ -79,22 +73,14 @@ # include <openssl/opensslconf.h> -# ifdef OPENSSL_NO_EC -# error EC is disabled. -# endif - +# ifndef OPENSSL_NO_EC # include <openssl/asn1.h> # include <openssl/symhacks.h> # if OPENSSL_API_COMPAT < 0x10100000L # include <openssl/bn.h> # endif - # ifdef __cplusplus extern "C" { -# elif defined(__SUNPRO_C) -# if __SUNPRO_C >= 0x520 -# pragma error_messages (off,E_ARRAY_OF_INCOMPLETE_NONAME,E_ARRAY_OF_INCOMPLETE) -# endif # endif # ifndef OPENSSL_ECC_MAX_FIELD_BITS @@ -1650,7 +1636,9 @@ void ERR_load_EC_strings(void); # define EC_R_WRONG_CURVE_PARAMETERS 145 # define EC_R_WRONG_ORDER 130 -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif +# endif + #endif diff --git a/include/openssl/engine.h b/include/openssl/engine.h index d1cd17a24c..c12e02755f 100644 --- a/include/openssl/engine.h +++ b/include/openssl/engine.h @@ -66,37 +66,23 @@ # include <openssl/opensslconf.h> -# ifdef OPENSSL_NO_ENGINE -# error ENGINE is disabled. -# endif - +# ifndef OPENSSL_NO_ENGINE # if OPENSSL_API_COMPAT < 0x10100000L # include <openssl/bn.h> -# ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -# endif -# ifndef OPENSSL_NO_DSA -# include <openssl/dsa.h> -# endif -# ifndef OPENSSL_NO_DH -# include <openssl/dh.h> -# endif -# ifndef OPENSSL_NO_EC -# include <openssl/ec.h> -# endif +# include <openssl/rsa.h> +# include <openssl/dsa.h> +# include <openssl/dh.h> +# include <openssl/ec.h> # include <openssl/rand.h> # include <openssl/ui.h> # include <openssl/err.h> # endif - # include <openssl/ossl_typ.h> # include <openssl/symhacks.h> - # include <openssl/x509.h> - -#ifdef __cplusplus +# ifdef __cplusplus extern "C" { -#endif +# endif /* * These flags are used to control combinations of algorithm (methods) by @@ -905,7 +891,9 @@ void ERR_load_ENGINE_strings(void); # define ENGINE_R_UNIMPLEMENTED_PUBLIC_KEY_METHOD 101 # define ENGINE_R_VERSION_INCOMPATIBILITY 145 -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif +# endif + #endif diff --git a/include/openssl/idea.h b/include/openssl/idea.h index 29b5094394..165ee405ac 100644 --- a/include/openssl/idea.h +++ b/include/openssl/idea.h @@ -60,8 +60,9 @@ # include <openssl/opensslconf.h> -# ifdef OPENSSL_NO_IDEA -# error IDEA is disabled. +# ifndef OPENSSL_NO_IDEA +# ifdef __cplusplus +extern "C" { # endif typedef unsigned int IDEA_INT; @@ -72,10 +73,6 @@ typedef unsigned int IDEA_INT; # define IDEA_BLOCK 8 # define IDEA_KEY_LENGTH 16 -#ifdef __cplusplus -extern "C" { -#endif - typedef struct idea_key_st { IDEA_INT data[9][6]; } IDEA_KEY_SCHEDULE; @@ -95,8 +92,9 @@ void idea_ofb64_encrypt(const unsigned char *in, unsigned char *out, long length, IDEA_KEY_SCHEDULE *ks, unsigned char *iv, int *num); void idea_encrypt(unsigned long *in, IDEA_KEY_SCHEDULE *ks); -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif +# endif #endif diff --git a/include/openssl/lhash.h b/include/openssl/lhash.h index 899544ce04..2edd738a8b 100644 --- a/include/openssl/lhash.h +++ b/include/openssl/lhash.h @@ -63,10 +63,6 @@ # define HEADER_LHASH_H # include <openssl/e_os2.h> -# ifndef OPENSSL_NO_STDIO -# include <stdio.h> -# endif - # include <openssl/bio.h> #ifdef __cplusplus diff --git a/include/openssl/md2.h b/include/openssl/md2.h index 1dba7cf395..d77a4fac9c 100644 --- a/include/openssl/md2.h +++ b/include/openssl/md2.h @@ -59,20 +59,18 @@ # define HEADER_MD2_H # include <openssl/opensslconf.h> -# ifdef OPENSSL_NO_MD2 -# error MD2 is disabled. -# endif + +# ifndef OPENSSL_NO_MD2 # include <stddef.h> +# ifdef __cplusplus +extern "C" { +# endif typedef unsigned char MD2_INT; # define MD2_DIGEST_LENGTH 16 # define MD2_BLOCK 16 -#ifdef __cplusplus -extern "C" { -#endif - typedef struct MD2state_st { unsigned int num; unsigned char data[MD2_BLOCK]; @@ -85,8 +83,10 @@ int MD2_Init(MD2_CTX *c); int MD2_Update(MD2_CTX *c, const unsigned char *data, size_t len); int MD2_Final(unsigned char *md, MD2_CTX *c); unsigned char *MD2(const unsigned char *d, size_t n, unsigned char *md); -#ifdef __cplusplus + +# ifdef __cplusplus } -#endif +# endif +# endif #endif diff --git a/include/openssl/md4.h b/include/openssl/md4.h index c937625f93..b40a839128 100644 --- a/include/openssl/md4.h +++ b/include/openssl/md4.h @@ -58,15 +58,13 @@ #ifndef HEADER_MD4_H # define HEADER_MD4_H +# include <openssl/opensslconf.h> + +# ifndef OPENSSL_NO_MD4 # include <openssl/e_os2.h> # include <stddef.h> - -#ifdef __cplusplus +# ifdef __cplusplus extern "C" { -#endif - -# ifdef OPENSSL_NO_MD4 -# error MD4 is disabled. # endif /*- @@ -92,8 +90,10 @@ int MD4_Update(MD4_CTX *c, const void *data, size_t len); int MD4_Final(unsigned char *md, MD4_CTX *c); unsigned char *MD4(const unsigned char *d, size_t n, unsigned char *md); void MD4_Transform(MD4_CTX *c, const unsigned char *b); -#ifdef __cplusplus + +# ifdef __cplusplus } -#endif +# endif +# endif #endif diff --git a/include/openssl/md5.h b/include/openssl/md5.h index 02ea76a54e..5b34b463e9 100644 --- a/include/openssl/md5.h +++ b/include/openssl/md5.h @@ -58,15 +58,13 @@ #ifndef HEADER_MD5_H # define HEADER_MD5_H +# include <openssl/opensslconf.h> + +# ifndef OPENSSL_NO_MD5 # include <openssl/e_os2.h> # include <stddef.h> - -#ifdef __cplusplus +# ifdef __cplusplus extern "C" { -#endif - -# ifdef OPENSSL_NO_MD5 -# error MD5 is disabled. # endif /* @@ -92,8 +90,9 @@ int MD5_Update(MD5_CTX *c, const void *data, size_t len); int MD5_Final(unsigned char *md, MD5_CTX *c); unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md); void MD5_Transform(MD5_CTX *c, const unsigned char *b); -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif +# endif #endif diff --git a/include/openssl/mdc2.h b/include/openssl/mdc2.h index fc9784fa18..229b122719 100644 --- a/include/openssl/mdc2.h +++ b/include/openssl/mdc2.h @@ -58,14 +58,12 @@ #ifndef HEADER_MDC2_H # define HEADER_MDC2_H -# include <openssl/des.h> +# include <openssl/opensslconf.h> -#ifdef __cplusplus +#ifndef OPENSSL_NO_MDC2 +# include <openssl/des.h> +# ifdef __cplusplus extern "C" { -#endif - -# ifdef OPENSSL_NO_MDC2 -# error MDC2 is disabled. # endif # define MDC2_BLOCK 8 @@ -83,8 +81,9 @@ int MDC2_Update(MDC2_CTX *c, const unsigned char *data, size_t len); int MDC2_Final(unsigned char *md, MDC2_CTX *c); unsigned char *MDC2(const unsigned char *d, size_t n, unsigned char *md); -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif +# endif #endif diff --git a/include/openssl/rc2.h b/include/openssl/rc2.h index 0bf6ae31ec..50be22dcec 100644 --- a/include/openssl/rc2.h +++ b/include/openssl/rc2.h @@ -59,8 +59,10 @@ # define HEADER_RC2_H # include <openssl/opensslconf.h> -# ifdef OPENSSL_NO_RC2 -# error RC2 is disabled. + +# ifndef OPENSSL_NO_RC2 +# ifdef __cplusplus +extern "C" { # endif typedef unsigned int RC2_INT; @@ -71,10 +73,6 @@ typedef unsigned int RC2_INT; # define RC2_BLOCK 8 # define RC2_KEY_LENGTH 16 -#ifdef __cplusplus -extern "C" { -#endif - typedef struct rc2_key_st { RC2_INT data[64]; } RC2_KEY; @@ -93,8 +91,9 @@ void RC2_ofb64_encrypt(const unsigned char *in, unsigned char *out, long length, RC2_KEY *schedule, unsigned char *ivec, int *num); -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif +# endif #endif diff --git a/include/openssl/rc4.h b/include/openssl/rc4.h index c938fdb92a..a5fdbfb92c 100644 --- a/include/openssl/rc4.h +++ b/include/openssl/rc4.h @@ -58,13 +58,10 @@ #ifndef HEADER_RC4_H # define HEADER_RC4_H -# include <openssl/opensslconf.h>/* OPENSSL_NO_RC4, RC4_INT */ -# ifdef OPENSSL_NO_RC4 -# error RC4 is disabled. -# endif +# include <openssl/opensslconf.h> +# ifndef OPENSSL_NO_RC4 # include <stddef.h> - #ifdef __cplusplus extern "C" { #endif @@ -79,8 +76,9 @@ void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data); void RC4(RC4_KEY *key, size_t len, const unsigned char *indata, unsigned char *outdata); -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif +# endif #endif diff --git a/include/openssl/rc5.h b/include/openssl/rc5.h index 026a1147a9..c1ff358ad3 100644 --- a/include/openssl/rc5.h +++ b/include/openssl/rc5.h @@ -58,14 +58,11 @@ #ifndef HEADER_RC5_H # define HEADER_RC5_H -# include <openssl/opensslconf.h>/* OPENSSL_NO_RC5 */ +# include <openssl/opensslconf.h> -#ifdef __cplusplus +# ifndef OPENSSL_NO_RC5 +# ifdef __cplusplus extern "C" { -#endif - -# ifdef OPENSSL_NO_RC5 -# error RC5 is disabled. # endif # define RC5_ENCRYPT 1 @@ -106,8 +103,9 @@ void RC5_32_ofb64_encrypt(const unsigned char *in, unsigned char *out, long length, RC5_32_KEY *schedule, unsigned char *ivec, int *num); -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif +# endif #endif diff --git a/include/openssl/ripemd.h b/include/openssl/ripemd.h index 8a098f66a6..97e5df7694 100644 --- a/include/openssl/ripemd.h +++ b/include/openssl/ripemd.h @@ -58,15 +58,13 @@ #ifndef HEADER_RIPEMD_H # define HEADER_RIPEMD_H +# include <openssl/opensslconf.h> + +#ifndef OPENSSL_NO_RMD160 # include <openssl/e_os2.h> # include <stddef.h> - -#ifdef __cplusplus +# ifdef __cplusplus extern "C" { -#endif - -# ifdef OPENSSL_NO_RMD160 -# error RMD160 is disabled. # endif # define RIPEMD160_LONG unsigned int @@ -87,8 +85,11 @@ int RIPEMD160_Update(RIPEMD160_CTX *c, const void *data, size_t len); int RIPEMD160_Final(unsigned char *md, RIPEMD160_CTX *c); unsigned char *RIPEMD160(const unsigned char *d, size_t n, unsigned char *md); void RIPEMD160_Transform(RIPEMD160_CTX *c, const unsigned char *b); -#ifdef __cplusplus + +# ifdef __cplusplus } -#endif +# endif +# endif + #endif diff --git a/include/openssl/rsa.h b/include/openssl/rsa.h index adad0f144c..e7ae827715 100644 --- a/include/openssl/rsa.h +++ b/include/openssl/rsa.h @@ -59,26 +59,18 @@ # define HEADER_RSA_H # include <openssl/opensslconf.h> -# include <openssl/asn1.h> +# ifndef OPENSSL_NO_RSA +# include <openssl/asn1.h> # include <openssl/bio.h> # include <openssl/crypto.h> # include <openssl/ossl_typ.h> # if OPENSSL_API_COMPAT < 0x10100000L # include <openssl/bn.h> # endif - -# ifdef OPENSSL_NO_RSA -# error RSA is disabled. -# endif - -#ifdef __cplusplus +# ifdef __cplusplus extern "C" { -#endif - -/* Declared already in ossl_typ.h */ -/* typedef struct rsa_st RSA; */ -/* typedef struct rsa_meth_st RSA_METHOD; */ +# endif struct rsa_meth_st { const char *name; @@ -638,7 +630,9 @@ void ERR_load_RSA_strings(void); # define RSA_R_VALUE_MISSING 147 # define RSA_R_WRONG_SIGNATURE_LENGTH 119 -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif +# endif + #endif diff --git a/include/openssl/seed.h b/include/openssl/seed.h index 918f70c658..e643e762ad 100644 --- a/include/openssl/seed.h +++ b/include/openssl/seed.h @@ -81,12 +81,14 @@ # define HEADER_SEED_H # include <openssl/opensslconf.h> + +# ifndef OPENSSL_NO_SEED # include <openssl/e_os2.h> # include <openssl/crypto.h> -# ifdef OPENSSL_NO_SEED -# error SEED is disabled. -# endif +#ifdef __cplusplus +extern "C" { +#endif /* look whether we need 'long' to get 32 bits */ # ifdef AES_LONG @@ -102,11 +104,6 @@ # define SEED_BLOCK_SIZE 16 # define SEED_KEY_LENGTH 16 - -#ifdef __cplusplus -extern "C" { -#endif - typedef struct seed_key_st { # ifdef SEED_LONG unsigned long data[32]; @@ -138,8 +135,9 @@ void SEED_ofb128_encrypt(const unsigned char *in, unsigned char *out, size_t len, const SEED_KEY_SCHEDULE *ks, unsigned char ivec[SEED_BLOCK_SIZE], int *num); -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif +# endif -#endif /* HEADER_SEED_H */ +#endif diff --git a/include/openssl/srp.h b/include/openssl/srp.h index 4111d51827..37e7678863 100644 --- a/include/openssl/srp.h +++ b/include/openssl/srp.h @@ -56,26 +56,22 @@ * Hudson (tjh@cryptsoft.com). * */ -#ifndef __SRP_H__ -# define __SRP_H__ +#ifndef HEADER_SRP_H +# define HEADER_SRP_H #include <openssl/opensslconf.h> -# ifdef OPENSSL_NO_SRP -# error SRP is disabled. -# endif - +#ifndef OPENSSL_NO_SRP # include <stdio.h> # include <string.h> - -#ifdef __cplusplus -extern "C" { -#endif - # include <openssl/safestack.h> # include <openssl/bn.h> # include <openssl/crypto.h> +# ifdef __cplusplus +extern "C" { +# endif + typedef struct SRP_gN_cache_st { char *b64_bn; BIGNUM *bn; @@ -175,8 +171,9 @@ int SRP_Verify_B_mod_N(BIGNUM *B, BIGNUM *N); # define SRP_MINIMAL_N 1024 -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif +# endif #endif diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 92e0274aaa..3d440b68cb 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -144,10 +144,7 @@ # include <openssl/e_os2.h> # include <openssl/opensslconf.h> - -#ifndef OPENSSL_NO_COMP # include <openssl/comp.h> -#endif # include <openssl/bio.h> # if OPENSSL_API_COMPAT < 0x10100000L # include <openssl/x509.h> @@ -161,9 +158,7 @@ # include <openssl/safestack.h> # include <openssl/symhacks.h> -# ifndef OPENSSL_NO_CT -# include <openssl/ct.h> -# endif +# include <openssl/ct.h> #ifdef __cplusplus extern "C" { diff --git a/include/openssl/ssl3.h b/include/openssl/ssl3.h index ecbe24715d..6ff00bc970 100644 --- a/include/openssl/ssl3.h +++ b/include/openssl/ssl3.h @@ -116,9 +116,7 @@ #ifndef HEADER_SSL3_H # define HEADER_SSL3_H -# ifndef OPENSSL_NO_COMP -# include <openssl/comp.h> -# endif +# include <openssl/comp.h> # include <openssl/buffer.h> # include <openssl/evp.h> # include <openssl/ssl.h> diff --git a/include/openssl/ts.h b/include/openssl/ts.h index ca3969f8c5..2e1514ef5e 100644 --- a/include/openssl/ts.h +++ b/include/openssl/ts.h @@ -60,6 +60,7 @@ # define HEADER_TS_H # include <openssl/opensslconf.h> + # ifndef OPENSSL_NO_TS # include <openssl/symhacks.h> # include <openssl/buffer.h> @@ -68,22 +69,12 @@ # include <openssl/stack.h> # include <openssl/asn1.h> # include <openssl/safestack.h> - -# ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -# endif - -# ifndef OPENSSL_NO_DSA -# include <openssl/dsa.h> -# endif - -# ifndef OPENSSL_NO_DH -# include <openssl/dh.h> -# endif - -#ifdef __cplusplus +# include <openssl/rsa.h> +# include <openssl/dsa.h> +# include <openssl/dh.h> +# ifdef __cplusplus extern "C" { -#endif +# endif # ifdef WIN32 /* Under Win32 this is defined in wincrypt.h */ @@ -697,8 +688,9 @@ void ERR_load_TS_strings(void); # define TS_R_VAR_LOOKUP_FAILURE 136 # define TS_R_WRONG_CONTENT_TYPE 114 -#ifdef __cplusplus +# ifdef __cplusplus } -#endif -#endif +# endif +# endif + #endif diff --git a/include/openssl/whrlpool.h b/include/openssl/whrlpool.h index 31fc2ff132..bc460351d0 100644 --- a/include/openssl/whrlpool.h +++ b/include/openssl/whrlpool.h @@ -1,12 +1,14 @@ #ifndef HEADER_WHRLPOOL_H # define HEADER_WHRLPOOL_H +#include <openssl/opensslconf.h> + +# ifndef OPENSSL_NO_WHIRLPOOL # include <openssl/e_os2.h> # include <stddef.h> - -#ifdef __cplusplus +# ifdef __cplusplus extern "C" { -#endif +# endif # define WHIRLPOOL_DIGEST_LENGTH (512/8) # define WHIRLPOOL_BBLOCK 512 @@ -23,16 +25,15 @@ typedef struct { size_t bitlen[WHIRLPOOL_COUNTER / sizeof(size_t)]; } WHIRLPOOL_CTX; -# ifndef OPENSSL_NO_WHIRLPOOL int WHIRLPOOL_Init(WHIRLPOOL_CTX *c); int WHIRLPOOL_Update(WHIRLPOOL_CTX *c, const void *inp, size_t bytes); void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c, const void *inp, size_t bits); int WHIRLPOOL_Final(unsigned char *md, WHIRLPOOL_CTX *c); unsigned char *WHIRLPOOL(const void *inp, size_t bytes, unsigned char *md); -# endif -#ifdef __cplusplus +# ifdef __cplusplus } -#endif +# endif +# endif #endif diff --git a/include/openssl/x509.h b/include/openssl/x509.h index 5c138ca971..d21460a33e 100644 --- a/include/openssl/x509.h +++ b/include/openssl/x509.h @@ -72,21 +72,12 @@ # include <openssl/stack.h> # include <openssl/asn1.h> # include <openssl/safestack.h> - -# ifndef OPENSSL_NO_EC -# include <openssl/ec.h> -# endif +# include <openssl/ec.h> # if OPENSSL_API_COMPAT < 0x10100000L -# ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -# endif -# ifndef OPENSSL_NO_DSA -# include <openssl/dsa.h> -# endif -# ifndef OPENSSL_NO_DH -# include <openssl/dh.h> -# endif +# include <openssl/rsa.h> +# include <openssl/dsa.h> +# include <openssl/dh.h> # endif # include <openssl/sha.h> diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 49180cd34a..e6cf309bb5 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -151,9 +151,7 @@ #include <openssl/objects.h> #include "ssl_locl.h" #include <openssl/md5.h> -#ifndef OPENSSL_NO_DH -# include <openssl/dh.h> -#endif +#include <openssl/dh.h> #include <openssl/rand.h> #define SSL3_NUM_CIPHERS OSSL_NELEM(ssl3_ciphers) diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index e17cffc814..4081ebe4ff 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -125,9 +125,7 @@ #include <openssl/bio.h> #include <openssl/pem.h> #include <openssl/x509v3.h> -#ifndef OPENSSL_NO_DH -# include <openssl/dh.h> -#endif +#include <openssl/dh.h> #include <openssl/bn.h> #include "internal/threads.h" #include "ssl_locl.h" diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index c62b1935b6..938baaca43 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -141,12 +141,8 @@ #include <stdio.h> #include <openssl/objects.h> -#ifndef OPENSSL_NO_COMP -# include <openssl/comp.h> -#endif -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/comp.h> +#include <openssl/engine.h> #include "internal/threads.h" #include "ssl_locl.h" diff --git a/ssl/ssl_conf.c b/ssl/ssl_conf.c index 157bf8ba0d..77fc4373d5 100644 --- a/ssl/ssl_conf.c +++ b/ssl/ssl_conf.c @@ -59,9 +59,7 @@ #include "ssl_locl.h" #include <openssl/conf.h> #include <openssl/objects.h> -#ifndef OPENSSL_NO_DH -# include <openssl/dh.h> -#endif +#include <openssl/dh.h> /* * structure holding name tables. This is used for pemitted elements in lists diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 87e3dfad67..3385bc1508 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -152,16 +152,10 @@ #include <openssl/x509v3.h> #include <openssl/rand.h> #include <openssl/ocsp.h> -#ifndef OPENSSL_NO_DH -# include <openssl/dh.h> -#endif -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/dh.h> +#include <openssl/engine.h> #include <openssl/async.h> -#ifndef OPENSSL_NO_CT -# include <openssl/ct.h> -#endif +#include <openssl/ct.h> const char SSL_version_str[] = OPENSSL_VERSION_TEXT; diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index fa0254c809..4abe7b425f 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -149,24 +149,16 @@ # include "e_os.h" # include <openssl/buffer.h> -# ifndef OPENSSL_NO_COMP -# include <openssl/comp.h> -# endif +# include <openssl/comp.h> # include <openssl/bio.h> # include <openssl/stack.h> -# ifndef OPENSSL_NO_RSA -# include <openssl/rsa.h> -# endif -# ifndef OPENSSL_NO_DSA -# include <openssl/dsa.h> -# endif +# include <openssl/rsa.h> +# include <openssl/dsa.h> # include <openssl/err.h> # include <openssl/ssl.h> # include <openssl/async.h> # include <openssl/symhacks.h> -# ifndef OPENSSL_NO_CT -# include <openssl/ct.h> -# endif +# include <openssl/ct.h> #include "record/record.h" #include "statem/statem.h" #include "packet_locl.h" diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index ebeeba011c..3f030a76eb 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -137,9 +137,7 @@ #include <stdio.h> #include <openssl/lhash.h> #include <openssl/rand.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> #include "ssl_locl.h" static void SSL_SESSION_list_remove(SSL_CTX *ctx, SSL_SESSION *s); diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c index 26c4d10785..bafb90a9dc 100644 --- a/ssl/statem/statem_clnt.c +++ b/ssl/statem/statem_clnt.c @@ -155,13 +155,9 @@ #include <openssl/objects.h> #include <openssl/evp.h> #include <openssl/md5.h> -#ifndef OPENSSL_NO_DH -# include <openssl/dh.h> -#endif +#include <openssl/dh.h> #include <openssl/bn.h> -#ifndef OPENSSL_NO_ENGINE -# include <openssl/engine.h> -#endif +#include <openssl/engine.h> static ossl_inline int cert_req_allowed(SSL *s); static int key_exchange_expected(SSL *s); diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c index 526b0c5cd4..2f2f457074 100644 --- a/ssl/statem/statem_srvr.c +++ b/ssl/statem/statem_srvr.c @@ -158,9 +158,7 @@ #include <openssl/evp.h> #include <openssl/hmac.h> #include <openssl/x509.h> -#ifndef OPENSSL_NO_DH -# include <openssl/dh.h> -#endif +#include <openssl/dh.h> #include <openssl/bn.h> #include <openssl/md5.h> diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index f2650b0b77..6e56441d0f 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -136,9 +136,7 @@ #include <stdio.h> #include "ssl_locl.h" -#ifndef OPENSSL_NO_COMP -# include <openssl/comp.h> -#endif +#include <openssl/comp.h> #include <openssl/evp.h> #include <openssl/kdf.h> #include <openssl/rand.h> diff --git a/ssl/t1_ext.c b/ssl/t1_ext.c index eb7d8a74b2..7940cfc2bf 100644 --- a/ssl/t1_ext.c +++ b/ssl/t1_ext.c @@ -54,9 +54,7 @@ /* Custom extension utility functions */ -#ifndef OPENSSL_NO_CT -# include <openssl/ct.h> -#endif +#include <openssl/ct.h> #include "ssl_locl.h" diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index fc7ebe41ca..26c02a0e44 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -115,14 +115,10 @@ #include <openssl/hmac.h> #include <openssl/ocsp.h> #include <openssl/rand.h> -#ifndef OPENSSL_NO_DH -# include <openssl/dh.h> -# include <openssl/bn.h> -#endif +#include <openssl/dh.h> +#include <openssl/bn.h> #include "ssl_locl.h" -#ifndef OPENSSL_NO_CT -# include <openssl/ct.h> -#endif +#include <openssl/ct.h> static int tls_decrypt_ticket(SSL *s, const unsigned char *tick, int ticklen, const unsigned char *sess_id, int sesslen, diff --git a/util/libcrypto.num b/util/libcrypto.num index fff2f84449..2e2e6571cb 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -30,7 +30,7 @@ X509V3_add_value_bool 28 1_1_0 EXIST::FUNCTION: GENERAL_NAME_get0_otherName 29 1_1_0 EXIST::FUNCTION: ASN1_INTEGER_get_uint64 30 1_1_0 EXIST::FUNCTION: EVP_DigestInit_ex 31 1_1_0 EXIST::FUNCTION: -CTLOG_new 32 1_1_0 EXIST::FUNCTION: +CTLOG_new 32 1_1_0 EXIST::FUNCTION:CT UI_get_result_minsize 33 1_1_0 EXIST::FUNCTION: EVP_PBE_alg_add_type 34 1_1_0 EXIST::FUNCTION: EVP_cast5_ofb 35 1_1_0 EXIST::FUNCTION:CAST @@ -97,7 +97,7 @@ IPAddressRange_free 94 1_1_0 EXIST::FUNCTION:RFC3779 CMS_ContentInfo_free 95 1_1_0 EXIST::FUNCTION:CMS BIO_accept 96 1_1_0 EXIST::FUNCTION:DEPRECATEDIN_1_1_0 X509_VERIFY_PARAM_set1_policies 97 1_1_0 EXIST::FUNCTION: -SCT_set0_extensions 98 1_1_0 EXIST::FUNCTION: +SCT_set0_extensions 98 1_1_0 EXIST::FUNCTION:CT PKCS5_pbe2_set_scrypt 99 1_1_0 EXIST::FUNCTION:SCRYPT X509_find_by_subject 100 1_1_0 EXIST::FUNCTION: DSAparams_print 101 1_1_0 EXIST::FUNCTION:DSA @@ -164,7 +164,7 @@ v3_addr_canonize 161 1_1_0 EXIST::FUNCTION:RFC3779 ASN1_item_ex_i2d 162 1_1_0 EXIST::FUNCTION: ENGINE_set_digests 163 1_1_0 EXIST::FUNCTION:ENGINE PEM_ASN1_read_bio 164 1_1_0 EXIST::FUNCTION: -CT_POLICY_EVAL_CTX_free 165 1_1_0 EXIST::FUNCTION: +CT_POLICY_EVAL_CTX_free 165 1_1_0 EXIST::FUNCTION:CT CMS_RecipientInfo_kari_get0_ctx 166 1_1_0 EXIST::FUNCTION:CMS PKCS7_set_attributes 167 1_1_0 EXIST::FUNCTION: d2i_POLICYQUALINFO 168 1_1_0 EXIST::FUNCTION: @@ -184,7 +184,7 @@ i2d_DISPLAYTEXT 181 1_1_0 EXIST::FUNCTION: OCSP_response_status 182 1_1_0 EXIST::FUNCTION: i2d_ASN1_PRINTABLESTRING 183 1_1_0 EXIST::FUNCTION: X509_VERIFY_PARAM_set_hostflags 184 1_1_0 EXIST::FUNCTION: -SCT_get0_log_id 185 1_1_0 EXIST::FUNCTION: +SCT_get0_log_id 185 1_1_0 EXIST::FUNCTION:CT ASN1_IA5STRING_it 186 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: ASN1_IA5STRING_it 186 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: PEM_write_bio_ECPrivateKey 187 1_1_0 EXIST::FUNCTION:EC @@ -206,7 +206,7 @@ EVP_seed_cfb128 202 1_1_0 EXIST::FUNCTION:SEED BASIC_CONSTRAINTS_free 203 1_1_0 EXIST::FUNCTION: EVP_CIPHER_flags 204 1_1_0 EXIST::FUNCTION: PEM_write_bio_ECPKParameters 205 1_1_0 EXIST::FUNCTION:EC -SCT_set_version 206 1_1_0 EXIST::FUNCTION: +SCT_set_version 206 1_1_0 EXIST::FUNCTION:CT CMS_add1_ReceiptRequest 207 1_1_0 EXIST::FUNCTION:CMS d2i_CRL_DIST_POINTS 208 1_1_0 EXIST::FUNCTION: X509_CRL_INFO_free 209 1_1_0 EXIST::FUNCTION: @@ -238,7 +238,7 @@ EVP_PKEY_meth_set_decrypt 233 1_1_0 EXIST::FUNCTION: EVP_rc2_ecb 234 1_1_0 EXIST::FUNCTION:RC2 i2b_PublicKey_bio 235 1_1_0 EXIST::FUNCTION: d2i_ASN1_SET_ANY 236 1_1_0 EXIST::FUNCTION: -CT_verify_no_bad_scts 237 1_1_0 EXIST::FUNCTION: +CT_verify_no_bad_scts 237 1_1_0 EXIST::FUNCTION:CT ASN1_item_i2d 238 1_1_0 EXIST::FUNCTION: OCSP_copy_nonce 239 1_1_0 EXIST::FUNCTION: OBJ_txt2nid 240 1_1_0 EXIST::FUNCTION: @@ -297,7 +297,7 @@ CRYPTO_gcm128_setiv 291 1_1_0 EXIST::FUNCTION: ASN1_PCTX_set_oid_flags 292 1_1_0 EXIST::FUNCTION: d2i_ASN1_INTEGER 293 1_1_0 EXIST::FUNCTION: i2d_PKCS7_ENCRYPT 294 1_1_0 EXIST::FUNCTION: -CT_POLICY_EVAL_CTX_set0_issuer 295 1_1_0 EXIST::FUNCTION: +CT_POLICY_EVAL_CTX_set0_issuer 295 1_1_0 EXIST::FUNCTION:CT X509_NAME_ENTRY_set 296 1_1_0 EXIST::FUNCTION: PKCS8_set0_pbe 297 1_1_0 EXIST::FUNCTION: PEM_write_bio_DSA_PUBKEY 298 1_1_0 EXIST::FUNCTION:DSA @@ -350,7 +350,7 @@ DIST_POINT_it 344 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION: DIST_POINT_it 344 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: PEM_read_X509_CRL 345 1_1_0 EXIST::FUNCTION: sk_sort 346 1_1_0 EXIST::FUNCTION: -CTLOG_STORE_load_file 347 1_1_0 EXIST::FUNCTION: +CTLOG_STORE_load_file 347 1_1_0 EXIST::FUNCTION:CT ASN1_SEQUENCE_it 348 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: ASN1_SEQUENCE_it 348 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: TS_RESP_CTX_get_tst_info 349 1_1_0 EXIST::FUNCTION:TS @@ -466,7 +466,7 @@ DH_new_method 457 1_1_0 EXIST::FUNCTION:DH BF_ecb_encrypt 458 1_1_0 EXIST::FUNCTION:BF PEM_write_bio_DHparams 459 1_1_0 EXIST::FUNCTION:DH EVP_DigestFinal 460 1_1_0 EXIST::FUNCTION: -CT_POLICY_EVAL_CTX_set0_log_store 461 1_1_0 EXIST::FUNCTION: +CT_POLICY_EVAL_CTX_set0_log_store 461 1_1_0 EXIST::FUNCTION:CT v3_asid_add_id_or_range 462 1_1_0 EXIST::FUNCTION:RFC3779 X509_NAME_ENTRY_create_by_NID 463 1_1_0 EXIST::FUNCTION: EC_KEY_METHOD_get_init 464 1_1_0 EXIST::FUNCTION:EC @@ -478,7 +478,7 @@ DH_new 469 1_1_0 EXIST::FUNCTION:DH OCSP_RESPID_free 470 1_1_0 EXIST::FUNCTION: PKCS5_pbe2_set 471 1_1_0 EXIST::FUNCTION: CRYPTO_THREADID_get_callback 472 1_1_0 NOEXIST::FUNCTION: -SCT_set_signature_nid 473 1_1_0 EXIST::FUNCTION: +SCT_set_signature_nid 473 1_1_0 EXIST::FUNCTION:CT i2d_RSA_PUBKEY_fp 474 1_1_0 EXIST::FUNCTION:RSA,STDIO PKCS12_BAGS_it 475 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: PKCS12_BAGS_it 475 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: @@ -575,14 +575,14 @@ EC_GROUP_get_pentanomial_basis 562 1_1_0 EXIST::FUNCTION:EC,EC2M X509_CINF_free 563 1_1_0 EXIST::FUNCTION: X509_EXTENSION_free 564 1_1_0 EXIST::FUNCTION: EVP_DigestSignInit 565 1_1_0 EXIST::FUNCTION: -CT_POLICY_EVAL_CTX_get0_issuer 566 1_1_0 EXIST::FUNCTION: +CT_POLICY_EVAL_CTX_get0_issuer 566 1_1_0 EXIST::FUNCTION:CT TLS_FEATURE_new 567 1_1_0 EXIST::FUNCTION: RSA_get_default_method 568 1_1_0 EXIST::FUNCTION:RSA CRYPTO_cts128_encrypt_block 569 1_1_0 EXIST::FUNCTION: ASN1_digest 570 1_1_0 EXIST::FUNCTION: ERR_load_X509V3_strings 571 1_1_0 EXIST::FUNCTION: EVP_PKEY_meth_get_cleanup 572 1_1_0 EXIST::FUNCTION: -SCT_verify 573 1_1_0 EXIST::FUNCTION: +SCT_verify 573 1_1_0 EXIST::FUNCTION:CT d2i_X509 574 1_1_0 EXIST::FUNCTION: a2i_ASN1_STRING 575 1_1_0 EXIST::FUNCTION: EC_GROUP_get_mont_data 576 1_1_0 EXIST::FUNCTION:EC @@ -609,7 +609,7 @@ RAND_query_egd_bytes 596 1_1_0 EXIST::FUNCTION:EGD i2d_ASN1_PRINTABLE 597 1_1_0 EXIST::FUNCTION: ENGINE_cmd_is_executable 598 1_1_0 EXIST::FUNCTION:ENGINE BIO_puts 599 1_1_0 EXIST::FUNCTION: -SCT_verify_v1 600 1_1_0 EXIST::FUNCTION: +SCT_verify_v1 600 1_1_0 EXIST::FUNCTION:CT RSAPublicKey_it 601 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RSA RSAPublicKey_it 601 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:RSA ISSUING_DIST_POINT_new 602 1_1_0 EXIST::FUNCTION: @@ -703,7 +703,7 @@ CRYPTO_ocb128_copy_ctx 684 1_1_0 EXIST::FUNCTION:OCB TS_REQ_get_ext_d2i 685 1_1_0 EXIST::FUNCTION:TS AES_ige_encrypt 686 1_1_0 EXIST::FUNCTION:AES d2i_SXNET 687 1_1_0 EXIST::FUNCTION: -CTLOG_get0_log_id 688 1_1_0 EXIST::FUNCTION: +CTLOG_get0_log_id 688 1_1_0 EXIST::FUNCTION:CT CMS_RecipientInfo_ktri_get0_signer_id 689 1_1_0 EXIST::FUNCTION:CMS OCSP_REQUEST_add1_ext_i2d 690 1_1_0 EXIST::FUNCTION: EVP_PBE_CipherInit 691 1_1_0 EXIST::FUNCTION: @@ -716,7 +716,7 @@ OPENSSL_isservice 697 1_1_0 EXIST::FUNCTION: DH_compute_key 698 1_1_0 EXIST::FUNCTION:DH TS_RESP_CTX_set_signer_key 699 1_1_0 EXIST::FUNCTION:TS i2d_DSAPrivateKey_bio 700 1_1_0 EXIST::FUNCTION:DSA -CT_verify_at_least_one_good_sct 701 1_1_0 EXIST::FUNCTION: +CT_verify_at_least_one_good_sct 701 1_1_0 EXIST::FUNCTION:CT ASN1_item_d2i 702 1_1_0 EXIST::FUNCTION: BIO_int_ctrl 703 1_1_0 EXIST::FUNCTION: CMS_ReceiptRequest_it 704 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMS @@ -771,7 +771,7 @@ BN_nist_mod_521 750 1_1_0 EXIST::FUNCTION: CRYPTO_THREAD_get_local 751 1_1_0 EXIST::FUNCTION: PKCS7_to_TS_TST_INFO 752 1_1_0 EXIST::FUNCTION:TS X509_STORE_CTX_new 753 1_1_0 EXIST::FUNCTION: -CTLOG_STORE_new 754 1_1_0 EXIST::FUNCTION: +CTLOG_STORE_new 754 1_1_0 EXIST::FUNCTION:CT EVP_CIPHER_meth_set_cleanup 755 1_1_0 EXIST::FUNCTION: d2i_PKCS12_SAFEBAG 756 1_1_0 EXIST::FUNCTION: EVP_MD_pkey_type 757 1_1_0 EXIST::FUNCTION: @@ -941,7 +941,7 @@ UI_set_result 915 1_1_0 EXIST::FUNCTION: EVP_EncodeUpdate 916 1_1_0 EXIST::FUNCTION: PEM_write_bio_X509_CRL 917 1_1_0 EXIST::FUNCTION: BN_cmp 918 1_1_0 EXIST::FUNCTION: -CT_POLICY_EVAL_CTX_get0_log_store 919 1_1_0 EXIST::FUNCTION: +CT_POLICY_EVAL_CTX_get0_log_store 919 1_1_0 EXIST::FUNCTION:CT CONF_set_default_method 920 1_1_0 EXIST::FUNCTION: ASN1_PCTX_get_nm_flags 921 1_1_0 EXIST::FUNCTION: X509_add1_ext_i2d 922 1_1_0 EXIST::FUNCTION: @@ -951,7 +951,7 @@ PKCS1_MGF1 925 1_1_0 EXIST::FUNCTION:RSA BIO_vsnprintf 926 1_1_0 EXIST::FUNCTION: X509_STORE_CTX_get0_current_issuer 927 1_1_0 EXIST::FUNCTION: CRYPTO_secure_malloc_initialized 928 1_1_0 EXIST::FUNCTION: -o2i_SCT_LIST 929 1_1_0 EXIST::FUNCTION: +o2i_SCT_LIST 929 1_1_0 EXIST::FUNCTION:CT ASN1_PCTX_get_cert_flags 930 1_1_0 EXIST::FUNCTION: X509at_add1_attr_by_NID 931 1_1_0 EXIST::FUNCTION: DHparams_dup 932 1_1_0 EXIST::FUNCTION:DH @@ -1197,7 +1197,7 @@ CMS_EncryptedData_encrypt 1160 1_1_0 EXIST::FUNCTION:CMS ASN1_tag2str 1161 1_1_0 EXIST::FUNCTION: BN_zero_ex 1162 1_1_0 EXIST::FUNCTION: X509_NAME_dup 1163 1_1_0 EXIST::FUNCTION: -SCT_LIST_print 1164 1_1_0 EXIST::FUNCTION: +SCT_LIST_print 1164 1_1_0 EXIST::FUNCTION:CT NOTICEREF_it 1165 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: NOTICEREF_it 1165 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: CMS_add0_crl 1166 1_1_0 EXIST::FUNCTION:CMS @@ -1317,7 +1317,7 @@ CONF_dump_fp 1278 1_1_0 EXIST::FUNCTION:STDIO d2i_DIST_POINT_NAME 1279 1_1_0 EXIST::FUNCTION: ASN1_INTEGER_set_int64 1280 1_1_0 EXIST::FUNCTION: ASN1_TIME_free 1281 1_1_0 EXIST::FUNCTION: -i2o_SCT_LIST 1282 1_1_0 EXIST::FUNCTION: +i2o_SCT_LIST 1282 1_1_0 EXIST::FUNCTION:CT AES_encrypt 1283 1_1_0 EXIST::FUNCTION:AES MD5_Init 1284 1_1_0 EXIST::FUNCTION:MD5 UI_add_error_string 1285 1_1_0 EXIST::FUNCTION: @@ -1368,7 +1368,7 @@ CRYPTO_ocb128_finish 1326 1_1_0 EXIST::FUNCTION:OCB EVP_CIPHER_do_all 1327 1_1_0 EXIST::FUNCTION: POLICY_MAPPINGS_it 1328 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: POLICY_MAPPINGS_it 1328 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: -SCT_set0_log_id 1329 1_1_0 EXIST::FUNCTION: +SCT_set0_log_id 1329 1_1_0 EXIST::FUNCTION:CT CRYPTO_cfb128_encrypt 1330 1_1_0 EXIST::FUNCTION: RSA_padding_add_PKCS1_type_2 1331 1_1_0 EXIST::FUNCTION:RSA TS_CONF_set_signer_cert 1332 1_1_0 EXIST::FUNCTION:TS @@ -1419,9 +1419,9 @@ EVP_PKEY_asn1_free 1375 1_1_0 EXIST::FUNCTION: ENGINE_unregister_DH 1376 1_1_0 EXIST::FUNCTION:ENGINE PROXY_CERT_INFO_EXTENSION_it 1377 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: PROXY_CERT_INFO_EXTENSION_it 1377 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: -CT_POLICY_EVAL_CTX_set0_cert 1378 1_1_0 EXIST::FUNCTION: +CT_POLICY_EVAL_CTX_set0_cert 1378 1_1_0 EXIST::FUNCTION:CT X509_NAME_hash 1379 1_1_0 EXIST::FUNCTION: -SCT_set_timestamp 1380 1_1_0 EXIST::FUNCTION: +SCT_set_timestamp 1380 1_1_0 EXIST::FUNCTION:CT UI_new 1381 1_1_0 EXIST::FUNCTION: TS_REQ_get_msg_imprint 1382 1_1_0 EXIST::FUNCTION:TS i2d_PKCS12_BAGS 1383 1_1_0 EXIST::FUNCTION: @@ -1488,7 +1488,7 @@ HMAC_size 1441 1_1_0 EXIST::FUNCTION: EVP_PKEY_get0_DH 1442 1_1_0 EXIST::FUNCTION:DH d2i_OCSP_CRLID 1443 1_1_0 EXIST::FUNCTION: EVP_CIPHER_CTX_set_padding 1444 1_1_0 EXIST::FUNCTION: -CTLOG_new_from_base64 1445 1_1_0 EXIST::FUNCTION: +CTLOG_new_from_base64 1445 1_1_0 EXIST::FUNCTION:CT AES_bi_ige_encrypt 1446 1_1_0 EXIST::FUNCTION:AES ERR_pop_to_mark 1447 1_1_0 EXIST::FUNCTION: DSO_METHOD_win32 1448 1_1_0 EXIST::FUNCTION: @@ -1536,7 +1536,7 @@ SXNET_it 1488 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION: BIO_indent 1489 1_1_0 EXIST::FUNCTION: i2d_X509_fp 1490 1_1_0 EXIST::FUNCTION:STDIO d2i_ASN1_TYPE 1491 1_1_0 EXIST::FUNCTION: -CTLOG_STORE_free 1492 1_1_0 EXIST::FUNCTION: +CTLOG_STORE_free 1492 1_1_0 EXIST::FUNCTION:CT ENGINE_get_pkey_meths 1493 1_1_0 EXIST::FUNCTION:ENGINE i2d_TS_REQ_bio 1494 1_1_0 EXIST::FUNCTION:TS EVP_PKEY_CTX_get_operation 1495 1_1_0 EXIST::FUNCTION: @@ -1559,7 +1559,7 @@ EVP_PKEY_asn1_find 1511 1_1_0 EXIST::FUNCTION: d2i_ASN1_GENERALIZEDTIME 1512 1_1_0 EXIST::FUNCTION: OPENSSL_cleanup 1513 1_1_0 EXIST::FUNCTION: X509_ATTRIBUTE_create 1514 1_1_0 EXIST::FUNCTION: -SCT_get_source 1515 1_1_0 EXIST::FUNCTION: +SCT_get_source 1515 1_1_0 EXIST::FUNCTION:CT EVP_PKEY_verify_init 1516 1_1_0 EXIST::FUNCTION: ASN1_TIME_set_string 1517 1_1_0 EXIST::FUNCTION: BIO_free 1518 1_1_0 EXIST::FUNCTION: @@ -1637,7 +1637,7 @@ PKCS7_add0_attrib_signing_time 1589 1_1_0 EXIST::FUNCTION: X509_STORE_set_flags 1590 1_1_0 EXIST::FUNCTION: UI_get0_output_string 1591 1_1_0 EXIST::FUNCTION: ERR_get_error_line_data 1592 1_1_0 EXIST::FUNCTION: -CTLOG_get0_name 1593 1_1_0 EXIST::FUNCTION: +CTLOG_get0_name 1593 1_1_0 EXIST::FUNCTION:CT ASN1_TBOOLEAN_it 1594 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: ASN1_TBOOLEAN_it 1594 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: RC2_set_key 1595 1_1_0 EXIST::FUNCTION:RC2 @@ -1653,7 +1653,7 @@ TS_RESP_CTX_get_request 1604 1_1_0 EXIST::FUNCTION:TS EVP_cast5_cbc 1605 1_1_0 EXIST::FUNCTION:CAST PEM_read_bio_X509_AUX 1606 1_1_0 EXIST::FUNCTION: TS_ext_print_bio 1607 1_1_0 EXIST::FUNCTION:TS -SCT_set1_log_id 1608 1_1_0 EXIST::FUNCTION: +SCT_set1_log_id 1608 1_1_0 EXIST::FUNCTION:CT X509_get0_pubkey_bitstr 1609 1_1_0 EXIST::FUNCTION: ENGINE_register_all_RAND 1610 1_1_0 EXIST::FUNCTION:ENGINE BN_BLINDING_thread_id 1611 1_1_0 NOEXIST::FUNCTION: @@ -1854,7 +1854,7 @@ X509_ALGOR_get0 1798 1_1_0 EXIST::FUNCTION: d2i_ACCESS_DESCRIPTION 1799 1_1_0 EXIST::FUNCTION: OCSP_SINGLERESP_get_ext_by_NID 1800 1_1_0 EXIST::FUNCTION: a2i_IPADDRESS_NC 1801 1_1_0 EXIST::FUNCTION: -CTLOG_STORE_load_default_file 1802 1_1_0 EXIST::FUNCTION: +CTLOG_STORE_load_default_file 1802 1_1_0 EXIST::FUNCTION:CT PKCS12_SAFEBAG_create_pkcs8_encrypt 1803 1_1_0 EXIST::FUNCTION: RAND_screen 1804 1_1_0 EXIST:WIN32:FUNCTION: CONF_get_string 1805 1_1_0 EXIST::FUNCTION: @@ -1935,7 +1935,7 @@ d2i_AUTHORITY_INFO_ACCESS 1874 1_1_0 EXIST::FUNCTION: PEM_read_RSAPrivateKey 1875 1_1_0 EXIST::FUNCTION:RSA BIO_closesocket 1876 1_1_0 EXIST::FUNCTION: RSA_verify_ASN1_OCTET_STRING 1877 1_1_0 EXIST::FUNCTION:RSA -SCT_set_log_entry_type 1878 1_1_0 EXIST::FUNCTION: +SCT_set_log_entry_type 1878 1_1_0 EXIST::FUNCTION:CT BN_new 1879 1_1_0 EXIST::FUNCTION: X509_OBJECT_retrieve_by_subject 1880 1_1_0 EXIST::FUNCTION: MD5_Final 1881 1_1_0 EXIST::FUNCTION:MD5 @@ -1963,7 +1963,7 @@ AES_cfb1_encrypt 1902 1_1_0 EXIST::FUNCTION:AES X509v3_get_ext 1903 1_1_0 EXIST::FUNCTION: BN_BLINDING_set_thread_id 1904 1_1_0 NOEXIST::FUNCTION: CRYPTO_gcm128_encrypt_ctr32 1905 1_1_0 EXIST::FUNCTION: -SCT_set1_signature 1906 1_1_0 EXIST::FUNCTION: +SCT_set1_signature 1906 1_1_0 EXIST::FUNCTION:CT CONF_imodule_get_module 1907 1_1_0 EXIST::FUNCTION: NAME_CONSTRAINTS_new 1908 1_1_0 EXIST::FUNCTION: BN_usub 1909 1_1_0 EXIST::FUNCTION: @@ -2082,7 +2082,7 @@ PKCS7_dup 2018 1_1_0 EXIST::FUNCTION: i2d_TS_REQ_fp 2019 1_1_0 EXIST::FUNCTION:STDIO,TS i2d_OTHERNAME 2020 1_1_0 EXIST::FUNCTION: EC_KEY_get0_private_key 2021 1_1_0 EXIST::FUNCTION:EC -SCT_get0_extensions 2022 1_1_0 EXIST::FUNCTION: +SCT_get0_extensions 2022 1_1_0 EXIST::FUNCTION:CT lh_node_stats_bio 2023 1_1_0 EXIST::FUNCTION: i2d_DIRECTORYSTRING 2024 1_1_0 EXIST::FUNCTION: BN_X931_derive_prime_ex 2025 1_1_0 EXIST::FUNCTION: @@ -2103,7 +2103,7 @@ CMS_RecipientInfo_set0_pkey 2038 1_1_0 EXIST::FUNCTION:CMS X509_STORE_CTX_set_default 2039 1_1_0 EXIST::FUNCTION: AES_wrap_key 2040 1_1_0 EXIST::FUNCTION:AES EVP_md_null 2041 1_1_0 EXIST::FUNCTION: -i2d_SCT_LIST 2042 1_1_0 EXIST::FUNCTION: +i2d_SCT_LIST 2042 1_1_0 EXIST::FUNCTION:CT PKCS7_get_issuer_and_serial 2043 1_1_0 EXIST::FUNCTION: PKCS7_SIGN_ENVELOPE_it 2044 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: PKCS7_SIGN_ENVELOPE_it 2044 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: @@ -2129,7 +2129,7 @@ OBJ_length 2062 1_1_0 EXIST::FUNCTION: BN_GENCB_get_arg 2063 1_1_0 EXIST::FUNCTION: EVP_MD_CTX_clear_flags 2064 1_1_0 EXIST::FUNCTION: EVP_PKEY_meth_get_verifyctx 2065 1_1_0 EXIST::FUNCTION: -CT_POLICY_EVAL_CTX_get0_cert 2066 1_1_0 EXIST::FUNCTION: +CT_POLICY_EVAL_CTX_get0_cert 2066 1_1_0 EXIST::FUNCTION:CT PEM_write_DHparams 2067 1_1_0 EXIST::FUNCTION:DH DH_set_ex_data 2068 1_1_0 EXIST::FUNCTION:DH OCSP_SIGNATURE_free 2069 1_1_0 EXIST::FUNCTION: @@ -2139,7 +2139,7 @@ i2d_ASN1_ENUMERATED 2072 1_1_0 EXIST::FUNCTION: PEM_read_DSAparams 2073 1_1_0 EXIST::FUNCTION:DSA TS_TST_INFO_set_ordering 2074 1_1_0 EXIST::FUNCTION:TS MDC2_Init 2075 1_1_0 EXIST::FUNCTION:MDC2 -i2o_SCT 2076 1_1_0 EXIST::FUNCTION: +i2o_SCT 2076 1_1_0 EXIST::FUNCTION:CT d2i_TS_STATUS_INFO 2077 1_1_0 EXIST::FUNCTION:TS ERR_error_string_n 2078 1_1_0 EXIST::FUNCTION: HMAC 2079 1_1_0 EXIST::FUNCTION: @@ -2164,7 +2164,7 @@ i2d_ESS_SIGNING_CERT 2097 1_1_0 EXIST::FUNCTION:TS TS_RESP_set_tst_info 2098 1_1_0 EXIST::FUNCTION:TS EVP_PKEY_CTX_set_data 2099 1_1_0 EXIST::FUNCTION: CMS_EnvelopedData_create 2100 1_1_0 EXIST::FUNCTION:CMS -SCT_new 2101 1_1_0 EXIST::FUNCTION: +SCT_new 2101 1_1_0 EXIST::FUNCTION:CT X509_REQ_add1_attr 2102 1_1_0 EXIST::FUNCTION: X509_get_ext_count 2103 1_1_0 EXIST::FUNCTION: CRYPTO_cts128_decrypt 2104 1_1_0 EXIST::FUNCTION: @@ -2288,7 +2288,7 @@ DSA_get_default_method 2213 1_1_0 EXIST::FUNCTION:DSA lh_retrieve 2214 1_1_0 EXIST::FUNCTION: CRYPTO_ccm128_decrypt_ccm64 2215 1_1_0 EXIST::FUNCTION: TS_RESP_CTX_set_clock_precision_digits 2216 1_1_0 EXIST::FUNCTION:TS -SCT_LIST_validate 2217 1_1_0 EXIST::FUNCTION: +SCT_LIST_validate 2217 1_1_0 EXIST::FUNCTION:CT X509_PURPOSE_get_id 2218 1_1_0 EXIST::FUNCTION: EC_KEY_get_ex_data 2219 1_1_0 EXIST::FUNCTION:EC EVP_MD_size 2220 1_1_0 EXIST::FUNCTION: @@ -2360,7 +2360,7 @@ BN_num_bits_word 2282 1_1_0 EXIST::FUNCTION: EVP_DecodeInit 2283 1_1_0 EXIST::FUNCTION: BN_ucmp 2284 1_1_0 EXIST::FUNCTION: SXNET_get_id_asc 2285 1_1_0 EXIST::FUNCTION: -SCT_set1_extensions 2286 1_1_0 EXIST::FUNCTION: +SCT_set1_extensions 2286 1_1_0 EXIST::FUNCTION:CT PKCS12_SAFEBAG_new 2287 1_1_0 EXIST::FUNCTION: TS_TST_INFO_set_nonce 2288 1_1_0 EXIST::FUNCTION:TS PEM_read_ECPrivateKey 2289 1_1_0 EXIST::FUNCTION:EC @@ -2586,7 +2586,7 @@ d2i_ECPKParameters 2501 1_1_0 EXIST::FUNCTION:EC idea_ofb64_encrypt 2502 1_1_0 EXIST::FUNCTION:IDEA CAST_decrypt 2503 1_1_0 EXIST::FUNCTION:CAST TS_STATUS_INFO_get0_failure_info 2504 1_1_0 EXIST::FUNCTION:TS -o2i_SCT_signature 2505 1_1_0 EXIST::FUNCTION: +o2i_SCT_signature 2505 1_1_0 EXIST::FUNCTION:CT ENGINE_unregister_pkey_meths 2506 1_1_0 EXIST::FUNCTION:ENGINE DISPLAYTEXT_new 2507 1_1_0 EXIST::FUNCTION: CMS_final 2508 1_1_0 EXIST::FUNCTION:CMS @@ -2740,7 +2740,7 @@ TS_TST_INFO_get_nonce 2649 1_1_0 EXIST::FUNCTION:TS MD4_Init 2650 1_1_0 EXIST::FUNCTION:MD4 X509_EXTENSION_create_by_OBJ 2651 1_1_0 EXIST::FUNCTION: EVP_aes_256_cbc_hmac_sha1 2652 1_1_0 EXIST::FUNCTION:AES -SCT_validate 2653 1_1_0 EXIST::FUNCTION: +SCT_validate 2653 1_1_0 EXIST::FUNCTION:CT EC_GROUP_dup 2654 1_1_0 EXIST::FUNCTION:EC EVP_sha1 2655 1_1_0 EXIST::FUNCTION: sk_new 2656 1_1_0 EXIST::FUNCTION: @@ -2822,7 +2822,7 @@ EVP_PKEY_copy_parameters 2729 1_1_0 EXIST::FUNCTION: CMS_ContentInfo_print_ctx 2730 1_1_0 EXIST::FUNCTION:CMS d2i_PKCS7_SIGNED 2731 1_1_0 EXIST::FUNCTION: GENERAL_NAMES_free 2732 1_1_0 EXIST::FUNCTION: -SCT_get_timestamp 2733 1_1_0 EXIST::FUNCTION: +SCT_get_timestamp 2733 1_1_0 EXIST::FUNCTION:CT OCSP_SIGNATURE_it 2734 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: OCSP_SIGNATURE_it 2734 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: CMS_verify_receipt 2735 1_1_0 EXIST::FUNCTION:CMS @@ -2846,7 +2846,7 @@ PKCS7_SIGN_ENVELOPE_new 2752 1_1_0 EXIST::FUNCTION: TS_REQ_get_policy_id 2753 1_1_0 EXIST::FUNCTION:TS RC5_32_cbc_encrypt 2754 1_1_0 EXIST::FUNCTION:RC5 BN_is_zero 2755 1_1_0 EXIST::FUNCTION: -CT_POLICY_EVAL_CTX_new 2756 1_1_0 EXIST::FUNCTION: +CT_POLICY_EVAL_CTX_new 2756 1_1_0 EXIST::FUNCTION:CT NETSCAPE_SPKI_it 2757 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: NETSCAPE_SPKI_it 2757 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: CRYPTO_THREAD_unlock 2758 1_1_0 EXIST::FUNCTION: @@ -2918,9 +2918,9 @@ i2d_IPAddressOrRange 2818 1_1_0 EXIST::FUNCTION:RFC3779 CRYPTO_secure_used 2819 1_1_0 EXIST::FUNCTION: d2i_X509_CRL_INFO 2820 1_1_0 EXIST::FUNCTION: X509_CRL_get_issuer 2821 1_1_0 EXIST::FUNCTION: -d2i_SCT_LIST 2822 1_1_0 EXIST::FUNCTION: +d2i_SCT_LIST 2822 1_1_0 EXIST::FUNCTION:CT EC_GFp_nist_method 2823 1_1_0 EXIST::FUNCTION:EC -SCT_free 2824 1_1_0 EXIST::FUNCTION: +SCT_free 2824 1_1_0 EXIST::FUNCTION:CT TS_TST_INFO_get_msg_imprint 2825 1_1_0 EXIST::FUNCTION:TS v3_addr_add_range 2826 1_1_0 EXIST::FUNCTION:RFC3779 PKCS12_get_friendlyname 2827 1_1_0 EXIST::FUNCTION: @@ -2935,7 +2935,7 @@ SRP_Calc_x 2835 1_1_0 EXIST::FUNCTION:SRP a2i_ASN1_ENUMERATED 2836 1_1_0 EXIST::FUNCTION: CONF_module_get_usr_data 2837 1_1_0 EXIST::FUNCTION: i2d_X509_NAME_ENTRY 2838 1_1_0 EXIST::FUNCTION: -SCT_LIST_free 2839 1_1_0 EXIST::FUNCTION: +SCT_LIST_free 2839 1_1_0 EXIST::FUNCTION:CT PROXY_POLICY_new 2840 1_1_0 EXIST::FUNCTION: X509_ALGOR_set_md 2841 1_1_0 EXIST::FUNCTION: PKCS7_print_ctx 2842 1_1_0 EXIST::FUNCTION: @@ -2976,7 +2976,7 @@ EVP_PKEY_get0 2874 1_1_0 EXIST::FUNCTION: ENGINE_set_default 2875 1_1_0 EXIST::FUNCTION:ENGINE NCONF_get_number_e 2876 1_1_0 EXIST::FUNCTION: OPENSSL_cleanse 2877 1_1_0 EXIST::FUNCTION: -SCT_set0_signature 2878 1_1_0 EXIST::FUNCTION: +SCT_set0_signature 2878 1_1_0 EXIST::FUNCTION:CT X509_CRL_sign 2879 1_1_0 EXIST::FUNCTION: X509_CINF_it 2880 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: X509_CINF_it 2880 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: @@ -3291,7 +3291,7 @@ i2d_PUBKEY_fp 3180 1_1_0 EXIST::FUNCTION:STDIO b2i_PrivateKey_bio 3181 1_1_0 EXIST::FUNCTION: OCSP_REQUEST_add_ext 3182 1_1_0 EXIST::FUNCTION: SXNET_add_id_INTEGER 3183 1_1_0 EXIST::FUNCTION: -CTLOG_get0_public_key 3184 1_1_0 EXIST::FUNCTION: +CTLOG_get0_public_key 3184 1_1_0 EXIST::FUNCTION:CT OCSP_REQUEST_get_ext_by_OBJ 3185 1_1_0 EXIST::FUNCTION: X509_NAME_oneline 3186 1_1_0 EXIST::FUNCTION: X509V3_set_nconf 3187 1_1_0 EXIST::FUNCTION: @@ -3304,7 +3304,7 @@ RSA_new_method 3193 1_1_0 EXIST::FUNCTION:RSA OCSP_request_verify 3194 1_1_0 EXIST::FUNCTION: CRYPTO_THREAD_run_once 3195 1_1_0 EXIST::FUNCTION: TS_REQ_print_bio 3196 1_1_0 EXIST::FUNCTION:TS -SCT_get_version 3197 1_1_0 EXIST::FUNCTION: +SCT_get_version 3197 1_1_0 EXIST::FUNCTION:CT idea_set_encrypt_key 3198 1_1_0 EXIST::FUNCTION:IDEA ENGINE_get_DH 3199 1_1_0 EXIST::FUNCTION:ENGINE i2d_ASIdentifierChoice 3200 1_1_0 EXIST::FUNCTION:RFC3779 @@ -3383,7 +3383,7 @@ OCSP_REQUEST_new 3271 1_1_0 EXIST::FUNCTION: BIO_lookup 3272 1_1_0 EXIST::FUNCTION: EC_GROUP_get0_cofactor 3273 1_1_0 EXIST::FUNCTION:EC CRYPTO_THREADID_set_numeric 3274 1_1_0 NOEXIST::FUNCTION: -SCT_print 3275 1_1_0 EXIST::FUNCTION: +SCT_print 3275 1_1_0 EXIST::FUNCTION:CT X509_PUBKEY_set 3276 1_1_0 EXIST::FUNCTION: POLICY_CONSTRAINTS_free 3277 1_1_0 EXIST::FUNCTION: EVP_aes_256_cfb8 3278 1_1_0 EXIST::FUNCTION:AES @@ -3434,7 +3434,7 @@ PEM_def_callback 3321 1_1_0 EXIST::FUNCTION: PKCS12_add_friendlyname_uni 3322 1_1_0 EXIST::FUNCTION: X509_policy_tree_level_count 3323 1_1_0 EXIST::FUNCTION: OBJ_sn2nid 3324 1_1_0 EXIST::FUNCTION: -CTLOG_free 3325 1_1_0 EXIST::FUNCTION: +CTLOG_free 3325 1_1_0 EXIST::FUNCTION:CT EVP_CIPHER_meth_dup 3326 1_1_0 EXIST::FUNCTION: CMS_get1_crls 3327 1_1_0 EXIST::FUNCTION:CMS X509_aux_print 3328 1_1_0 EXIST::FUNCTION: @@ -3471,7 +3471,7 @@ RSA_generate_key_ex 3357 1_1_0 EXIST::FUNCTION:RSA CMS_SignerInfo_get0_algs 3358 1_1_0 EXIST::FUNCTION:CMS DIST_POINT_free 3359 1_1_0 EXIST::FUNCTION: ESS_SIGNING_CERT_free 3360 1_1_0 EXIST::FUNCTION:TS -SCT_new_from_base64 3361 1_1_0 EXIST::FUNCTION: +SCT_new_from_base64 3361 1_1_0 EXIST::FUNCTION:CT OpenSSL_version 3362 1_1_0 EXIST::FUNCTION: OCSP_SINGLERESP_get_ext_by_OBJ 3363 1_1_0 EXIST::FUNCTION: ECDSA_SIG_get0 3364 1_1_0 EXIST::FUNCTION:EC @@ -3539,7 +3539,7 @@ BN_BLINDING_convert_ex 3423 1_1_0 EXIST::FUNCTION: ASN1_GENERALIZEDTIME_print 3424 1_1_0 EXIST::FUNCTION: BIO_s_null 3425 1_1_0 EXIST::FUNCTION: PEM_ASN1_read 3426 1_1_0 EXIST::FUNCTION:STDIO -SCT_get_log_entry_type 3427 1_1_0 EXIST::FUNCTION: +SCT_get_log_entry_type 3427 1_1_0 EXIST::FUNCTION:CT EVP_CIPHER_meth_get_init 3428 1_1_0 EXIST::FUNCTION: X509_ALGOR_free 3429 1_1_0 EXIST::FUNCTION: OCSP_SINGLERESP_get_ext_count 3430 1_1_0 EXIST::FUNCTION: @@ -3548,7 +3548,7 @@ EVP_OpenFinal 3432 1_1_0 EXIST::FUNCTION:RSA RAND_egd_bytes 3433 1_1_0 EXIST::FUNCTION:EGD UI_method_get_writer 3434 1_1_0 EXIST::FUNCTION: BN_secure_new 3435 1_1_0 EXIST::FUNCTION: -CTLOG_new_null 3436 1_1_0 EXIST::FUNCTION: +CTLOG_new_null 3436 1_1_0 EXIST::FUNCTION:CT SHA1_Update 3437 1_1_0 EXIST::FUNCTION: BIO_s_connect 3438 1_1_0 EXIST::FUNCTION: EVP_MD_meth_get_init 3439 1_1_0 EXIST::FUNCTION: @@ -3588,7 +3588,7 @@ BN_BLINDING_invert_ex 3472 1_1_0 EXIST::FUNCTION: RIPEMD160_Init 3473 1_1_0 EXIST::FUNCTION:RMD160 ASYNC_WAIT_CTX_get_changed_fds 3474 1_1_0 EXIST::FUNCTION: EVP_PKEY_save_parameters 3475 1_1_0 EXIST::FUNCTION: -SCT_set_source 3476 1_1_0 EXIST::FUNCTION: +SCT_set_source 3476 1_1_0 EXIST::FUNCTION:CT DES_set_odd_parity 3477 1_1_0 EXIST::FUNCTION:DES CMAC_CTX_free 3478 1_1_0 EXIST::FUNCTION: d2i_ESS_ISSUER_SERIAL 3479 1_1_0 EXIST::FUNCTION:TS @@ -3635,7 +3635,7 @@ EVP_MD_CTX_ctrl 3518 1_1_0 EXIST::FUNCTION: PKCS7_final 3519 1_1_0 EXIST::FUNCTION: EVP_PKEY_size 3520 1_1_0 EXIST::FUNCTION: EVP_DecryptFinal_ex 3521 1_1_0 EXIST::FUNCTION: -SCT_get_signature_nid 3522 1_1_0 EXIST::FUNCTION: +SCT_get_signature_nid 3522 1_1_0 EXIST::FUNCTION:CT PROXY_CERT_INFO_EXTENSION_new 3523 1_1_0 EXIST::FUNCTION: EVP_bf_cbc 3524 1_1_0 EXIST::FUNCTION:BF DSA_do_verify 3525 1_1_0 EXIST::FUNCTION:DSA @@ -3655,7 +3655,7 @@ d2i_BASIC_CONSTRAINTS 3539 1_1_0 EXIST::FUNCTION: X509_CERT_AUX_new 3540 1_1_0 EXIST::FUNCTION: ENGINE_register_pkey_asn1_meths 3541 1_1_0 EXIST::FUNCTION:ENGINE CRYPTO_ocb128_tag 3542 1_1_0 EXIST::FUNCTION:OCB -i2o_SCT_signature 3543 1_1_0 EXIST::FUNCTION: +i2o_SCT_signature 3543 1_1_0 EXIST::FUNCTION:CT ERR_load_OBJ_strings 3544 1_1_0 EXIST::FUNCTION: BIO_ctrl_get_read_request 3545 1_1_0 EXIST::FUNCTION: BN_from_montgomery 3546 1_1_0 EXIST::FUNCTION: @@ -3756,7 +3756,7 @@ BIO_set_cipher 3637 1_1_0 EXIST::FUNCTION: PEM_read_PUBKEY 3638 1_1_0 EXIST::FUNCTION: RSA_PKCS1_OpenSSL 3639 1_1_0 EXIST::FUNCTION:RSA AUTHORITY_INFO_ACCESS_free 3640 1_1_0 EXIST::FUNCTION: -SCT_get0_signature 3641 1_1_0 EXIST::FUNCTION: +SCT_get0_signature 3641 1_1_0 EXIST::FUNCTION:CT name_cmp 3642 1_1_0 EXIST::FUNCTION: DISPLAYTEXT_it 3643 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: DISPLAYTEXT_it 3643 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: @@ -3860,7 +3860,7 @@ SRP_Calc_u 3738 1_1_0 EXIST::FUNCTION:SRP i2d_PKCS8PrivateKey_bio 3739 1_1_0 EXIST::FUNCTION: X509_get_extension_flags 3740 1_1_0 EXIST::FUNCTION: X509V3_EXT_val_prn 3741 1_1_0 EXIST::FUNCTION: -SCT_get_validation_status 3742 1_1_0 EXIST::FUNCTION: +SCT_get_validation_status 3742 1_1_0 EXIST::FUNCTION:CT NETSCAPE_CERT_SEQUENCE_free 3743 1_1_0 EXIST::FUNCTION: EVP_PBE_scrypt 3744 1_1_0 EXIST::FUNCTION:SCRYPT d2i_TS_REQ_bio 3745 1_1_0 EXIST::FUNCTION:TS @@ -3907,7 +3907,7 @@ UI_new_method 3783 1_1_0 EXIST::FUNCTION: Camellia_ofb128_encrypt 3784 1_1_0 EXIST::FUNCTION:CAMELLIA X509_new 3785 1_1_0 EXIST::FUNCTION: EC_KEY_get_conv_form 3786 1_1_0 EXIST::FUNCTION:EC -CTLOG_STORE_get0_log_by_id 3787 1_1_0 EXIST::FUNCTION: +CTLOG_STORE_get0_log_by_id 3787 1_1_0 EXIST::FUNCTION:CT CMS_signed_add1_attr 3788 1_1_0 EXIST::FUNCTION:CMS EVP_CIPHER_meth_set_iv_length 3789 1_1_0 EXIST::FUNCTION: v3_asid_validate_path 3790 1_1_0 EXIST::FUNCTION:RFC3779 @@ -3940,7 +3940,7 @@ CMS_unsigned_add1_attr_by_txt 3814 1_1_0 EXIST::FUNCTION:CMS d2i_RSA_PUBKEY 3815 1_1_0 EXIST::FUNCTION:RSA PKCS12_gen_mac 3816 1_1_0 EXIST::FUNCTION: ERR_load_ENGINE_strings 3817 1_1_0 EXIST::FUNCTION:ENGINE -ERR_load_CT_strings 3818 1_1_0 EXIST::FUNCTION: +ERR_load_CT_strings 3818 1_1_0 EXIST::FUNCTION:CT OCSP_ONEREQ_it 3819 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE: OCSP_ONEREQ_it 3819 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: X509_PURPOSE_get_by_sname 3820 1_1_0 EXIST::FUNCTION: @@ -4026,7 +4026,7 @@ OCSP_REVOKEDINFO_it 3895 1_1_0 EXIST:!EXPORT_VAR_AS_FUNCTION OCSP_REVOKEDINFO_it 3895 1_1_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: X509V3_set_ctx 3896 1_1_0 EXIST::FUNCTION: ASN1_ENUMERATED_set_int64 3897 1_1_0 EXIST::FUNCTION: -o2i_SCT 3898 1_1_0 EXIST::FUNCTION: +o2i_SCT 3898 1_1_0 EXIST::FUNCTION:CT CRL_DIST_POINTS_free 3899 1_1_0 EXIST::FUNCTION: d2i_OCSP_SINGLERESP 3900 1_1_0 EXIST::FUNCTION: EVP_CIPHER_CTX_num 3901 1_1_0 EXIST::FUNCTION: |