Skip to content

Commit 20cb00a

Browse files
committed
Removed forward references to structs present elsewhere in the API.
1 parent 6027f21 commit 20cb00a

File tree

6 files changed

+21
-24
lines changed

6 files changed

+21
-24
lines changed

deimos/openssl/asn1.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ enum ub_email_address = 128;
291291
*/
292292
alias ASN1_TEMPLATE_st ASN1_TEMPLATE;
293293
alias ASN1_ITEM_st ASN1_ITEM;
294-
struct ASN1_TLC_st;
294+
import deimos.openssl.asn1t; /*struct ASN1_TLC_st;*/
295295
alias ASN1_TLC_st ASN1_TLC;
296296
/* This is just an opaque pointer */
297297
struct ASN1_VALUE_st;

deimos/openssl/crypto.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ enum V_CRYPTO_MDEBUG_ALL = (V_CRYPTO_MDEBUG_TIME | V_CRYPTO_MDEBUG_THREAD);
284284

285285

286286
/* predec of the BIO type */
287-
struct bio_st;
287+
import deimos.openssl.bio; /*struct bio_st;*/
288288
alias bio_st BIO_dummy;
289289

290290
struct crypto_ex_data_st

deimos/openssl/ec.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ module deimos.openssl.ec;
7878
import deimos.openssl._d_util;
7979

8080
public import deimos.openssl.opensslconf;
81-
import deimos.openssl.evp; // Needed for EVP_PKEY_ALG_CTRL.
81+
import deimos.openssl.evp; // Needed for EVP_PKEY_ALG_CTRL and ec_key_st.
8282

8383
version (OPENSSL_NO_EC) {
8484
static assert(false, "EC is disabled.");
@@ -690,7 +690,7 @@ int ECPKParameters_print_fp(FILE* fp, const(EC_GROUP)* x, int off);
690690
/* EC_KEY functions */
691691
/********************************************************************/
692692

693-
struct ec_key_st;
693+
/*struct ec_key_st;*/
694694
alias ec_key_st EC_KEY;
695695

696696
/* some values for the encoding_flag */

deimos/openssl/evp.d

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -849,17 +849,17 @@ int EVP_PKEY_assign(EVP_PKEY* pkey,int type,void* key);
849849
void* EVP_PKEY_get0(EVP_PKEY* pkey);
850850

851851
version(OPENSSL_NO_RSA) {} else {
852-
struct rsa_st;
852+
import deimos.openssl.rsa; /*struct rsa_st;*/
853853
int EVP_PKEY_set1_RSA(EVP_PKEY* pkey,rsa_st* key);
854854
rsa_st* EVP_PKEY_get1_RSA(EVP_PKEY* pkey);
855855
}
856856
version(OPENSSL_NO_DSA) {} else {
857-
struct dsa_st;
857+
import deimos.openssl.dsa; /*struct dsa_st;*/
858858
int EVP_PKEY_set1_DSA(EVP_PKEY* pkey,dsa_st* key);
859859
dsa_st* EVP_PKEY_get1_DSA(EVP_PKEY* pkey);
860860
}
861861
version(OPENSSL_NO_DH) {} else {
862-
struct dh_st;
862+
import deimos.openssl.dh; /*struct dh_st;*/
863863
int EVP_PKEY_set1_DH(EVP_PKEY* pkey,dh_st* key);
864864
dh_st* EVP_PKEY_get1_DH(EVP_PKEY* pkey);
865865
}

deimos/openssl/ossl_typ.d

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -139,22 +139,22 @@ alias evp_pkey_method_st EVP_PKEY_METHOD;
139139
struct evp_pkey_ctx_st;
140140
alias evp_pkey_ctx_st EVP_PKEY_CTX;
141141

142-
// import deimos.openssl.dh;
143-
struct dh_st;
142+
import deimos.openssl.dh;
143+
/*struct dh_st;*/
144144
alias dh_st DH;
145-
struct dh_method;
145+
/*struct dh_method;*/
146146
alias dh_method DH_METHOD;
147147

148-
// import deimos.openssl.dsa;
149-
struct dsa_st;
148+
import deimos.openssl.dsa;
149+
/*struct dsa_st;*/
150150
alias dsa_st DSA;
151-
struct dsa_method;
151+
/*struct dsa_method;*/
152152
alias dsa_method DSA_METHOD;
153153

154-
// import deimos.openssl.rsa;
155-
struct rsa_st;
154+
import deimos.openssl.rsa;
155+
/*struct rsa_st;*/
156156
alias rsa_st RSA;
157-
struct rsa_meth_st;
157+
/*struct rsa_meth_st;*/
158158
alias rsa_meth_st RSA_METHOD;
159159

160160
import deimos.openssl.rand;
@@ -176,10 +176,8 @@ alias x509_revoked_st X509_REVOKED;
176176
alias X509_name_st X509_NAME;
177177
alias X509_pubkey_st X509_PUBKEY;
178178
alias x509_store_st X509_STORE;
179-
struct x509_store_ctx_st;
179+
/*struct x509_store_ctx_st;*/
180180
alias x509_store_ctx_st X509_STORE_CTX;
181-
182-
// import deimos.openssl.pkcs12;
183181
alias pkcs8_priv_key_info_st PKCS8_PRIV_KEY_INFO;
184182

185183
import deimos.openssl.x509v3;
@@ -192,7 +190,6 @@ alias store_st STORE;
192190
struct store_method_st;
193191
alias store_method_st STORE_METHOD;
194192

195-
// import deimos.openssl.ui;
196193
struct ui_st;
197194
alias ui_st UI;
198195
struct ui_method_st;
@@ -235,9 +232,10 @@ alias typeof(*(ExternC!(void function(void* parent, void* ptr, CRYPTO_EX_DATA* a
235232
alias typeof(*(ExternC!(int function(CRYPTO_EX_DATA* to, CRYPTO_EX_DATA* from, void* from_d,
236233
int idx, c_long argl, void* argp))).init) CRYPTO_EX_dup;
237234

235+
import deimos.openssl.ocsp;
238236
struct ocsp_req_ctx_st;
239237
alias ocsp_req_ctx_st OCSP_REQ_CTX;
240-
struct ocsp_response_st;
238+
/*struct ocsp_response_st;*/
241239
alias ocsp_response_st OCSP_RESPONSE;
242-
struct ocsp_responder_id_st;
240+
/*struct ocsp_responder_id_st;*/
243241
alias ocsp_responder_id_st OCSP_RESPID;

deimos/openssl/ssl.d

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,8 +360,7 @@ alias X509_FILETYPE_PEM SSL_FILETYPE_PEM;
360360
* 'ssl_st* ' function parameters used to prototype callbacks
361361
* in SSL_CTX. */
362362
alias ssl_st* ssl_crock_st;
363-
// Just declared here because tls1.h has not been ported yet.
364-
struct tls_session_ticket_ext_st;
363+
import deimos.openssl.tls1;
365364
alias tls_session_ticket_ext_st TLS_SESSION_TICKET_EXT;
366365

367366
/* used to hold info on the particular ciphers used */

0 commit comments

Comments
 (0)