From: Dr. Matthias St. Pierre Date: Fri, 27 Sep 2019 22:45:46 +0000 (+0200) Subject: Reorganize public header files (part 1) X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=50cd4768c6b89c757645f28519236bb989216f8d;p=oweals%2Fopenssl.git Reorganize public header files (part 1) Rename to . Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/9333) --- diff --git a/apps/include/apps.h b/apps/include/apps.h index 8b28d749e9..b2151e9ebd 100644 --- a/apps/include/apps.h +++ b/apps/include/apps.h @@ -21,7 +21,7 @@ # endif # include -# include +# include # include # include # include diff --git a/apps/include/opt.h b/apps/include/opt.h index 92a7fd1d82..9415dd797b 100644 --- a/apps/include/opt.h +++ b/apps/include/opt.h @@ -11,7 +11,7 @@ #include #include -#include +#include #include /* diff --git a/crypto/cmp/cmp_local.h b/crypto/cmp/cmp_local.h index 1f47dca0d0..48734649a0 100644 --- a/crypto/cmp/cmp_local.h +++ b/crypto/cmp/cmp_local.h @@ -19,7 +19,7 @@ /* explicit #includes not strictly needed since implied by the above: */ # include -# include +# include # include # include # include diff --git a/crypto/crmf/crmf_local.h b/crypto/crmf/crmf_local.h index 54f9a4a225..0eba3a15c8 100644 --- a/crypto/crmf/crmf_local.h +++ b/crypto/crmf/crmf_local.h @@ -18,7 +18,7 @@ # include /* explicit #includes not strictly needed since implied by the above: */ -# include +# include # include # include # include diff --git a/crypto/evp/evp_fetch.c b/crypto/evp/evp_fetch.c index 5aa1319ce1..e15b8e26be 100644 --- a/crypto/evp/evp_fetch.c +++ b/crypto/evp/evp_fetch.c @@ -8,7 +8,7 @@ */ #include -#include +#include #include #include #include "internal/cryptlib.h" diff --git a/crypto/evp/evp_local.h b/crypto/evp/evp_local.h index 116c8e6ce0..ec0f823bd5 100644 --- a/crypto/evp/evp_local.h +++ b/crypto/evp/evp_local.h @@ -163,7 +163,7 @@ DEFINE_STACK_OF(EVP_PBE_CTL) int is_partially_overlapping(const void *ptr1, const void *ptr2, int len); -#include +#include #include void *evp_generic_fetch(OPENSSL_CTX *ctx, int operation_id, diff --git a/crypto/evp/mac_lib.c b/crypto/evp/mac_lib.c index 1d6214c8a6..8b8c9a5067 100644 --- a/crypto/evp/mac_lib.c +++ b/crypto/evp/mac_lib.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include "internal/nelem.h" #include "crypto/evp.h" #include "internal/provider.h" diff --git a/crypto/x509/v3_admis.c b/crypto/x509/v3_admis.c index d6e4bc4166..104b58f259 100644 --- a/crypto/x509/v3_admis.c +++ b/crypto/x509/v3_admis.c @@ -9,7 +9,7 @@ #include #include "internal/cryptlib.h" #include -#include +#include #include #include diff --git a/crypto/x509/x509_meth.c b/crypto/x509/x509_meth.c index 71db99590b..05e7f7e29e 100644 --- a/crypto/x509/x509_meth.c +++ b/crypto/x509/x509_meth.c @@ -14,7 +14,7 @@ #include "internal/cryptlib.h" #include #include -#include +#include #include "x509_local.h" X509_LOOKUP_METHOD *X509_LOOKUP_meth_new(const char *name) diff --git a/doc/internal/man3/openssl_ctx_get_data.pod b/doc/internal/man3/openssl_ctx_get_data.pod index 11eb1484d7..6fd7c6336e 100644 --- a/doc/internal/man3/openssl_ctx_get_data.pod +++ b/doc/internal/man3/openssl_ctx_get_data.pod @@ -7,7 +7,7 @@ openssl_ctx_get_data, openssl_ctx_run_once, openssl_ctx_onfree =head1 SYNOPSIS - #include + #include #include "internal/cryptlib.h" typedef struct openssl_ctx_method { diff --git a/include/internal/param_build.h b/include/internal/param_build.h index bb96ba98e0..a5297b843d 100644 --- a/include/internal/param_build.h +++ b/include/internal/param_build.h @@ -9,7 +9,7 @@ */ #include -#include +#include #define OSSL_PARAM_BLD_MAX 10 diff --git a/include/openssl/asn1.h b/include/openssl/asn1.h index 3268db1744..ca00430eaf 100644 --- a/include/openssl/asn1.h +++ b/include/openssl/asn1.h @@ -18,7 +18,7 @@ # include # include -# include +# include # if !OPENSSL_API_1_1_0 # include # endif diff --git a/include/openssl/bn.h b/include/openssl/bn.h index ca92c0e408..02444422df 100644 --- a/include/openssl/bn.h +++ b/include/openssl/bn.h @@ -16,7 +16,7 @@ # include # endif # include -# include +# include # include # include diff --git a/include/openssl/buffer.h b/include/openssl/buffer.h index 1413726383..39e34d996e 100644 --- a/include/openssl/buffer.h +++ b/include/openssl/buffer.h @@ -10,7 +10,7 @@ #ifndef HEADER_BUFFER_H # define HEADER_BUFFER_H -# include +# include # ifndef HEADER_CRYPTO_H # include # endif diff --git a/include/openssl/cmp.h b/include/openssl/cmp.h index 1a628dbd62..daffc2996a 100644 --- a/include/openssl/cmp.h +++ b/include/openssl/cmp.h @@ -20,7 +20,7 @@ # include /* explicit #includes not strictly needed since implied by the above: */ -# include +# include # include # include # include diff --git a/include/openssl/conf.h b/include/openssl/conf.h index 49d637b7ce..ed10412367 100644 --- a/include/openssl/conf.h +++ b/include/openssl/conf.h @@ -14,7 +14,7 @@ # include # include # include -# include +# include # include #ifdef __cplusplus diff --git a/include/openssl/core.h b/include/openssl/core.h index 43e9d0a6bc..d07a2accfd 100644 --- a/include/openssl/core.h +++ b/include/openssl/core.h @@ -11,7 +11,7 @@ # define OSSL_CORE_H # include -# include +# include # ifdef __cplusplus extern "C" { diff --git a/include/openssl/crmf.h b/include/openssl/crmf.h index 1e34e56996..7490a1d87a 100644 --- a/include/openssl/crmf.h +++ b/include/openssl/crmf.h @@ -23,7 +23,7 @@ # include /* for GENERAL_NAME etc. */ /* explicit #includes not strictly needed since implied by the above: */ -# include +# include # include # ifdef __cplusplus diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index 60aca02849..5cdb83107e 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -22,7 +22,7 @@ # include # include -# include +# include # include # include diff --git a/include/openssl/ct.h b/include/openssl/ct.h index 76f566304e..940e66c9a8 100644 --- a/include/openssl/ct.h +++ b/include/openssl/ct.h @@ -13,7 +13,7 @@ # include # ifndef OPENSSL_NO_CT -# include +# include # include # include # include diff --git a/include/openssl/dh.h b/include/openssl/dh.h index 4e117a0d03..1b9d2163fd 100644 --- a/include/openssl/dh.h +++ b/include/openssl/dh.h @@ -16,7 +16,7 @@ # include # include # include -# include +# include # if !OPENSSL_API_1_1_0 # include # endif diff --git a/include/openssl/dsa.h b/include/openssl/dsa.h index 38ae977fc6..32d6a7d420 100644 --- a/include/openssl/dsa.h +++ b/include/openssl/dsa.h @@ -20,7 +20,7 @@ extern "C" { # include # include # include -# include +# include # include # if !OPENSSL_API_1_1_0 # include diff --git a/include/openssl/engine.h b/include/openssl/engine.h index 92d49e343a..8a2b96f4e3 100644 --- a/include/openssl/engine.h +++ b/include/openssl/engine.h @@ -24,7 +24,7 @@ # include # include # endif -# include +# include # include # include # include diff --git a/include/openssl/err.h b/include/openssl/err.h index 5c647831b5..6f75b32654 100644 --- a/include/openssl/err.h +++ b/include/openssl/err.h @@ -17,7 +17,7 @@ # include # endif -# include +# include # include # include diff --git a/include/openssl/evp.h b/include/openssl/evp.h index b65328df6d..2d9dcb765e 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -13,7 +13,7 @@ # include # include -# include +# include # include # include # include diff --git a/include/openssl/kdf.h b/include/openssl/kdf.h index a9ea768d1d..5568c4f268 100644 --- a/include/openssl/kdf.h +++ b/include/openssl/kdf.h @@ -12,7 +12,7 @@ # include # include -# include +# include # include # ifdef __cplusplus diff --git a/include/openssl/modes.h b/include/openssl/modes.h index 212c846fd8..7465c71ba8 100644 --- a/include/openssl/modes.h +++ b/include/openssl/modes.h @@ -11,7 +11,7 @@ # define HEADER_MODES_H # include -# include +# include # ifdef __cplusplus extern "C" { diff --git a/include/openssl/ocsp.h b/include/openssl/ocsp.h index 3a37f613ed..e427325870 100644 --- a/include/openssl/ocsp.h +++ b/include/openssl/ocsp.h @@ -46,7 +46,7 @@ # ifndef OPENSSL_NO_OCSP -# include +# include # include # include # include diff --git a/include/openssl/ossl_typ.h b/include/openssl/ossl_typ.h deleted file mode 100644 index 70d9144ba1..0000000000 --- a/include/openssl/ossl_typ.h +++ /dev/null @@ -1,218 +0,0 @@ -/* - * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. - * - * Licensed under the Apache License 2.0 (the "License"). You may not use - * this file except in compliance with the License. You can obtain a copy - * in the file LICENSE in the source distribution or at - * https://www.openssl.org/source/license.html - */ - -#ifndef HEADER_OPENSSL_TYPES_H -# define HEADER_OPENSSL_TYPES_H - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -# include - -typedef struct ossl_provider_st OSSL_PROVIDER; /* Provider Object */ - -# ifdef NO_ASN1_TYPEDEFS -# define ASN1_INTEGER ASN1_STRING -# define ASN1_ENUMERATED ASN1_STRING -# define ASN1_BIT_STRING ASN1_STRING -# define ASN1_OCTET_STRING ASN1_STRING -# define ASN1_PRINTABLESTRING ASN1_STRING -# define ASN1_T61STRING ASN1_STRING -# define ASN1_IA5STRING ASN1_STRING -# define ASN1_UTCTIME ASN1_STRING -# define ASN1_GENERALIZEDTIME ASN1_STRING -# define ASN1_TIME ASN1_STRING -# define ASN1_GENERALSTRING ASN1_STRING -# define ASN1_UNIVERSALSTRING ASN1_STRING -# define ASN1_BMPSTRING ASN1_STRING -# define ASN1_VISIBLESTRING ASN1_STRING -# define ASN1_UTF8STRING ASN1_STRING -# define ASN1_BOOLEAN int -# define ASN1_NULL int -# else -typedef struct asn1_string_st ASN1_INTEGER; -typedef struct asn1_string_st ASN1_ENUMERATED; -typedef struct asn1_string_st ASN1_BIT_STRING; -typedef struct asn1_string_st ASN1_OCTET_STRING; -typedef struct asn1_string_st ASN1_PRINTABLESTRING; -typedef struct asn1_string_st ASN1_T61STRING; -typedef struct asn1_string_st ASN1_IA5STRING; -typedef struct asn1_string_st ASN1_GENERALSTRING; -typedef struct asn1_string_st ASN1_UNIVERSALSTRING; -typedef struct asn1_string_st ASN1_BMPSTRING; -typedef struct asn1_string_st ASN1_UTCTIME; -typedef struct asn1_string_st ASN1_TIME; -typedef struct asn1_string_st ASN1_GENERALIZEDTIME; -typedef struct asn1_string_st ASN1_VISIBLESTRING; -typedef struct asn1_string_st ASN1_UTF8STRING; -typedef struct asn1_string_st ASN1_STRING; -typedef int ASN1_BOOLEAN; -typedef int ASN1_NULL; -# endif - -typedef struct asn1_object_st ASN1_OBJECT; - -typedef struct ASN1_ITEM_st ASN1_ITEM; -typedef struct asn1_pctx_st ASN1_PCTX; -typedef struct asn1_sctx_st ASN1_SCTX; - -# ifdef _WIN32 -# undef X509_NAME -# undef X509_EXTENSIONS -# undef PKCS7_ISSUER_AND_SERIAL -# undef PKCS7_SIGNER_INFO -# undef OCSP_REQUEST -# undef OCSP_RESPONSE -# endif - -# ifdef BIGNUM -# undef BIGNUM -# endif -struct dane_st; -typedef struct bio_st BIO; -typedef struct bignum_st BIGNUM; -typedef struct bignum_ctx BN_CTX; -typedef struct bn_blinding_st BN_BLINDING; -typedef struct bn_mont_ctx_st BN_MONT_CTX; -typedef struct bn_recp_ctx_st BN_RECP_CTX; -typedef struct bn_gencb_st BN_GENCB; - -typedef struct buf_mem_st BUF_MEM; - -typedef struct err_state_st ERR_STATE; - -typedef struct evp_cipher_st EVP_CIPHER; -typedef struct evp_cipher_ctx_st EVP_CIPHER_CTX; -typedef struct evp_md_st EVP_MD; -typedef struct evp_md_ctx_st EVP_MD_CTX; -typedef struct evp_mac_st EVP_MAC; -typedef struct evp_mac_ctx_st EVP_MAC_CTX; -typedef struct evp_pkey_st EVP_PKEY; - -typedef struct evp_pkey_asn1_method_st EVP_PKEY_ASN1_METHOD; - -typedef struct evp_pkey_method_st EVP_PKEY_METHOD; -typedef struct evp_pkey_ctx_st EVP_PKEY_CTX; - -typedef struct evp_keymgmt_st EVP_KEYMGMT; - -typedef struct evp_kdf_st EVP_KDF; -typedef struct evp_kdf_ctx_st EVP_KDF_CTX; - -typedef struct evp_keyexch_st EVP_KEYEXCH; - -typedef struct evp_signature_st EVP_SIGNATURE; - -typedef struct evp_Encode_Ctx_st EVP_ENCODE_CTX; - -typedef struct hmac_ctx_st HMAC_CTX; - -typedef struct dh_st DH; -typedef struct dh_method DH_METHOD; - -typedef struct dsa_st DSA; -typedef struct dsa_method DSA_METHOD; - -typedef struct rsa_st RSA; -typedef struct rsa_meth_st RSA_METHOD; - -typedef struct ec_key_st EC_KEY; -typedef struct ec_key_method_st EC_KEY_METHOD; - -typedef struct rand_meth_st RAND_METHOD; -typedef struct rand_drbg_st RAND_DRBG; - -typedef struct ssl_dane_st SSL_DANE; -typedef struct x509_st X509; -typedef struct X509_algor_st X509_ALGOR; -typedef struct X509_crl_st X509_CRL; -typedef struct x509_crl_method_st X509_CRL_METHOD; -typedef struct x509_revoked_st X509_REVOKED; -typedef struct X509_name_st X509_NAME; -typedef struct X509_pubkey_st X509_PUBKEY; -typedef struct x509_store_st X509_STORE; -typedef struct x509_store_ctx_st X509_STORE_CTX; - -typedef struct x509_object_st X509_OBJECT; -typedef struct x509_lookup_st X509_LOOKUP; -typedef struct x509_lookup_method_st X509_LOOKUP_METHOD; -typedef struct X509_VERIFY_PARAM_st X509_VERIFY_PARAM; - -typedef struct x509_sig_info_st X509_SIG_INFO; - -typedef struct pkcs8_priv_key_info_st PKCS8_PRIV_KEY_INFO; - -typedef struct v3_ext_ctx X509V3_CTX; -typedef struct conf_st CONF; -typedef struct ossl_init_settings_st OPENSSL_INIT_SETTINGS; - -typedef struct ui_st UI; -typedef struct ui_method_st UI_METHOD; - -typedef struct engine_st ENGINE; -typedef struct ssl_st SSL; -typedef struct ssl_ctx_st SSL_CTX; - -typedef struct comp_ctx_st COMP_CTX; -typedef struct comp_method_st COMP_METHOD; - -typedef struct X509_POLICY_NODE_st X509_POLICY_NODE; -typedef struct X509_POLICY_LEVEL_st X509_POLICY_LEVEL; -typedef struct X509_POLICY_TREE_st X509_POLICY_TREE; -typedef struct X509_POLICY_CACHE_st X509_POLICY_CACHE; - -typedef struct AUTHORITY_KEYID_st AUTHORITY_KEYID; -typedef struct DIST_POINT_st DIST_POINT; -typedef struct ISSUING_DIST_POINT_st ISSUING_DIST_POINT; -typedef struct NAME_CONSTRAINTS_st NAME_CONSTRAINTS; - -typedef struct crypto_ex_data_st CRYPTO_EX_DATA; - -typedef struct ocsp_req_ctx_st OCSP_REQ_CTX; -typedef struct ocsp_response_st OCSP_RESPONSE; -typedef struct ocsp_responder_id_st OCSP_RESPID; - -typedef struct sct_st SCT; -typedef struct sct_ctx_st SCT_CTX; -typedef struct ctlog_st CTLOG; -typedef struct ctlog_store_st CTLOG_STORE; -typedef struct ct_policy_eval_ctx_st CT_POLICY_EVAL_CTX; - -typedef struct ossl_store_info_st OSSL_STORE_INFO; -typedef struct ossl_store_search_st OSSL_STORE_SEARCH; - -typedef struct openssl_ctx_st OPENSSL_CTX; - -typedef struct ossl_dispatch_st OSSL_DISPATCH; -typedef struct ossl_item_st OSSL_ITEM; -typedef struct ossl_algorithm_st OSSL_ALGORITHM; -typedef struct ossl_param_st OSSL_PARAM; - -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && \ - defined(INTMAX_MAX) && defined(UINTMAX_MAX) -typedef intmax_t ossl_intmax_t; -typedef uintmax_t ossl_uintmax_t; -#else -/* - * Not long long, because the C-library can only be expected to provide - * strtoll(), strtoull() at the same time as intmax_t and strtoimax(), - * strtoumax(). Since we use these for parsing arguments, we need the - * conversion functions, not just the sizes. - */ -typedef long ossl_intmax_t; -typedef unsigned long ossl_uintmax_t; -#endif - -#ifdef __cplusplus -} -#endif -#endif /* def HEADER_OPENSSL_TYPES_H */ diff --git a/include/openssl/pkcs7.h b/include/openssl/pkcs7.h index 5dec27fc8e..682c3404c4 100644 --- a/include/openssl/pkcs7.h +++ b/include/openssl/pkcs7.h @@ -15,7 +15,7 @@ # include # include -# include +# include # include #ifdef __cplusplus diff --git a/include/openssl/rand.h b/include/openssl/rand.h index 974fd2e5c3..05ea8a7f8e 100644 --- a/include/openssl/rand.h +++ b/include/openssl/rand.h @@ -11,7 +11,7 @@ # define HEADER_RAND_H # include -# include +# include # include # include diff --git a/include/openssl/rand_drbg.h b/include/openssl/rand_drbg.h index 4e99d71a1d..984c40df91 100644 --- a/include/openssl/rand_drbg.h +++ b/include/openssl/rand_drbg.h @@ -11,7 +11,7 @@ # define HEADER_DRBG_RAND_H # include -# include +# include # include /* diff --git a/include/openssl/rsa.h b/include/openssl/rsa.h index 6b681f4ef5..8750e19ab9 100644 --- a/include/openssl/rsa.h +++ b/include/openssl/rsa.h @@ -16,7 +16,7 @@ # include # include # include -# include +# include # if !OPENSSL_API_1_1_0 # include # endif diff --git a/include/openssl/store.h b/include/openssl/store.h index 9200fd0ce8..0d750351da 100644 --- a/include/openssl/store.h +++ b/include/openssl/store.h @@ -11,7 +11,7 @@ # define HEADER_OSSL_STORE_H # include -# include +# include # include # include diff --git a/include/openssl/types.h b/include/openssl/types.h new file mode 100644 index 0000000000..70d9144ba1 --- /dev/null +++ b/include/openssl/types.h @@ -0,0 +1,218 @@ +/* + * Copyright 2001-2018 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#ifndef HEADER_OPENSSL_TYPES_H +# define HEADER_OPENSSL_TYPES_H + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +# include + +typedef struct ossl_provider_st OSSL_PROVIDER; /* Provider Object */ + +# ifdef NO_ASN1_TYPEDEFS +# define ASN1_INTEGER ASN1_STRING +# define ASN1_ENUMERATED ASN1_STRING +# define ASN1_BIT_STRING ASN1_STRING +# define ASN1_OCTET_STRING ASN1_STRING +# define ASN1_PRINTABLESTRING ASN1_STRING +# define ASN1_T61STRING ASN1_STRING +# define ASN1_IA5STRING ASN1_STRING +# define ASN1_UTCTIME ASN1_STRING +# define ASN1_GENERALIZEDTIME ASN1_STRING +# define ASN1_TIME ASN1_STRING +# define ASN1_GENERALSTRING ASN1_STRING +# define ASN1_UNIVERSALSTRING ASN1_STRING +# define ASN1_BMPSTRING ASN1_STRING +# define ASN1_VISIBLESTRING ASN1_STRING +# define ASN1_UTF8STRING ASN1_STRING +# define ASN1_BOOLEAN int +# define ASN1_NULL int +# else +typedef struct asn1_string_st ASN1_INTEGER; +typedef struct asn1_string_st ASN1_ENUMERATED; +typedef struct asn1_string_st ASN1_BIT_STRING; +typedef struct asn1_string_st ASN1_OCTET_STRING; +typedef struct asn1_string_st ASN1_PRINTABLESTRING; +typedef struct asn1_string_st ASN1_T61STRING; +typedef struct asn1_string_st ASN1_IA5STRING; +typedef struct asn1_string_st ASN1_GENERALSTRING; +typedef struct asn1_string_st ASN1_UNIVERSALSTRING; +typedef struct asn1_string_st ASN1_BMPSTRING; +typedef struct asn1_string_st ASN1_UTCTIME; +typedef struct asn1_string_st ASN1_TIME; +typedef struct asn1_string_st ASN1_GENERALIZEDTIME; +typedef struct asn1_string_st ASN1_VISIBLESTRING; +typedef struct asn1_string_st ASN1_UTF8STRING; +typedef struct asn1_string_st ASN1_STRING; +typedef int ASN1_BOOLEAN; +typedef int ASN1_NULL; +# endif + +typedef struct asn1_object_st ASN1_OBJECT; + +typedef struct ASN1_ITEM_st ASN1_ITEM; +typedef struct asn1_pctx_st ASN1_PCTX; +typedef struct asn1_sctx_st ASN1_SCTX; + +# ifdef _WIN32 +# undef X509_NAME +# undef X509_EXTENSIONS +# undef PKCS7_ISSUER_AND_SERIAL +# undef PKCS7_SIGNER_INFO +# undef OCSP_REQUEST +# undef OCSP_RESPONSE +# endif + +# ifdef BIGNUM +# undef BIGNUM +# endif +struct dane_st; +typedef struct bio_st BIO; +typedef struct bignum_st BIGNUM; +typedef struct bignum_ctx BN_CTX; +typedef struct bn_blinding_st BN_BLINDING; +typedef struct bn_mont_ctx_st BN_MONT_CTX; +typedef struct bn_recp_ctx_st BN_RECP_CTX; +typedef struct bn_gencb_st BN_GENCB; + +typedef struct buf_mem_st BUF_MEM; + +typedef struct err_state_st ERR_STATE; + +typedef struct evp_cipher_st EVP_CIPHER; +typedef struct evp_cipher_ctx_st EVP_CIPHER_CTX; +typedef struct evp_md_st EVP_MD; +typedef struct evp_md_ctx_st EVP_MD_CTX; +typedef struct evp_mac_st EVP_MAC; +typedef struct evp_mac_ctx_st EVP_MAC_CTX; +typedef struct evp_pkey_st EVP_PKEY; + +typedef struct evp_pkey_asn1_method_st EVP_PKEY_ASN1_METHOD; + +typedef struct evp_pkey_method_st EVP_PKEY_METHOD; +typedef struct evp_pkey_ctx_st EVP_PKEY_CTX; + +typedef struct evp_keymgmt_st EVP_KEYMGMT; + +typedef struct evp_kdf_st EVP_KDF; +typedef struct evp_kdf_ctx_st EVP_KDF_CTX; + +typedef struct evp_keyexch_st EVP_KEYEXCH; + +typedef struct evp_signature_st EVP_SIGNATURE; + +typedef struct evp_Encode_Ctx_st EVP_ENCODE_CTX; + +typedef struct hmac_ctx_st HMAC_CTX; + +typedef struct dh_st DH; +typedef struct dh_method DH_METHOD; + +typedef struct dsa_st DSA; +typedef struct dsa_method DSA_METHOD; + +typedef struct rsa_st RSA; +typedef struct rsa_meth_st RSA_METHOD; + +typedef struct ec_key_st EC_KEY; +typedef struct ec_key_method_st EC_KEY_METHOD; + +typedef struct rand_meth_st RAND_METHOD; +typedef struct rand_drbg_st RAND_DRBG; + +typedef struct ssl_dane_st SSL_DANE; +typedef struct x509_st X509; +typedef struct X509_algor_st X509_ALGOR; +typedef struct X509_crl_st X509_CRL; +typedef struct x509_crl_method_st X509_CRL_METHOD; +typedef struct x509_revoked_st X509_REVOKED; +typedef struct X509_name_st X509_NAME; +typedef struct X509_pubkey_st X509_PUBKEY; +typedef struct x509_store_st X509_STORE; +typedef struct x509_store_ctx_st X509_STORE_CTX; + +typedef struct x509_object_st X509_OBJECT; +typedef struct x509_lookup_st X509_LOOKUP; +typedef struct x509_lookup_method_st X509_LOOKUP_METHOD; +typedef struct X509_VERIFY_PARAM_st X509_VERIFY_PARAM; + +typedef struct x509_sig_info_st X509_SIG_INFO; + +typedef struct pkcs8_priv_key_info_st PKCS8_PRIV_KEY_INFO; + +typedef struct v3_ext_ctx X509V3_CTX; +typedef struct conf_st CONF; +typedef struct ossl_init_settings_st OPENSSL_INIT_SETTINGS; + +typedef struct ui_st UI; +typedef struct ui_method_st UI_METHOD; + +typedef struct engine_st ENGINE; +typedef struct ssl_st SSL; +typedef struct ssl_ctx_st SSL_CTX; + +typedef struct comp_ctx_st COMP_CTX; +typedef struct comp_method_st COMP_METHOD; + +typedef struct X509_POLICY_NODE_st X509_POLICY_NODE; +typedef struct X509_POLICY_LEVEL_st X509_POLICY_LEVEL; +typedef struct X509_POLICY_TREE_st X509_POLICY_TREE; +typedef struct X509_POLICY_CACHE_st X509_POLICY_CACHE; + +typedef struct AUTHORITY_KEYID_st AUTHORITY_KEYID; +typedef struct DIST_POINT_st DIST_POINT; +typedef struct ISSUING_DIST_POINT_st ISSUING_DIST_POINT; +typedef struct NAME_CONSTRAINTS_st NAME_CONSTRAINTS; + +typedef struct crypto_ex_data_st CRYPTO_EX_DATA; + +typedef struct ocsp_req_ctx_st OCSP_REQ_CTX; +typedef struct ocsp_response_st OCSP_RESPONSE; +typedef struct ocsp_responder_id_st OCSP_RESPID; + +typedef struct sct_st SCT; +typedef struct sct_ctx_st SCT_CTX; +typedef struct ctlog_st CTLOG; +typedef struct ctlog_store_st CTLOG_STORE; +typedef struct ct_policy_eval_ctx_st CT_POLICY_EVAL_CTX; + +typedef struct ossl_store_info_st OSSL_STORE_INFO; +typedef struct ossl_store_search_st OSSL_STORE_SEARCH; + +typedef struct openssl_ctx_st OPENSSL_CTX; + +typedef struct ossl_dispatch_st OSSL_DISPATCH; +typedef struct ossl_item_st OSSL_ITEM; +typedef struct ossl_algorithm_st OSSL_ALGORITHM; +typedef struct ossl_param_st OSSL_PARAM; + +#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && \ + defined(INTMAX_MAX) && defined(UINTMAX_MAX) +typedef intmax_t ossl_intmax_t; +typedef uintmax_t ossl_uintmax_t; +#else +/* + * Not long long, because the C-library can only be expected to provide + * strtoll(), strtoull() at the same time as intmax_t and strtoimax(), + * strtoumax(). Since we use these for parsing arguments, we need the + * conversion functions, not just the sizes. + */ +typedef long ossl_intmax_t; +typedef unsigned long ossl_uintmax_t; +#endif + +#ifdef __cplusplus +} +#endif +#endif /* def HEADER_OPENSSL_TYPES_H */ diff --git a/include/openssl/ui.h b/include/openssl/ui.h index 4ae06e9673..5901d23208 100644 --- a/include/openssl/ui.h +++ b/include/openssl/ui.h @@ -17,7 +17,7 @@ # endif # include # include -# include +# include # include /* For compatibility reasons, the macro OPENSSL_NO_UI is currently retained */ diff --git a/include/openssl/x509.h b/include/openssl/x509.h index d2466f2972..89ec365c6a 100644 --- a/include/openssl/x509.h +++ b/include/openssl/x509.h @@ -12,7 +12,7 @@ # define HEADER_X509_H # include -# include +# include # include # include # include diff --git a/providers/fips/selftest.h b/providers/fips/selftest.h index 3e97e0d786..230d448b1d 100644 --- a/providers/fips/selftest.h +++ b/providers/fips/selftest.h @@ -8,7 +8,7 @@ */ #include -#include +#include typedef struct self_test_post_params_st { /* FIPS module integrity check parameters */ diff --git a/test/mdc2test.c b/test/mdc2test.c index d1c2f26bdc..f8c492297e 100644 --- a/test/mdc2test.c +++ b/test/mdc2test.c @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include "internal/nelem.h" #include "testutil.h" diff --git a/test/shlibloadtest.c b/test/shlibloadtest.c index 84d90daeeb..bbac99674e 100644 --- a/test/shlibloadtest.c +++ b/test/shlibloadtest.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include "crypto/dso_conf.h" typedef void DSO;