|
[-]
[+]
|
Changed |
check_ssl_cert.spec
|
|
|
|
[-]
[+]
|
Changed |
check_ssl_cert-1.9.1.tar.bz2/AUTHORS
^
|
| @@ -15,13 +15,15 @@
* Many thanks to Wolfgang Schricker for
- the selfsigned bug report and cleanup fixes
- the patch adding the possibility to check local files (-f option)
-* Many thanks to Yannick Gravel for the patch fixing the plugin output and the fix
- on the test order
+* Many thanks to Yannick Gravel for the patch fixing the plugin output
+ and the fix on the test order
* Many thanks to Scott Worthington for the --critical and --warning hints
* Many thanks to Lawren Quigley-Jones for
- the -A,--noauth patch
- the trap fix
* Many thanks to Matthias Fuhrmeister for the -servername patch
+* Many thanks to Raphael Thoma for the patch allowing HTTP to be
+ specified as protocol and the fix on -N with wildcards
# File version information:
# $Id: AUTHORS 1103 2009-12-07 07:49:19Z corti $
|
|
[-]
[+]
|
Changed |
check_ssl_cert-1.9.1.tar.bz2/COPYRIGHT
^
|
| @@ -9,6 +9,7 @@
Marcus Rejås
Matteo Corti
Matthias Fuhrmeister
+ Raphael Thoma
Scott Worthington
Tuomas Haarala
Wolfgang Schricker
|
|
[-]
[+]
|
Changed |
check_ssl_cert-1.9.1.tar.bz2/ChangeLog
^
|
| @@ -1,3 +1,10 @@
+2011-03-10 Matteo Corti <matteo.corti@id.ethz.ch>
+
+ * check_ssl_cert: allows http to specified as protocol
+ (thanks to Raphael Thoma)
+ * check_ssl_cert: fixes the -N check for certs with wildcards
+ (thanks to Raphael Thoma)
+
2011-01-24 Matteo Corti <matteo.corti@id.ethz.ch>
* check_ssl_cert: added an option to specify the openssl executable
|
|
[-]
[+]
|
Changed |
check_ssl_cert-1.9.1.tar.bz2/NEWS
^
|
| @@ -1,3 +1,4 @@
+2011-03-10 Version 1.9.1 Allows HTTP as protocol and fixes -N with wildcards
2011-01-24 Version 1.9.0 Added an option to specify the openssl executable
2010-12-16 Version 1.8.1 Fixed bugs with environment bleeding & shell globbing
2010-12-08 Version 1.8.0 Added support for TLS servername extension in ClientHello
|
|
[-]
[+]
|
Changed |
check_ssl_cert-1.9.1.tar.bz2/VERSION
^
|
| @@ -1 +1 @@
-1.9.0
+1.9.1
|
|
[-]
[+]
|
Changed |
check_ssl_cert-1.9.1.tar.bz2/check_ssl_cert
^
|
| @@ -19,15 +19,15 @@
# enable substitution with:
# $ svn propset svn:keywords "Id Revision HeadURL Source Date"
#
-# $Id: check_ssl_cert 1214 2011-01-24 14:24:42Z corti $
-# $Revision: 1214 $
+# $Id: check_ssl_cert 1229 2011-03-10 16:41:33Z corti $
+# $Revision: 1229 $
# $HeadURL: https://svn.id.ethz.ch/nagios_plugins/check_ssl_cert/check_ssl_cert $
-# $Date: 2011-01-24 15:24:42 +0100 (Mon, 24 Jan 2011) $
+# $Date: 2011-03-10 17:41:33 +0100 (Thu, 10 Mar 2011) $
################################################################################
# Constants
-VERSION=1.9.0
+VERSION=1.9.1
SHORTNAME="SSL_CERT"
################################################################################
@@ -63,12 +63,12 @@
echo " -i,--issuer issuer pattern to match the issuer of the certificate"
echo " -n,---cn name pattern to match the CN of the certificate"
echo " -N,--host-cn match CN with the host name"
- echo " (will not work for wildcards)"
echo " -o,--org org pattern to match the organization of the certificate"
echo " --openssl path path of the openssl binary to be used"
echo " -p,--port port TCP port"
- echo " -P,--protocol protocol switch to TLS and use specific protocol"
- echo " {smtp|pop3|imap|ftp}"
+ echo " -P,--protocol protocol use the specific protocol {http|smtp|pop3|imap|ftp}"
+ echo " http: default"
+ echo " smtp,pop3,imap,ftp: switch to TLS"
echo " -s,--selfsigned allows self-signed certificates"
echo " -r,--rootcert path root certificate or directory to be used for"
echo " certficate validation"
@@ -437,7 +437,8 @@
# using named signals to be POSIX compliant
trap "rm -f $CERT $ERROR" EXIT HUP INT QUIT TERM
-if [ -n "${PROTOCOL}" ] ; then
+# check if a protocol was specified (if not HTTP switch to TLS)
+if [ -n "${PROTOCOL}" -a "${PROTOCOL}" != "http" -a "${PROTOCOL}" != "https" ] ; then
case "${PROTOCOL}" in
@@ -498,9 +499,9 @@
ok=''
- if echo $CN | grep -q "^$COMMON_NAME$" ; then
- ok='true'
- fi
+ case $COMMON_NAME in
+ $CN) ok='true';;
+ esac
if [ -z "$ok" ] ; then
critical "invalid CN ('$CN' does not match '$COMMON_NAME')"
|
|
[-]
[+]
|
Changed |
check_ssl_cert-1.9.1.tar.bz2/check_ssl_cert.1
^
|
| @@ -1,7 +1,7 @@
.\" Process this file with
.\" groff -man -Tascii foo.1
.\"
-.TH "check_ssl_cert" 1 "January, 2011" "1.9.0" "USER COMMANDS"
+.TH "check_ssl_cert" 1 "January, 2011" "1.9.1" "USER COMMANDS"
.SH NAME
check_ssl_cert \- checks the validity of X.509 certificates
.SH SYNOPSIS
@@ -40,7 +40,7 @@
pattern to match the CN of the certificate
.TP
.BR "-N,--host-cn"
-match CN with the host name (will not work for wildcards)
+match CN with the host name
.TP
.BR "-o,--org" " org"
pattern to match the organization of the certificate
@@ -52,7 +52,7 @@
TCP port
.TP
.BR "-P,--protocol" " protocol"
-switch to TLS and use specific protocol {smtp|pop3|imap|ftp}
+use the specific protocol: http (default) or smtp,pop3,imap,ftp (switch to TLS)
.TP
.BR "-s,--selfsigned"
allows self-signed certificates
|
|
[-]
[+]
|
Changed |
check_ssl_cert-1.9.1.tar.bz2/check_ssl_cert.spec
^
|
| @@ -6,7 +6,7 @@
# $Date: 2010-02-16 21:06:11 +0100 (Tue, 16 Feb 2010) $
################################################################################
-%define version 1.9.0
+%define version 1.9.1
%define release 0
%define sourcename check_ssl_cert
%define packagename nagios-plugins-check_ssl_cert
@@ -53,6 +53,9 @@
%{_mandir}/man1/%{sourcename}.1*
%changelog
+* Thu Mar 10 2011 Matteo Corti <matteo.corti@id.ethz.ch> - 1.9.1-0
+- updated to 1.9.1: allows http as protocol and fixes -N with wildcards
+
* Mon Jan 24 2011 Matteo Corti <matteo.corti@id.ethz.ch> - 1.9.0-0
- updated to 1.9.0: --openssl option
|
