diff options
author | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-28 00:45:46 +0200 |
---|---|---|
committer | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-28 20:26:36 +0200 |
commit | 50cd4768c6b89c757645f28519236bb989216f8d (patch) | |
tree | e147f467bde92bfae63fb25499e6e2df6999bcce | |
parent | 706457b7bda7fdbab426b8dce83b318908339da4 (diff) | |
download | openssl-new-50cd4768c6b89c757645f28519236bb989216f8d.tar.gz |
Reorganize public header files (part 1)
Rename <openssl/ossl_typ.h> to <openssl/types.h>.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9333)
39 files changed, 38 insertions, 38 deletions
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 <openssl/e_os2.h> -# include <openssl/ossl_typ.h> +# include <openssl/types.h> # include <openssl/bio.h> # include <openssl/x509.h> # include <openssl/conf.h> 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 <sys/types.h> #include <openssl/e_os2.h> -#include <openssl/ossl_typ.h> +#include <openssl/types.h> #include <stdarg.h> /* 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 <openssl/crmf.h> -# include <openssl/ossl_typ.h> +# include <openssl/types.h> # include <openssl/safestack.h> # include <openssl/x509.h> # include <openssl/x509v3.h> 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 <openssl/err.h> /* explicit #includes not strictly needed since implied by the above: */ -# include <openssl/ossl_typ.h> +# include <openssl/types.h> # include <openssl/safestack.h> # include <openssl/x509.h> # include <openssl/x509v3.h> 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 <stddef.h> -#include <openssl/ossl_typ.h> +#include <openssl/types.h> #include <openssl/evp.h> #include <openssl/core.h> #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 <openssl/ossl_typ.h> +#include <openssl/types.h> #include <openssl/core.h> 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 <openssl/err.h> #include <openssl/core.h> #include <openssl/core_names.h> -#include <openssl/ossl_typ.h> +#include <openssl/types.h> #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 <stdio.h> #include "internal/cryptlib.h" #include <openssl/conf.h> -#include <openssl/ossl_typ.h> +#include <openssl/types.h> #include <openssl/asn1.h> #include <openssl/asn1t.h> 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 <openssl/asn1.h> #include <openssl/x509.h> -#include <openssl/ossl_typ.h> +#include <openssl/types.h> #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 <openssl/ossl_typ.h> + #include <openssl/types.h> #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 <openssl/params.h> -#include <openssl/ossl_typ.h> +#include <openssl/types.h> #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 <openssl/asn1err.h> # include <openssl/symhacks.h> -# include <openssl/ossl_typ.h> +# include <openssl/types.h> # if !OPENSSL_API_1_1_0 # include <openssl/bn.h> # 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 <stdio.h> # endif # include <openssl/opensslconf.h> -# include <openssl/ossl_typ.h> +# include <openssl/types.h> # include <openssl/crypto.h> # include <openssl/bnerr.h> 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 <openssl/ossl_typ.h> +# include <openssl/types.h> # ifndef HEADER_CRYPTO_H # include <openssl/crypto.h> # 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 <openssl/cmp_util.h> /* explicit #includes not strictly needed since implied by the above: */ -# include <openssl/ossl_typ.h> +# include <openssl/types.h> # include <openssl/safestack.h> # include <openssl/x509.h> # include <openssl/x509v3.h> 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 <openssl/lhash.h> # include <openssl/safestack.h> # include <openssl/e_os2.h> -# include <openssl/ossl_typ.h> +# include <openssl/types.h> # include <openssl/conferr.h> #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 <stddef.h> -# include <openssl/ossl_typ.h> +# include <openssl/types.h> # 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 <openssl/x509v3.h> /* for GENERAL_NAME etc. */ /* explicit #includes not strictly needed since implied by the above: */ -# include <openssl/ossl_typ.h> +# include <openssl/types.h> # include <openssl/x509.h> # 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 <openssl/safestack.h> # include <openssl/opensslv.h> -# include <openssl/ossl_typ.h> +# include <openssl/types.h> # include <openssl/opensslconf.h> # include <openssl/cryptoerr.h> 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 <openssl/opensslconf.h> # ifndef OPENSSL_NO_CT -# include <openssl/ossl_typ.h> +# include <openssl/types.h> # include <openssl/safestack.h> # include <openssl/x509.h> # include <openssl/cterr.h> 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 <openssl/e_os2.h> # include <openssl/bio.h> # include <openssl/asn1.h> -# include <openssl/ossl_typ.h> +# include <openssl/types.h> # if !OPENSSL_API_1_1_0 # include <openssl/bn.h> # 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 <openssl/asn1.h> # include <openssl/bio.h> # include <openssl/crypto.h> -# include <openssl/ossl_typ.h> +# include <openssl/types.h> # include <openssl/bn.h> # if !OPENSSL_API_1_1_0 # include <openssl/dh.h> 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 <openssl/ui.h> # include <openssl/err.h> # endif -# include <openssl/ossl_typ.h> +# include <openssl/types.h> # include <openssl/symhacks.h> # include <openssl/x509.h> # include <openssl/engineerr.h> 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 <stdlib.h> # endif -# include <openssl/ossl_typ.h> +# include <openssl/types.h> # include <openssl/bio.h> # include <openssl/lhash.h> 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 <stdarg.h> # include <openssl/opensslconf.h> -# include <openssl/ossl_typ.h> +# include <openssl/types.h> # include <openssl/core.h> # include <openssl/symhacks.h> # include <openssl/bio.h> 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 <stdarg.h> # include <stddef.h> -# include <openssl/ossl_typ.h> +# include <openssl/types.h> # include <openssl/core.h> # 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 <stddef.h> -# include <openssl/ossl_typ.h> +# include <openssl/types.h> # 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 <openssl/ossl_typ.h> +# include <openssl/types.h> # include <openssl/x509.h> # include <openssl/x509v3.h> # include <openssl/safestack.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 <openssl/e_os2.h> # include <openssl/symhacks.h> -# include <openssl/ossl_typ.h> +# include <openssl/types.h> # include <openssl/pkcs7err.h> #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 <stdlib.h> -# include <openssl/ossl_typ.h> +# include <openssl/types.h> # include <openssl/e_os2.h> # include <openssl/randerr.h> 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 <time.h> -# include <openssl/ossl_typ.h> +# include <openssl/types.h> # include <openssl/obj_mac.h> /* 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 <openssl/asn1.h> # include <openssl/bio.h> # include <openssl/crypto.h> -# include <openssl/ossl_typ.h> +# include <openssl/types.h> # if !OPENSSL_API_1_1_0 # include <openssl/bn.h> # 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 <stdarg.h> -# include <openssl/ossl_typ.h> +# include <openssl/types.h> # include <openssl/pem.h> # include <openssl/storeerr.h> diff --git a/include/openssl/ossl_typ.h b/include/openssl/types.h index 70d9144ba1..70d9144ba1 100644 --- a/include/openssl/ossl_typ.h +++ b/include/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 <openssl/safestack.h> # include <openssl/pem.h> -# include <openssl/ossl_typ.h> +# include <openssl/types.h> # include <openssl/uierr.h> /* 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 <openssl/e_os2.h> -# include <openssl/ossl_typ.h> +# include <openssl/types.h> # include <openssl/symhacks.h> # include <openssl/buffer.h> # include <openssl/evp.h> 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 <openssl/core_numbers.h> -#include <openssl/ossl_typ.h> +#include <openssl/types.h> 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 <string.h> #include <openssl/provider.h> #include <openssl/params.h> -#include <openssl/ossl_typ.h> +#include <openssl/types.h> #include <openssl/core_names.h> #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 <stdlib.h> #include <openssl/opensslv.h> #include <openssl/ssl.h> -#include <openssl/ossl_typ.h> +#include <openssl/types.h> #include "crypto/dso_conf.h" typedef void DSO; |