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)

diff --git a/apps/include/apps.h b/apps/include/apps.h
index 8b28d749e93626a0ff3108e6d4ed478b7ac2a981..b2151e9ebd34b5b15282f7228fb2406c1a37c8d7 100644 (file)
--- 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 92a7fd1d820ada0f8274aba02bf23d45d805eb9e..9415dd797b2b19d0a420ba0e22467c025dce1ca0 100644 (file)
--- 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 1f47dca0d0d36d63c8153a6941d72f12a3a401d6..48734649a0f453cdf7f25c17f3b89836cf9bf061 100644 (file)
--- 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 54f9a4a225beb53c841ca39dbd6dc95195a3b2e1..0eba3a15c81a3ec9ee8483ae517ab80f6c5c5c21 100644 (file)
--- 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 5aa1319ce1554d5cc8ca984b3388282d11462ad9..e15b8e26be34b903fc6fbe08350eac2a5ed527d7 100644 (file)
--- 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 116c8e6ce0d10ac360de41ce2a98c70a7526738a..ec0f823bd5168765f8da6950b591a336aa250193 100644 (file)
--- 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 1d6214c8a654a451da85da94ea9563e2455de0a5..8b8c9a506726f1a1d50bb224881aaba6720db7b6 100644 (file)
--- 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 d6e4bc4166d957efed2076009fb695756e546ece..104b58f25992ab717e012f43ff04808ac1d6de62 100644 (file)
--- 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 71db99590b6aa826b0ff60a8d27a513312dfe3c2..05e7f7e29e8be17079aee6a25a3605548ce3e26f 100644 (file)
--- 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 11eb1484d76c60c2e6a96151cccaecd2bb010807..6fd7c6336e4f9da7b3544ebef651f46dc5df18d6 100644 (file)
--- 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 bb96ba98e01c0ce1e5bd4042ff8774936f6e4191..a5297b843d126d8dab96f1c961a7547965af1a5a 100644 (file)
--- 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 3268db17447aa10d884c0d33ae5f58bc0c7d5839..ca00430eaf451f578a22ea4b34697abec551b477 100644 (file)
--- 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 ca92c0e40885994beabb8f365c3bbf69564cb83d..02444422dff16bedd6bd8f9d682d733429ea9448 100644 (file)
--- 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 14137263830f1a11a2b68f99f93f6f4db1e92834..39e34d996e59b1dd17571e734b2dea93d9d587fb 100644 (file)
--- 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 1a628dbd62503628da5f599e7b76470f7c4501e1..daffc2996accf5131ccd6e306e32fd5ff22e3190 100644 (file)
--- 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 49d637b7ce838c4a6c666bb71f3d2897e99244a5..ed10412367f200dcf3d67c2f72d71cce917b5480 100644 (file)
--- 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 43e9d0a6bce2c625c8e19c6e3d335f1e3bb39ece..d07a2accfd7b2b1ed688df568b4b41fda6a17e40 100644 (file)
--- 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 1e34e56996c421b86c0312a86672ef42488f7626..7490a1d87a8f6fbb352a684b1dc93d929d556b53 100644 (file)
--- 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 60aca02849bde0da1529b11cff6ebbf64e57e7e9..5cdb83107e6e1b27248ff01f2af26c7aa42e3782 100644 (file)
--- 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 76f566304ee4e66b4e01c080443115077d81bcd8..940e66c9a866757c355a32f9a1f6780542cd5006 100644 (file)
--- 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 4e117a0d038b6dce3fb3f47de1aa1635020c99e1..1b9d2163fdf005d53629206d09a8602ad4cd9001 100644 (file)
--- 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 38ae977fc6263d958fd49e6b6f752e4305dfb2d5..32d6a7d42050ff0ca437ddd8358b9b91579928dd 100644 (file)
--- 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 92d49e343ad5894127685b6c84ee388d9600b06d..8a2b96f4e3bb0694d21ade7cb7b95d35abf2c3cd 100644 (file)
--- 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 5c647831b5203f7138ff2d7ea15be96c5ad16179..6f75b3265482e60f99cab9e54fe1737a6d5f33ea 100644 (file)
--- 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 b65328df6d81cc28330b0ff572b76503461ba321..2d9dcb765ef47000a1a49263eaf185447652acd2 100644 (file)
--- 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 a9ea768d1d5e429d06f84a0486d0db6e418c915b..5568c4f26889a03f93df9830f1b21e477e400283 100644 (file)
--- 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 212c846fd8a39ea536de3eafcd692fafaaaaf741..7465c71ba823448a96820b6a2b3883ecbf3e8785 100644 (file)
--- 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 3a37f613ed945705794ced85e07e3f6f0ee1ad98..e427325870928e54a7d510ecbfaa9c0ba4187f8c 100644 (file)
--- 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 5dec27fc8eb6d2245e10d8fd038113bbdedbe4e0..682c3404c4a2e9025ee4b1ef583532e0886376fd 100644 (file)
--- 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 974fd2e5c3c9c8979cf9a19980fcf66f9916e2d7..05ea8a7f8e55de8cf845ec56593011870bc3a388 100644 (file)
--- 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 4e99d71a1d3ef4203eda9e4be02c5d1cca9fe5b5..984c40df91e5531b79dcd59d50138adebff82132 100644 (file)
--- 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 6b681f4ef5fde64b1467c15e5ecdb1ecc347708d..8750e19ab92be942fef0a450a56afccc90710f13 100644 (file)
--- 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 9200fd0ce868eec65d067ec25830794ede68d9f4..0d750351dac7d09d973e07c9d356d89cf931dd4b 100644 (file)
--- 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
similarity index 100%
rename from include/openssl/ossl_typ.h
rename to include/openssl/types.h

diff --git a/include/openssl/ui.h b/include/openssl/ui.h
index 4ae06e96739fe6769f66718d4449dc9d59f78718..5901d232084e2d334b236de0d78231776bc77488 100644 (file)
--- 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 d2466f29726db39bdfe3dd861f60b1deb408e1e6..89ec365c6a0ca9ba50fbafecb68b8e90da38620a 100644 (file)
--- 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 3e97e0d786d35bedd13923ede64ebb87b2d93fcc..230d448b1d700ccc1c6aefb8074ed65268ed2b19 100644 (file)
--- 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 d1c2f26bdc184b41eed555974e631ff88eef427a..f8c492297ec9ea4de46d260c913813d3c8949c6f 100644 (file)
--- 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 84d90daeebfa0a95020c45e4884098a2a95d5ad0..bbac99674e41ea13772e0ae2286b15d5391f0bdd 100644 (file)
--- 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;