1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
diff --git a/plugins/check_http.c b/plugins/check_http.c
index c8ae67f..33a9379 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -790,6 +790,9 @@ check_http (void)
die (STATE_CRITICAL, _("HTTP CRITICAL - Unable to open TCP socket\n"));
#ifdef HAVE_SSL
if (use_ssl == TRUE) {
+ /* Set host name for SSL/TLS hostname extension support (SNI) */
+ if (host_name)
+ np_net_ssl_set_host_name(host_name);
np_net_ssl_init(sd);
if (check_cert == TRUE) {
result = np_net_ssl_check_cert(days_till_exp);
diff --git a/plugins/netutils.h b/plugins/netutils.h
index 6bc5386..c6f863d 100644
--- a/plugins/netutils.h
+++ b/plugins/netutils.h
@@ -96,6 +96,7 @@ void np_net_ssl_cleanup();
int np_net_ssl_write(const void *buf, int num);
int np_net_ssl_read(void *buf, int num);
int np_net_ssl_check_cert(int days_till_exp);
+void np_net_ssl_set_host_name(const char *buf);
#endif /* HAVE_SSL */
#endif /* _NETUTILS_H_ */
diff --git a/plugins/sslutils.c b/plugins/sslutils.c
index 1d4ef94..a8aee93 100644
--- a/plugins/sslutils.c
+++ b/plugins/sslutils.c
@@ -34,6 +34,7 @@
static SSL_CTX *c=NULL;
static SSL *s=NULL;
static int initialized=0;
+const char *host_name=NULL;
int np_net_ssl_init (int sd){
if (!initialized) {
@@ -48,6 +49,10 @@ int np_net_ssl_init (int sd){
return STATE_CRITICAL;
}
if ((s = SSL_new (c)) != NULL){
+#ifdef SSL_set_tlsext_host_name
+ if (host_name != NULL)
+ SSL_set_tlsext_host_name(s, host_name);
+#endif
SSL_set_fd (s, sd);
if (SSL_connect(s) == 1){
return OK;
@@ -65,6 +70,9 @@ int np_net_ssl_init (int sd){
void np_net_ssl_cleanup (){
if(s){
+#ifdef SSL_set_tlsext_host_name
+ SSL_set_tlsext_host_name(s, NULL);
+#endif
SSL_shutdown (s);
SSL_free (s);
if(c) {
@@ -73,6 +81,7 @@ void np_net_ssl_cleanup (){
}
s=NULL;
}
+ host_name = NULL;
}
int np_net_ssl_write(const void *buf, int num){
@@ -86,7 +95,7 @@ int np_net_ssl_read(void *buf, int num){
int np_net_ssl_check_cert(int days_till_exp){
# ifdef USE_OPENSSL
X509 *certificate=NULL;
- ASN1_STRING *tm;
+ ASN1_STRING *tm;
int offset;
struct tm stamp;
float time_left;
@@ -163,4 +172,8 @@ int np_net_ssl_check_cert(int days_till_exp){
# endif /* USE_OPENSSL */
}
+void np_net_ssl_set_host_name (const char *buf){
+ host_name = buf;
+}
+
#endif /* HAVE_SSL */
|
