diff options
| author |  M. Sean Finney <seanius@users.sourceforge.net>
| 2005-10-18 22:35:29 +0000 |
|---|---|---|
| committer | M. Sean Finney <seanius@users.sourceforge.net>
| 2005-10-18 22:35:29 +0000 |
| commit | 8611341fb989382545c0c934c700e027d9bbab15 (patch) | |
| tree | f80a127bde75a42f3ba8071702bac6005b9ae2ef /plugins | |
| parent | f4a198463ced6bb3ad8779a10146c88b91385fd2 (diff) | |
| download | monitoring-plugins-8611341fb989382545c0c934c700e027d9bbab15.tar.gz | |
initial "experimental" support for gnutls. by default openssl is still
used if available, and gnutls is only used if openssl is not available
or explicitly disabled (--without-openssl). currently the only plugin
i've verified to work is check_tcp, but i had to disable cert checking.
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1254 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/check_tcp.c | 42 |
1 files changed, 28 insertions, 14 deletions
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c index ad8b0429..157588fd 100644 --- a/plugins/check_tcp.c +++ b/plugins/check_tcp.c @@ -28,21 +28,25 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net"; #include "netutils.h" #include "utils.h" -#ifdef HAVE_SSL_H -# include <rsa.h> -# include <crypto.h> -# include <x509.h> -# include <pem.h> -# include <ssl.h> -# include <err.h> +#ifdef HAVE_GNUTLS_OPENSSL_H +# include <gnutls/openssl.h> #else -# ifdef HAVE_OPENSSL_SSL_H -# include <openssl/rsa.h> -# include <openssl/crypto.h> -# include <openssl/x509.h> -# include <openssl/pem.h> -# include <openssl/ssl.h> -# include <openssl/err.h> +# ifdef HAVE_SSL_H +# include <rsa.h> +# include <crypto.h> +# include <x509.h> +# include <pem.h> +# include <ssl.h> +# include <err.h> +# else +# ifdef HAVE_OPENSSL_SSL_H +# include <openssl/rsa.h> +# include <openssl/crypto.h> +# include <openssl/x509.h> +# include <openssl/pem.h> +# include <openssl/ssl.h> +# include <openssl/err.h> +# endif # endif #endif @@ -54,7 +58,9 @@ static SSL_CTX *ctx; static SSL *ssl; static X509 *server_cert; static int connect_SSL (void); +# ifdef USE_OPENSSL static int check_certificate (X509 **); +# endif /* USE_OPENSSL */ # define my_recv(buf, len) ((flags & FLAG_SSL) ? SSL_read(ssl, buf, len) : read(sd, buf, len)) #else # define my_recv(buf, len) read(sd, buf, len) @@ -231,6 +237,7 @@ main (int argc, char **argv) if (flags & FLAG_SSL && check_cert == TRUE) { if (connect_SSL () != OK) die (STATE_CRITICAL,_("CRITICAL - Could not make SSL connection\n")); +# ifdef USE_OPENSSL /* XXX gnutls does cert checking differently */ if ((server_cert = SSL_get_peer_certificate (ssl)) != NULL) { result = check_certificate (&server_cert); X509_free(server_cert); @@ -239,6 +246,7 @@ main (int argc, char **argv) printf(_("CRITICAL - Cannot retrieve server certificate.\n")); result = STATE_CRITICAL; } +# endif /* USE_OPENSSL */ SSL_shutdown (ssl); SSL_free (ssl); @@ -563,12 +571,14 @@ process_arguments (int argc, char **argv) break; case 'D': /* Check SSL cert validity - days 'til certificate expiration */ #ifdef HAVE_SSL +# ifdef USE_OPENSSL /* XXX */ if (!is_intnonneg (optarg)) usage2 (_("Invalid certificate expiration period"), optarg); days_till_exp = atoi (optarg); check_cert = TRUE; flags |= FLAG_SSL; break; +# endif /* USE_OPENSSL */ #endif /* fallthrough if we don't have ssl */ case 'S': @@ -626,7 +636,9 @@ connect_SSL (void) return OK; /* ERR_print_errors_fp (stderr); */ printf (_("CRITICAL - Cannot make SSL connection ")); +#ifdef USE_OPENSSL /* XXX */ ERR_print_errors_fp (stdout); +#endif /* USE_OPENSSL */ /* printf("\n"); */ } else @@ -642,6 +654,7 @@ connect_SSL (void) return STATE_CRITICAL; } +#ifdef USE_OPENSSL /* XXX */ static int check_certificate (X509 ** certificate) { @@ -715,6 +728,7 @@ check_certificate (X509 ** certificate) return STATE_OK; } +# endif /* USE_OPENSSL */ #endif /* HAVE_SSL */ |