diff --git a/plugins/sslutils.c b/plugins/sslutils.c
index 3d4f90166dd7d3cb1754dfa5516164e3337ff7eb..64f4d61c9179c9c5d93e5ff5e5bebe7a17ac7b98 100644 (file)
--- a/plugins/sslutils.c
+++ b/plugins/sslutils.c
* License: GPL
* Copyright (c) 2005-2007 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Description:
*
* This file contains common functions for plugins that require SSL.
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
static SSL *s=NULL;
static int initialized=0;
-int np_net_ssl_init (int sd){
+int np_net_ssl_init (int sd) {
+ return np_net_ssl_init_with_hostname(sd, NULL);
+}
+
+int np_net_ssl_init_with_hostname (int sd, char *host_name) {
if (!initialized) {
/* Initialize SSL context */
SSLeay_add_ssl_algorithms ();
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;
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) {
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;
int days_left;
char timestamp[17] = "";
stamp.tm_sec = 0;
stamp.tm_isdst = -1;
- days_left = (mktime (&stamp) - time (NULL)) / 86400;
+ time_left = difftime(timegm(&stamp), time(NULL));
+ days_left = time_left / 86400;
snprintf
(timestamp, 17, "%02d/%02d/%04d %02d:%02d",
stamp.tm_mon + 1,
if (days_left > 0 && days_left <= days_till_exp) {
printf (_("WARNING - Certificate expires in %d day(s) (%s).\n"), days_left, timestamp);
return STATE_WARNING;
- } else if (days_left < 0) {
+ } else if (time_left < 0) {
printf (_("CRITICAL - Certificate expired on %s.\n"), timestamp);
return STATE_CRITICAL;
} else if (days_left == 0) {