types: Move structs from specific module to types

Those structs were originally defined in specific modules (e.g. rsa)
and globally aliased to a public name in types (formerly ossl_typ).
Since the modules also depended on the public types, there was
a circular dependency: types import the struct to alias it,
and the module containing the struct imports types to use the alias.

The amount of circular dependency ended up confusing the frontend,
and now some new additions might fail (especially if in a `version` / `static if`).

Since those structs have all been deprecated, and the public name is opaque,
they are not needed after OpenSSL 1.1.0 anyway.
And since the `types` module is publicly imported everywhere, moving the struct
definition will simplify the dependency tree, at the expense of making the struct
definition most widely available.

Author: Geod24

source/deimos/openssl/bn.d

@@ -310,66 +310,6 @@ void BN_with_flags()(BIGNUM* dest, BIGNUM* b, int n) {
 		| n;
 }
 
-/* Already declared in types.h */
-version (none) {
-alias bignum_st BIGNUM;
-/* Used for temp variables (declaration hidden in bn_lcl.h) */
-alias bignum_ctx BN_CTX;
-alias bn_blinding_st BN_BLINDING;
-alias bn_mont_ctx_st BN_MONT_CTX;
-alias bn_recp_ctx_st BN_RECP_CTX;
-alias bn_gencb_st BN_GENCB;
-}
-
-struct bignum_st
-	{
-	BN_ULONG* d;	/* Pointer to an array of 'BN_BITS2' bit chunks. */
-	int top;	/* Index of last used d +1. */
-	/* The next are internal book keeping for bn_expand. */
-	int dmax;	/* Size of the d array. */
-	int neg;	/* one if the number is negative */
-	int flags;
-	};
-
-/* Used for montgomery multiplication */
-struct bn_mont_ctx_st
-	{
-	int ri;        /* number of bits in R */
-	BIGNUM RR;     /* used to convert to montgomery form */
-	BIGNUM N;      /* The modulus */
-	BIGNUM Ni;     /* R*(1/R mod N) - N*Ni = 1
-	                * (Ni is only stored for bignum algorithm) */
-	BN_ULONG[2] n0;/* least significant word(s) of Ni;
-	                  (type changed with 0.9.9, was "BN_ULONG n0;" before) */
-	int flags;
-	};
-
-/* Used for reciprocal division/mod functions
- * It cannot be shared between threads
- */
-struct bn_recp_ctx_st
-	{
-	BIGNUM N;	/* the divisor */
-	BIGNUM Nr;	/* the reciprocal */
-	int num_bits;
-	int shift;
-	int flags;
-	};
-
-/* Used for slow "generation" functions. */
-struct bn_gencb_st
-	{
-	uint ver;	/* To handle binary (in)compatibility */
-	void* arg;		/* callback-specific data */
-	union cb_
-		{
-		/* if(ver==1) - handles old style callbacks */
-		ExternC!(void function(int, int, void*)) cb_1;
-		/* if(ver==2) - new callback style */
-		ExternC!(int function(int, int, BN_GENCB*)) cb_2;
-		}
-	cb_ cb;
-	};
 /* Wrapper function to make using BN_GENCB easier,  */
 int BN_GENCB_call(BN_GENCB* cb, int a, int b);
 /* Macro to populate a BN_GENCB structure with an "old"-style callback */

source/deimos/openssl/buffer.d

@@ -67,19 +67,8 @@ nothrow:
 
 import core.stdc.config;
 
-//#if !defined(NO_SYS_TYPES_H)
-//#include <sys/types.h>
-//#endif
-
-/* Already declared in types.h */
-/* typedef buf_mem_st BUF_MEM; */
-
-struct buf_mem_st
-	{
-	size_t length;	/* current number of bytes */
-	char* data;
-	size_t max;	/* size of buffer */
-	};
+// Without this, the frontend is unaware of types defined in `static if`.
+private enum avoidDMDIssue16666 = __traits(allMembers, deimos.openssl.types);
 
 BUF_MEM* BUF_MEM_new();
 void	BUF_MEM_free(BUF_MEM* a);

source/deimos/openssl/evp.d

@@ -76,67 +76,11 @@ alias EVP_PKEY_CMAC = NID_cmac;
 extern (C):
 nothrow:
 
-/* Type needs to be a bit field
- * Sub-type needs to be for variations on the method, as in_, can it do
- * arbitrary encryption.... */
-struct evp_pkey_st
-	{
-	int type;
-	int save_type;
-	int references;
-	const(EVP_PKEY_ASN1_METHOD)* ameth;
-	ENGINE* engine;
-	union pkey_ {
-		char* ptr;
-version(OPENSSL_NO_RSA) {} else {
-		RSA* rsa;	/* RSA */
-}
-version(OPENSSL_NO_DSA) {} else {
-		dsa_st* dsa;	/* DSA */
-}
-version(OPENSSL_NO_DH) {} else {
-		dh_st* dh;	/* DH */
-}
-version(OPENSSL_NO_EC) {} else {
-		ec_key_st* ec;	/* ECC */
-}
-		}
-	pkey_ pkey;
-	int save_parameters;
-	STACK_OF!(X509_ATTRIBUTE) *attributes; /* [ 0 ] */
-	} /* EVP_PKEY */;
-
 enum EVP_PKEY_MO_SIGN = 0x0001;
 enum EVP_PKEY_MO_VERIFY = 0x0002;
 enum EVP_PKEY_MO_ENCRYPT = 0x0004;
 enum EVP_PKEY_MO_DECRYPT = 0x0008;
 
-// #ifndef EVP_MD
-struct env_md_st
-	{
-	int type;
-	int pkey_type;
-	int md_size;
-	c_ulong flags;
-	ExternC!(int function(EVP_MD_CTX* ctx)) init_;
-	ExternC!(int function(EVP_MD_CTX* ctx,const(void)* data,size_t count)) update;
-	ExternC!(int function(EVP_MD_CTX* ctx,ubyte* md)) final_;
-	ExternC!(int function(EVP_MD_CTX* to,const(EVP_MD_CTX)* from)) copy;
-	ExternC!(int function(EVP_MD_CTX* ctx)) cleanup;
-
-	/* FIXME: prototype these some day */
-	ExternC!(int function(int type, const(ubyte)* m, uint m_length,
-		    ubyte* sigret, uint* siglen, void* key)) sign;
-	ExternC!(int function(int type, const(ubyte)* m, uint m_length,
-		      const(ubyte)* sigbuf, uint siglen,
-		      void* key)) verify;
-	int[5] required_pkey_type; /*EVP_PKEY_xxx */
-	int block_size;
-	int ctx_size; /* how big does the ctx->md_data need to be */
-	/* control function */
-	ExternC!(int function(EVP_MD_CTX* ctx, int cmd, int p1, void* p2)) md_ctrl;
-	} /* EVP_MD */;
-
 alias evp_sign_method = typeof(*(ExternC!(int function(int type,const(ubyte)* m,
 			    uint m_length,ubyte* sigret,
 			    uint* siglen, void* key))).init);
@@ -214,18 +158,6 @@ version (OPENSSL_NO_RSA) {
 
 // #endif /* !EVP_MD */
 
-struct env_md_ctx_st
-	{
-	const(EVP_MD)* digest;
-	ENGINE* engine; /* functional reference if 'digest' is ENGINE-provided */
-	c_ulong flags;
-	void* md_data;
-	/* Public key context for sign/verify */
-	EVP_PKEY_CTX* pctx;
-	/* Update function: usually copied from EVP_MD */
-	ExternC!(int function(EVP_MD_CTX* ctx,const(void)* data,size_t count)) update;
-	} /* EVP_MD_CTX */;
-
 /* values for EVP_MD_CTX flags */
 
 enum EVP_MD_CTX_FLAG_ONESHOT = 0x0001; /* digest update will be called
@@ -252,25 +184,6 @@ enum EVP_MD_CTX_FLAG_PAD_PSS = 0x20;	/* PSS mode */
 
 enum EVP_MD_CTX_FLAG_NO_INIT = 0x0100; /* Don't initialize md_data */
 
-struct evp_cipher_st
-	{
-	int nid;
-	int block_size;
-	int key_len;		/* Default value for variable length ciphers */
-	int iv_len;
-	c_ulong flags;	/* Various flags */
-	ExternC!(int function(EVP_CIPHER_CTX* ctx, const(ubyte)* key,
-		    const(ubyte)* iv, int enc)) init_;	/* init key */
-	ExternC!(int function(EVP_CIPHER_CTX* ctx, ubyte* out_,
-			 const(ubyte)* in_, size_t inl)) do_cipher;/* encrypt/decrypt data */
-	ExternC!(int function(EVP_CIPHER_CTX*)) cleanup; /* cleanup ctx */
-	int ctx_size;		/* how big ctx->cipher_data needs to be */
-	ExternC!(int function(EVP_CIPHER_CTX*, ASN1_TYPE*)) set_asn1_parameters; /* Populate a ASN1_TYPE with parameters */
-	ExternC!(int function(EVP_CIPHER_CTX*, ASN1_TYPE*)) get_asn1_parameters; /* Get parameters from a ASN1_TYPE */
-	ExternC!(int function(EVP_CIPHER_CTX*, int type, int arg, void* ptr)) ctrl; /* Miscellaneous operations */
-	void* app_data;		/* Application data */
-	} /* EVP_CIPHER */;
-
 /* Values for cipher flags */
 
 /* Modes for ciphers */

source/deimos/openssl/hmac.d

@@ -72,15 +72,21 @@ enum HMAC_MAX_MD_CBLOCK = 128;	/* largest known is SHA512 */
 extern (C):
 nothrow:
 
-struct hmac_ctx_st {
-	const(EVP_MD)* md;
-	EVP_MD_CTX md_ctx;
-	EVP_MD_CTX i_ctx;
-	EVP_MD_CTX o_ctx;
-	uint key_length;
-	ubyte[HMAC_MAX_MD_CBLOCK] key;
+static if (OPENSSL_VERSION_BEFORE(1, 1, 0))
+{
+	struct hmac_ctx_st {
+		const(EVP_MD)* md;
+		EVP_MD_CTX md_ctx;
+		EVP_MD_CTX i_ctx;
+		EVP_MD_CTX o_ctx;
+		uint key_length;
+		ubyte[HMAC_MAX_MD_CBLOCK] key;
 	}
-alias hmac_ctx_st HMAC_CTX;
+
+	alias HMAC_CTX = hmac_ctx_st;
+}
+else
+	struct HMAC_CTX;
 
 auto HMAC_size()(HMAC_CTX* e) { return EVP_MD_size(e.md); }
 

source/deimos/openssl/pem.d

@@ -139,14 +139,19 @@ enum PEM_STRING_ECPRIVATEKEY = "EC PRIVATE KEY";
 enum PEM_STRING_PARAMETERS = "PARAMETERS";
 enum PEM_STRING_CMS = "CMS";
 
+static if (OPENSSL_VERSION_BEFORE(1, 1, 0))
+{
   /* Note that this structure is initialised by PEM_SealInit and cleaned up
-     by PEM_SealFinal (at least for now) */
-struct PEM_Encode_Seal_st {
-	EVP_ENCODE_CTX encode;
-	EVP_MD_CTX md;
-	EVP_CIPHER_CTX cipher;
+	 by PEM_SealFinal (at least for now) */
+	struct PEM_Encode_Seal_st {
+		EVP_ENCODE_CTX encode;
+		EVP_MD_CTX md;
+		EVP_CIPHER_CTX cipher;
 	}
-alias PEM_Encode_Seal_st PEM_ENCODE_SEAL_CTX;
+	alias PEM_Encode_Seal_st PEM_ENCODE_SEAL_CTX;
+}
+else
+	struct PEM_ENCODE_SEAL_CTX;
 
 /* enc_type is one off */
 enum PEM_TYPE_ENCRYPTED = 10;