Manual patching required after generating x509v3.d

* struct definitions removed from x509v3 are instead added as declarations in ossl_typ.
* imports translated according to #include's in header-file, dstep doesn't resolve imports.
* macros used as function aliasesas without argument list are incorrectly generated into enum types.
* "#ifndef OPENSSL_NO_*" translated into "version".

Author: 1nfiniteloop

deimos/openssl/conf.d

@@ -78,6 +78,8 @@ struct CONF_VALUE
 	char* value;
 	}
 
+struct lhash_st_CONF_VALUE;     // declare type to make it compile, needed until this module and lhash.d is uplifted to >= 1.1.0h and supports "DEFINE_LHASH_OF"
+
 /+mixin DECLARE_STACK_OF!(CONF_VALUE);+/
 mixin DECLARE_LHASH_OF!(CONF_VALUE);
 

deimos/openssl/crypto.d

@@ -142,6 +142,9 @@ public import deimos.openssl.symhacks;
 extern (C):
 nothrow:
 
+alias OPENSSL_buf2hexstr = char* function(const ubyte*, long);
+alias OPENSSL_hexstr2buf = ubyte* function(const char*, long*);
+
 /* Backward compatibility to SSLeay */
 /* This is more to be used to check the correct DLL is being used
  * in the MS world. */

deimos/openssl/safestack.d

@@ -126,6 +126,8 @@ mixin DECLARE_SPECIAL_STACK_OF!(OPENSSL_STRING, char);
  * nul-terminated. These should also be distinguished from "normal"
  * stacks. */
 
+struct stack_st_OPENSSL_STRING;  // declare type to make it compile, needed until this module is uplifted to >= 1.1.0h and supports "DECLARE_SPECIAL_STACK_OF"
+
 alias void* OPENSSL_BLOCK;
 mixin DECLARE_SPECIAL_STACK_OF!(OPENSSL_BLOCK, void);
 /* SKM_sk_... stack macros are internal to safestack.h:

deimos/openssl/x509.d

@@ -831,10 +831,11 @@ mixin(DECLARE_ASN1_FUNCTIONS!"X509_ATTRIBUTE");
 X509_ATTRIBUTE* X509_ATTRIBUTE_create(int nid, int atrtype, void* value);
 
 mixin(DECLARE_ASN1_FUNCTIONS!"X509_EXTENSION");
+struct stack_st_X509_EXTENSION;     // declare type to make it compile, needed until this module is uplifted to >= 1.1.0h and expands macro "DEFINE_STACK_OF(X509_EXTENSION)"
 mixin(DECLARE_ASN1_ENCODE_FUNCTIONS!("X509_EXTENSIONS", "X509_EXTENSIONS", "X509_EXTENSIONS"));
 
 mixin(DECLARE_ASN1_FUNCTIONS!"X509_NAME_ENTRY");
-
+struct stack_st_X509_NAME_ENTRY;    // declare type to make it compile, needed until this module is uplifted to >= 1.1.0h and expands macro "DEFINE_STACK_OF(X509_NAME_ENTRY)"
 mixin(DECLARE_ASN1_FUNCTIONS!"X509_NAME");
 
 int		X509_NAME_set(X509_NAME** xn, X509_NAME* name);

deimos/openssl/x509v3.d

@@ -7,11 +7,19 @@
  * https://www.openssl.org/source/license.html
  */
 
-import core.stdc.config;
-import core.stdc.stdio;
-import core.sys.posix.sched;
+module deimos.openssl.x509v3;
+
+import deimos.openssl._d_util;
+import deimos.openssl.crypto:OPENSSL_buf2hexstr, OPENSSL_hexstr2buf;
+import deimos.openssl.asn1:ASN1_OBJECT;
+
+public import deimos.openssl.bio;
+public import deimos.openssl.x509;
+public import deimos.openssl.conf;
+
 
 extern (C):
+nothrow:
 
 /* Forward reference */
 
@@ -1126,8 +1134,8 @@ int X509V3_add1_i2d(
     c_ulong flags);
 
 /* The new declarations are in crypto.h, but the old ones were here. */
-enum hex_to_string = OPENSSL_buf2hexstr;
-enum string_to_hex = OPENSSL_hexstr2buf;
+alias hex_to_string = OPENSSL_buf2hexstr;
+alias string_to_hex = OPENSSL_hexstr2buf;
 
 void X509V3_EXT_val_prn(
     BIO* out_,
@@ -1136,7 +1144,9 @@ void X509V3_EXT_val_prn(
     int ml);
 int X509V3_EXT_print(BIO* out_, X509_EXTENSION* ext, c_ulong flag, int indent);
 
+version(OPENSSL_NO_STDIO) {} else {
 int X509V3_EXT_print_fp(FILE* out_, X509_EXTENSION* ext, int flag, int indent);
+}
 
 int X509V3_extensions_print(
     BIO* out_,
@@ -1251,6 +1261,7 @@ stack_st_X509_POLICY_NODE* sk_X509_POLICY_NODE_dup(const(stack_st_X509_POLICY_NO
 stack_st_X509_POLICY_NODE* sk_X509_POLICY_NODE_deep_copy(const(stack_st_X509_POLICY_NODE)* sk, sk_X509_POLICY_NODE_copyfunc copyfunc, sk_X509_POLICY_NODE_freefunc freefunc);
 sk_X509_POLICY_NODE_compfunc sk_X509_POLICY_NODE_set_cmp_func(stack_st_X509_POLICY_NODE* sk, sk_X509_POLICY_NODE_compfunc compare);
 
+version(OPENSSL_NO_RFC3779) {} else {
 struct ASRange_st
 {
     ASN1_INTEGER* min;
@@ -1561,7 +1572,7 @@ int X509v3_addr_validate_resource_set(
     IPAddrBlocks* ext,
     int allow_inheritance);
 
-/* OPENSSL_NO_RFC3779 */
+}  /* OPENSSL_NO_RFC3779 */
 
 /* BEGIN ERROR CODES */
 /*