Merge pull request #73 from Geod24/ossl_typ

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

Author: CyberShadow

CONTRIBUTING.md

@@ -18,7 +18,7 @@ to match the C-headers version, in this case current version is 1.1.0h.
 2. Clone openssl with `git clone https://github.com/openssl/openssl` and
    checkout correct tag, example `cd openssl && git checkout OpenSSL_1_1_0h`.
 3. Headers with suffix ".h.in" need to be parsed to .h before generation,
-   Configure openssl with `./configure` and build generated file with 
+   Configure openssl with `./configure` and build generated file with
    `make build_generated`.
 
 ### Check dependencies
@@ -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.
@@ -63,7 +63,6 @@ Below is a checklist for common known issues which needs manual work:
    uplifted, a declaration sometimes need to be inserted to make it
    compile. It will result in "type missing "stack_st_...". Check in which
    header the macro `DEFINE_STACK_OF(<type>)` is defined in and manually add
-   `struct stack_st_<type-name>` to make it compile. However these functions 
+   `struct stack_st_<type-name>` to make it compile. However these functions
    will not work properly during linkage until `safestack.d` is uplifted,
    see macro `DEFINE_STACK_OF` in safestack.h.
-   

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;
 }

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;

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) */

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

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:

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 */

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; */
 

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; */
 

source/deimos/openssl/ecdh.d

@@ -21,7 +21,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer. 
+ *   notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *   notice, this list of conditions and the following disclaimer in
@@ -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;
 }
@@ -94,7 +94,7 @@ int 	  ECDH_set_method(EC_KEY*, const(ECDH_METHOD)*);
 int ECDH_compute_key(void* out_, size_t outlen, const(EC_POINT)* pub_key, EC_KEY* ecdh,
                      ExternC!(void* function(const(void)* in_, size_t inlen, void* out_, size_t* outlen)) KDF);
 
-int 	  ECDH_get_ex_new_index(c_long argl, void* argp, CRYPTO_EX_new 
+int 	  ECDH_get_ex_new_index(c_long argl, void* argp, CRYPTO_EX_new
 		*new_func, CRYPTO_EX_dup* dup_func, CRYPTO_EX_free* free_func);
 int 	  ECDH_set_ex_data(EC_KEY* d, int idx, void* arg);
 void* ECDH_get_ex_data(EC_KEY* d, int idx);