Rename deimos.openssl.ossl_typ to [...].types

Geod24 · Geod24 · commit 5df56e156b27 · 2022-05-30T13:38:50.000+02:00
Follow the upstream change and use the new name,
as well as providing a compatibility module.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -51,9 +51,9 @@ Below is a checklist for common known issues which needs manual work:
    compilation error similar to "missing argument for parameter #1".
    Replace "enum" with "alias" accordingly.
 3. Many struct definitions is removed, instead a declaration ia added into
-   `ossl_typ.d`, Example `grep -r 'struct X509_pubkey_st' C/` shows that struct
+   `types.d`, Example `grep -r 'struct X509_pubkey_st' C/` shows that struct
    definition is removed from `x509.h` and instead a declaration is added in
-   `ossl_typ.h`. Other types might be removed, check the header-file and adjust
+   `types.h`. Other types might be removed, check the header-file and adjust
    accordingly if the type is missing when compiling.
 4. Check the header-file for "ifdef|ifndef", search for "OPENSSL_*" where some
    statements has historically been translated into "version" in d-modules.
diff --git a/source/deimos/openssl/asn1.d b/source/deimos/openssl/asn1.d
@@ -72,7 +72,7 @@ public import deimos.openssl.safestack;
 
 public import deimos.openssl.symhacks;
 
-public import deimos.openssl.ossl_typ;
+public import deimos.openssl.types;
 version(OPENSSL_NO_DEPRECATED) {} else {
 public import deimos.openssl.bn;
 }
diff --git a/source/deimos/openssl/asn1t.d b/source/deimos/openssl/asn1t.d
@@ -59,7 +59,7 @@ module deimos.openssl.asn1t;
 
 import deimos.openssl._d_util;
 
-import deimos.openssl.ossl_typ; // Needed for ASN1_BOOLEAN, etc.
+import deimos.openssl.types; // Needed for ASN1_BOOLEAN, etc.
 
 import core.stdc.config;
 public import deimos.openssl.e_os2;
diff --git a/source/deimos/openssl/bn.d b/source/deimos/openssl/bn.d
@@ -130,7 +130,7 @@ public import deimos.openssl.e_os2;
 version(OPENSSL_NO_FP_API) {} else {
 import core.stdc.stdio; /* FILE */
 }
-public import deimos.openssl.ossl_typ;
+public import deimos.openssl.types;
 public import deimos.openssl.crypto;
 
 extern (C):
@@ -310,7 +310,7 @@ void BN_with_flags()(BIGNUM* dest, BIGNUM* b, int n) {
 		| n;
 }
 
-/* Already declared in ossl_typ.h */
+/* Already declared in types.h */
 version (none) {
 alias bignum_st BIGNUM;
 /* Used for temp variables (declaration hidden in bn_lcl.h) */
diff --git a/source/deimos/openssl/buffer.d b/source/deimos/openssl/buffer.d
@@ -60,7 +60,7 @@ module deimos.openssl.buffer;
 
 import deimos.openssl._d_util;
 
-public import deimos.openssl.ossl_typ;
+public import deimos.openssl.types;
 
 extern (C):
 nothrow:
@@ -71,7 +71,7 @@ import core.stdc.config;
 //#include <sys/types.h>
 //#endif
 
-/* Already declared in ossl_typ.h */
+/* Already declared in types.h */
 /* typedef buf_mem_st BUF_MEM; */
 
 struct buf_mem_st
diff --git a/source/deimos/openssl/conf.d b/source/deimos/openssl/conf.d
@@ -66,7 +66,7 @@ public import deimos.openssl.stack;
 public import deimos.openssl.safestack;
 public import deimos.openssl.e_os2;
 
-public import deimos.openssl.ossl_typ;
+public import deimos.openssl.types;
 
 extern (C):
 nothrow:
diff --git a/source/deimos/openssl/crypto.d b/source/deimos/openssl/crypto.d
@@ -129,7 +129,7 @@ import core.stdc.stdio;
 public import deimos.openssl.stack;
 public import deimos.openssl.safestack;
 public import deimos.openssl.opensslv;
-public import deimos.openssl.ossl_typ;
+public import deimos.openssl.types;
 
 version (CHARSET_EBCDIC) {
 public import deimos.openssl.ebcdic;
@@ -156,7 +156,7 @@ enum SSLEAY_BUILT_ON = 3;
 enum SSLEAY_PLATFORM = 4;
 enum SSLEAY_DIR = 5;
 
-/* Already declared in ossl_typ.h */
+/* Already declared in types.h */
 /+#if 0
 alias crypto_ex_data_st CRYPTO_EX_DATA;
 /* Called when a new object is created */
diff --git a/source/deimos/openssl/dh.d b/source/deimos/openssl/dh.d
@@ -71,7 +71,7 @@ version (OPENSSL_NO_DH) {
 version(OPENSSL_NO_BIO) {} else {
 public import deimos.openssl.bio;
 }
-public import deimos.openssl.ossl_typ;
+public import deimos.openssl.types;
 version(OPENSSL_NO_DEPRECATED) {} else {
 public import deimos.openssl.bn;
 }
@@ -107,7 +107,7 @@ enum DH_FLAG_NON_FIPS_ALLOW = 0x0400;
 extern (C):
 nothrow:
 
-/* Already defined in ossl_typ.h */
+/* Already defined in types.h */
 /* typedef dh_st DH; */
 /* typedef dh_method DH_METHOD; */
 
diff --git a/source/deimos/openssl/dsa.d b/source/deimos/openssl/dsa.d
@@ -78,7 +78,7 @@ version(OPENSSL_NO_BIO) {} else {
 public import deimos.openssl.bio;
 }
 public import deimos.openssl.crypto;
-public import deimos.openssl.ossl_typ;
+public import deimos.openssl.types;
 
 version(OPENSSL_NO_DEPRECATED) {} else {
 public import deimos.openssl.bn;
@@ -118,7 +118,7 @@ enum DSA_FLAG_NON_FIPS_ALLOW = 0x0400;
 extern (C):
 nothrow:
 
-/* Already defined in ossl_typ.h */
+/* Already defined in types.h */
 /* typedef dsa_st DSA; */
 /* typedef dsa_method DSA_METHOD; */
 
diff --git a/source/deimos/openssl/ecdh.d b/source/deimos/openssl/ecdh.d
@@ -77,7 +77,7 @@ version (OPENSSL_NO_ECDH) {
 }
 
 public import deimos.openssl.ec;
-public import deimos.openssl.ossl_typ;
+public import deimos.openssl.types;
 version(OPENSSL_NO_DEPRECATED) {} else {
 public import deimos.openssl.bn;
 }
diff --git a/source/deimos/openssl/ecdsa.d b/source/deimos/openssl/ecdsa.d
@@ -67,7 +67,7 @@ version (OPENSSL_NO_ECDSA) {
 }
 
 public import deimos.openssl.ec;
-public import deimos.openssl.ossl_typ;
+public import deimos.openssl.types;
 version(OPENSSL_NO_DEPRECATED) {} else {
 public import deimos.openssl.bn;
 }
diff --git a/source/deimos/openssl/engine.d b/source/deimos/openssl/engine.d
@@ -93,7 +93,7 @@ public import deimos.openssl.ui;
 public import deimos.openssl.err;
 }
 
-public import deimos.openssl.ossl_typ;
+public import deimos.openssl.types;
 import deimos.openssl.ssl : SSL;
 public import deimos.openssl.symhacks;
 
diff --git a/source/deimos/openssl/err.d b/source/deimos/openssl/err.d
@@ -120,7 +120,7 @@ import core.stdc.stdio;
 import core.stdc.stdlib;
 }
 
-public import deimos.openssl.ossl_typ;
+public import deimos.openssl.types;
 version(OPENSSL_NO_BIO) {} else {
 public import deimos.openssl.bio;
 }
@@ -381,7 +381,7 @@ int ERR_get_next_error_library();
 int ERR_set_mark();
 int ERR_pop_to_mark();
 
-/* Already defined in ossl_typ.h */
+/* Already defined in types.h */
 /* typedef st_ERR_FNS ERR_FNS; */
 /* An application can use this function and provide the return value to loaded
  * modules that should use the application's ERR state/functionality */
diff --git a/source/deimos/openssl/evp.d b/source/deimos/openssl/evp.d
@@ -70,7 +70,7 @@ public import deimos.openssl.opensslconf;
 //# undef OPENSSL_ALGORITHM_DEFINES
 //#endif
 
-public import deimos.openssl.ossl_typ;
+public import deimos.openssl.types;
 
 public import deimos.openssl.symhacks;
 
diff --git a/source/deimos/openssl/kssl.d b/source/deimos/openssl/kssl.d
@@ -72,7 +72,7 @@ import core.stdc.stdio;
 // #include <krb5.h>
 // #ifdef OPENSSL_SYS_WIN32
 // /* These can sometimes get redefined indirectly by krb5 header files
-//  * after they get undefed in ossl_typ.h
+//  * after they get undefed in types.h
 // */
 // #undef X509_NAME
 // #undef X509_EXTENSIONS
diff --git a/source/deimos/openssl/ocsp.d b/source/deimos/openssl/ocsp.d
@@ -65,7 +65,7 @@ module deimos.openssl.ocsp;
 
 import deimos.openssl._d_util;
 
-public import deimos.openssl.ossl_typ;
+public import deimos.openssl.types;
 public import deimos.openssl.x509;
 public import deimos.openssl.x509v3;
 public import deimos.openssl.safestack;
diff --git a/source/deimos/openssl/ossl_typ.d b/source/deimos/openssl/ossl_typ.d
diff --git a/source/deimos/openssl/pkcs7.d b/source/deimos/openssl/pkcs7.d
diff --git a/source/deimos/openssl/rand.d b/source/deimos/openssl/rand.d
diff --git a/source/deimos/openssl/rsa.d b/source/deimos/openssl/rsa.d
diff --git a/source/deimos/openssl/types.d b/source/deimos/openssl/types.d
diff --git a/source/deimos/openssl/ui.d b/source/deimos/openssl/ui.d
diff --git a/source/deimos/openssl/x509.d b/source/deimos/openssl/x509.d

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public import deimos.openssl.safestack;`
`72`	`72`
`73`	`73`	`public import deimos.openssl.symhacks;`
`74`	`74`
`75`		`-public import deimos.openssl.ossl_typ;`
	`75`	`+public import deimos.openssl.types;`
`76`	`76`	`version(OPENSSL_NO_DEPRECATED) {} else {`
`77`	`77`	`public import deimos.openssl.bn;`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ version (OPENSSL_NO_ECDH) {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`public import deimos.openssl.ec;`
`80`		`-public import deimos.openssl.ossl_typ;`
	`80`	`+public import deimos.openssl.types;`
`81`	`81`	`version(OPENSSL_NO_DEPRECATED) {} else {`
`82`	`82`	`public import deimos.openssl.bn;`
`83`	`83`	`}`