Skip to content

Commit 7d67f7f

Browse files
CyberShadowCyberShadow
committed
deimos.openssl: Use template functions for macros
Fix remaining non-template D functions which should have been template functions.
1 parent f2f8f4a commit 7d67f7f

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

‎source/deimos/openssl/dsa.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ static if (OPENSSL_VERSION_BEFORE(1, 1, 0))
225225
}
226226
else
227227
{
228-
auto DSA_get_ex_new_index(c_long l, void* p, CRYPTO_EX_new* newf,
228+
auto DSA_get_ex_new_index()(c_long l, void* p, CRYPTO_EX_new* newf,
229229
CRYPTO_EX_dup* dupf, CRYPTO_EX_free* freef)
230230
{
231231
return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_DSA, l, p, newf, dupf, freef);

‎source/deimos/openssl/opensslv.d

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ enum OPENSSL_VERSION_PATCH = OpenSSLVersion.patch;
122122

123123
enum OPENSSL_VERSION_BUILD = OpenSSLVersion.build;
124124

125-
int OPENSSL_MAKE_VERSION(int major, int minor, int patch, int build)
125+
int OPENSSL_MAKE_VERSION()(int major, int minor, int patch, int build)
126126
{
127127
return (major << 28) | (minor << 20) | (patch << 12) | (build << 4) | 0xf;
128128
}
@@ -131,12 +131,12 @@ enum OPENSSL_VERSION_NUMBER =
131131
OPENSSL_MAKE_VERSION(OpenSSLVersion.major, OpenSSLVersion.minor,
132132
OpenSSLVersion.patch, OpenSSLVersion.build);
133133

134-
bool OPENSSL_VERSION_AT_LEAST(int major, int minor, int patch = 0, int build = 0)
134+
bool OPENSSL_VERSION_AT_LEAST()(int major, int minor, int patch = 0, int build = 0)
135135
{
136136
return OPENSSL_VERSION_NUMBER >= OPENSSL_MAKE_VERSION(major, minor, patch, build);
137137
}
138138

139-
bool OPENSSL_VERSION_BEFORE(int major, int minor, int patch = 0, int build = 0)
139+
bool OPENSSL_VERSION_BEFORE()(int major, int minor, int patch = 0, int build = 0)
140140
{
141141
return OPENSSL_VERSION_NUMBER < OPENSSL_MAKE_VERSION(major, minor, patch, build);
142142
}

‎source/deimos/openssl/ssl.d

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1830,16 +1830,16 @@ static if (OPENSSL_VERSION_AT_LEAST(1, 1, 0))
18301830
enum SSL_CTRL_SET_MIN_PROTO_VERSION = 123;
18311831
enum SSL_CTRL_SET_MAX_PROTO_VERSION = 124;
18321832

1833-
auto SSL_CTX_set_min_proto_version(SSL_CTX* ctx, int version_) {
1833+
auto SSL_CTX_set_min_proto_version()(SSL_CTX* ctx, int version_) {
18341834
return SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MIN_PROTO_VERSION, version_, null);
18351835
}
1836-
auto SSL_CTX_set_max_proto_version(SSL_CTX* ctx, int version_) {
1836+
auto SSL_CTX_set_max_proto_version()(SSL_CTX* ctx, int version_) {
18371837
return SSL_CTX_ctrl(ctx, SSL_CTRL_SET_MAX_PROTO_VERSION, version_, null);
18381838
}
1839-
auto SSL_set_min_proto_version(SSL* s, int version_) {
1839+
auto SSL_set_min_proto_version()(SSL* s, int version_) {
18401840
return SSL_ctrl(s, SSL_CTRL_SET_MIN_PROTO_VERSION, version_, null);
18411841
}
1842-
auto SSL_set_max_proto_version(SSL* s, int version_) {
1842+
auto SSL_set_max_proto_version()(SSL* s, int version_) {
18431843
return SSL_ctrl(s, SSL_CTRL_SET_MAX_PROTO_VERSION, version_, null);
18441844
}
18451845

@@ -1848,16 +1848,16 @@ static if (OPENSSL_VERSION_AT_LEAST(1, 1, 0))
18481848
enum SSL_CTRL_GET_MIN_PROTO_VERSION = 130;
18491849
enum SSL_CTRL_GET_MAX_PROTO_VERSION = 131;
18501850

1851-
auto SSL_CTX_get_min_proto_version(SSL_CTX* ctx) {
1851+
auto SSL_CTX_get_min_proto_version()(SSL_CTX* ctx) {
18521852
return SSL_CTX_ctrl(ctx, SSL_CTRL_GET_MIN_PROTO_VERSION, 0, null);
18531853
}
1854-
auto SSL_CTX_get_max_proto_version(SSL_CTX* ctx) {
1854+
auto SSL_CTX_get_max_proto_version()(SSL_CTX* ctx) {
18551855
return SSL_CTX_ctrl(ctx, SSL_CTRL_GET_MAX_PROTO_VERSION, 0, null);
18561856
}
1857-
auto SSL_get_min_proto_version(SSL* s) {
1857+
auto SSL_get_min_proto_version()(SSL* s) {
18581858
return SSL_ctrl(s, SSL_CTRL_GET_MIN_PROTO_VERSION, 0, null);
18591859
}
1860-
auto SSL_get_max_proto_version(SSL* s) {
1860+
auto SSL_get_max_proto_version()(SSL* s) {
18611861
return SSL_ctrl(s, SSL_CTRL_GET_MAX_PROTO_VERSION, 0, null);
18621862
}
18631863
}

‎source/deimos/openssl/tls1.d

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ auto SSL_set_tlsext_status_ocsp_resp()(SSL* ssl, void* arg, void* arglen) {
341341
return SSL_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP,arglen, arg);
342342
}
343343

344-
auto SSL_CTX_set_tlsext_servername_callback(SSL_CTX* ctx, ExternC!(void function()) cb) {
344+
auto SSL_CTX_set_tlsext_servername_callback()(SSL_CTX* ctx, ExternC!(void function()) cb) {
345345
return SSL_CTX_callback_ctrl(ctx,SSL_CTRL_SET_TLSEXT_SERVERNAME_CB,cb);
346346
}
347347

@@ -350,33 +350,33 @@ enum SSL_TLSEXT_ERR_ALERT_WARNING = 1;
350350
enum SSL_TLSEXT_ERR_ALERT_FATAL = 2;
351351
enum SSL_TLSEXT_ERR_NOACK = 3;
352352

353-
auto SSL_CTX_set_tlsext_servername_arg(SSL_CTX* ctx, void* arg) {
353+
auto SSL_CTX_set_tlsext_servername_arg()(SSL_CTX* ctx, void* arg) {
354354
return SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG,0,arg);
355355
}
356356

357-
auto SSL_CTX_get_tlsext_ticket_keys(SSL_CTX* ctx, c_long keylen, void* keys) {
357+
auto SSL_CTX_get_tlsext_ticket_keys()(SSL_CTX* ctx, c_long keylen, void* keys) {
358358
return SSL_CTX_ctrl(ctx,SSL_CTRL_GET_TLSEXT_TICKET_KEYS,keylen,keys);
359359
}
360-
auto SSL_CTX_set_tlsext_ticket_keys(SSL_CTX* ctx, c_long keylen, void* keys) {
360+
auto SSL_CTX_set_tlsext_ticket_keys()(SSL_CTX* ctx, c_long keylen, void* keys) {
361361
return SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_TICKET_KEYS,keylen,keys);
362362
}
363363

364-
auto SSL_CTX_set_tlsext_status_cb(SSL_CTX* ctx, ExternC!(void function()) cb) {
364+
auto SSL_CTX_set_tlsext_status_cb()(SSL_CTX* ctx, ExternC!(void function()) cb) {
365365
return SSL_CTX_callback_ctrl(ctx,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB,cb);
366366
}
367367

368-
auto SSL_CTX_set_tlsext_status_arg(SSL_CTX* ctx, void* arg) {
368+
auto SSL_CTX_set_tlsext_status_arg()(SSL_CTX* ctx, void* arg) {
369369
return SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG,0,arg);
370370
}
371371

372-
auto SSL_set_tlsext_opaque_prf_input(SSL* s, void* src, c_long len) {
372+
auto SSL_set_tlsext_opaque_prf_input()(SSL* s, void* src, c_long len) {
373373
return SSL_ctrl(s,SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT, len, src);
374374
}
375375

376-
auto SSL_CTX_set_tlsext_opaque_prf_input_callback(SSL_CTX* ctx, ExternC!(void function()) cb) {
376+
auto SSL_CTX_set_tlsext_opaque_prf_input_callback()(SSL_CTX* ctx, ExternC!(void function()) cb) {
377377
return SSL_CTX_callback_ctrl(ctx,SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB, cb);
378378
}
379-
auto SSL_CTX_set_tlsext_opaque_prf_input_callback_arg(SSL_CTX* ctx, void* arg) {
379+
auto SSL_CTX_set_tlsext_opaque_prf_input_callback_arg()(SSL_CTX* ctx, void* arg) {
380380
return SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB_ARG, 0, arg);
381381
}
382382

0 commit comments

Comments
 (0)