Browse Source

Add OpenSSL dynamic loading macro for SSL_set_tlsext_host_name (see #655/#658)

bel2125 6 năm trước cách đây
mục cha
commit
c5f9a80732
1 tập tin đã thay đổi với 6 bổ sung0 xóa
  1. 6 0
      src/civetweb.c

+ 6 - 0
src/civetweb.c

@@ -1884,12 +1884,15 @@ struct ssl_func {
 
 
 #define SSL_CTRL_SET_TLSEXT_SERVERNAME_CB 53
 #define SSL_CTRL_SET_TLSEXT_SERVERNAME_CB 53
 #define SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG 54
 #define SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG 54
+#define SSL_CTRL_SET_TLSEXT_HOSTNAME 55
 #define SSL_CTX_set_tlsext_servername_callback(ctx, cb)                        \
 #define SSL_CTX_set_tlsext_servername_callback(ctx, cb)                        \
 	SSL_CTX_callback_ctrl(ctx,                                                 \
 	SSL_CTX_callback_ctrl(ctx,                                                 \
 	                      SSL_CTRL_SET_TLSEXT_SERVERNAME_CB,                   \
 	                      SSL_CTRL_SET_TLSEXT_SERVERNAME_CB,                   \
 	                      (void (*)(void))cb)
 	                      (void (*)(void))cb)
 #define SSL_CTX_set_tlsext_servername_arg(ctx, arg)                            \
 #define SSL_CTX_set_tlsext_servername_arg(ctx, arg)                            \
 	SSL_CTX_ctrl(ctx, SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG, 0, (void *)arg)
 	SSL_CTX_ctrl(ctx, SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG, 0, (void *)arg)
+#define SSL_set_tlsext_host_name(ctx,arg)                                      \
+        SSL_ctrl(ctx,SSL_CTRL_SET_TLSEXT_HOSTNAME, 0, (void *)arg)
 
 
 #define X509_get_notBefore(x) ((x)->cert_info->validity->notBefore)
 #define X509_get_notBefore(x) ((x)->cert_info->validity->notBefore)
 #define X509_get_notAfter(x) ((x)->cert_info->validity->notAfter)
 #define X509_get_notAfter(x) ((x)->cert_info->validity->notAfter)
@@ -2052,12 +2055,15 @@ static struct ssl_func crypto_sw[] = {{"ERR_get_error", NULL},
 
 
 #define SSL_CTRL_SET_TLSEXT_SERVERNAME_CB 53
 #define SSL_CTRL_SET_TLSEXT_SERVERNAME_CB 53
 #define SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG 54
 #define SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG 54
+#define SSL_CTRL_SET_TLSEXT_HOSTNAME 55
 #define SSL_CTX_set_tlsext_servername_callback(ctx, cb)                        \
 #define SSL_CTX_set_tlsext_servername_callback(ctx, cb)                        \
 	SSL_CTX_callback_ctrl(ctx,                                                 \
 	SSL_CTX_callback_ctrl(ctx,                                                 \
 	                      SSL_CTRL_SET_TLSEXT_SERVERNAME_CB,                   \
 	                      SSL_CTRL_SET_TLSEXT_SERVERNAME_CB,                   \
 	                      (void (*)(void))cb)
 	                      (void (*)(void))cb)
 #define SSL_CTX_set_tlsext_servername_arg(ctx, arg)                            \
 #define SSL_CTX_set_tlsext_servername_arg(ctx, arg)                            \
 	SSL_CTX_ctrl(ctx, SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG, 0, (void *)arg)
 	SSL_CTX_ctrl(ctx, SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG, 0, (void *)arg)
+#define SSL_set_tlsext_host_name(ctx,arg)                                      \
+        SSL_ctrl(ctx,SSL_CTRL_SET_TLSEXT_HOSTNAME, 0, (void *)arg)
 
 
 #define X509_get_notBefore(x) ((x)->cert_info->validity->notBefore)
 #define X509_get_notBefore(x) ((x)->cert_info->validity->notBefore)
 #define X509_get_notAfter(x) ((x)->cert_info->validity->notAfter)
 #define X509_get_notAfter(x) ((x)->cert_info->validity->notAfter)