[-]
[+]
|
Changed |
check_ssl_cert.changes
|
|
[-]
[+]
|
Changed |
check_ssl_cert.spec
^
|
|
[-]
[+]
|
Changed |
check_ssl_cert-1.14.5.tar.bz2/AUTHORS
^
|
@@ -28,6 +28,7 @@
* Many thanks to Rob Yamry for the help in debugging a problem with
certain versions of OpenSSL and TLS extensions
* Many thanks to Jim Hopp for the "No certificate returned" enhancement patch
+* Many thanks to Javier Gonel for the TLS servername patch
# File version information:
# $Id: AUTHORS 1103 2009-12-07 07:49:19Z corti $
|
[-]
[+]
|
Changed |
check_ssl_cert-1.14.5.tar.bz2/ChangeLog
^
|
@@ -1,6 +1,14 @@
+2013-03-02 Matteo Corti <matteo.corti@id.ethz.ch>
+
+ * check_ssl_cert: Fixed a bug occuring with TLS and multiple names in
+ the certificate
+
2012-12-07 Matteo Corti <matteo.corti@id.ethz.ch>
- * fixed #122 (-N was always comparing the CN with 'localhost')
+ * check_ssl_cert: removed "test -a/-o" (test has an undefined
+ behavior with more than 4 elements)
+
+ * check_ssl_cert: fixed #122 (-N was always comparing the CN with 'localhost')
2012-11-16 Matteo Corti <matteo.corti@id.ethz.ch>
|
[-]
[+]
|
Changed |
check_ssl_cert-1.14.5.tar.bz2/NEWS
^
|
@@ -1,3 +1,5 @@
+2013-03-02 Version 1.14.5 Fixed a bug occuring with TLS and multiple names in
+ the certificate
2012-12-07 Version 1.14.4 Fixed a bug causing -N to always compare the CN
with 'localhost'
2012-09-19 Version 1.14.3 Improved the error message in case of a failure in
|
[-]
[+]
|
Changed |
check_ssl_cert-1.14.5.tar.bz2/VERSION
^
|
@@ -1 +1 @@
-1.14.4
+1.14.5
|
[-]
[+]
|
Changed |
check_ssl_cert-1.14.5.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 1321 2012-12-07 07:24:19Z corti $
-# $Revision: 1321 $
+# $Id: check_ssl_cert 1322 2012-12-07 08:02:11Z corti $
+# $Revision: 1322 $
# $HeadURL: https://svn.id.ethz.ch/nagios_plugins/check_ssl_cert/check_ssl_cert $
-# $Date: 2012-12-07 08:24:19 +0100 (Fri, 07 Dec 2012) $
+# $Date: 2012-12-07 09:02:11 +0100 (Fri, 07 Dec 2012) $
################################################################################
# Constants
-VERSION=1.14.4
+VERSION=1.14.5
SHORTNAME="SSL_CERT"
VALID_ATTRIBUTES=",startdate,enddate,subject,issuer,modulus,serial,hash,email,ocsp_uri,fingerprint,"
@@ -191,7 +191,7 @@
fetch_certificate() {
# check if a protocol was specified (if not HTTP switch to TLS)
- if [ -n "${PROTOCOL}" -a "${PROTOCOL}" != "http" -a "${PROTOCOL}" != "https" ] ; then
+ if [ -n "${PROTOCOL}" ] && [ "${PROTOCOL}" != "http" ] && [ "${PROTOCOL}" != "https" ] ; then
case "${PROTOCOL}" in
@@ -414,7 +414,7 @@
usage "No host specified"
fi
- if [ -n "${ALTNAMES}" -a -z "${COMMON_NAME}" ] ; then
+ if [ -n "${ALTNAMES}" ] && [ -z "${COMMON_NAME}" ] ; then
unknown "--altnames requires a common name to match (--cn or --host-cn)"
fi
@@ -449,7 +449,7 @@
fi
fi
- if [ -n "${CRITICAL}" -a -n "${WARNING}" ] ; then
+ if [ -n "${CRITICAL}" ] && [ -n "${WARNING}" ] ; then
if [ ${WARNING} -le ${CRITICAL} ] ; then
unknown "--warning (${WARNING}) is less than or equal to --critical (${CRITICAL})"
fi
@@ -485,14 +485,14 @@
# Expect (optional)
EXPECT=$(which expect 2> /dev/null)
test -x "${EXPECT}" || EXPECT=""
- if [ -z "${EXPECT}" -a -n "${VERBOSE}" ] ; then
+ if [ -z "${EXPECT}" ] && [ -n "${VERBOSE}" ] ; then
echo "Expect not found: disabling timeouts"
fi
# Perl with Date::Parse (optional)
PERL=$(which perl 2> /dev/null)
test -x "${PERL}" || PERL=""
- if [ -z "${PERL}" -a -n "${VERBOSE}" ] ; then
+ if [ -z "${PERL}" ] && [ -n "${VERBOSE}" ] ; then
echo "Perl not found: disabling date computations"
fi
if ! ${PERL} -e "use Date::Parse;" > /dev/null 2>&1 ; then
@@ -511,7 +511,13 @@
#
SERVERNAME=
if ${OPENSSL} s_client not_a_real_option 2>&1 | grep -q -- -servername ; then
- SERVERNAME="-servername ${HOST}"
+
+ if [ -n "${COMMON_NAME}" ] ; then
+ SERVERNAME="-servername ${COMMON_NAME}"
+ else
+ SERVERNAME="-servername ${HOST}"
+ fi
+
else
if [ -n "${VERBOSE}" ] ; then
echo "'${OPENSSL} s_client' does not support '-servername': disabling virtual server support"
@@ -818,7 +824,7 @@
# if --altnames was specified we show the specified CN instead of
# the certificate CN
- if [ -n "${ALTNAMES}" -a -n "${COMMON_NAME}" ] ; then
+ if [ -n "${ALTNAMES}" ] && [ -n "${COMMON_NAME}" ] ; then
CN=${COMMON_NAME}
fi
|
[-]
[+]
|
Changed |
check_ssl_cert-1.14.5.tar.bz2/check_ssl_cert.1
^
|
@@ -1,7 +1,7 @@
.\" Process this file with
.\" groff -man -Tascii foo.1
.\"
-.TH "check_ssl_cert" 1 "July, 2012" "1.14.4" "USER COMMANDS"
+.TH "check_ssl_cert" 1 "July, 2012" "1.14.5" "USER COMMANDS"
.SH NAME
check_ssl_cert \- checks the validity of X.509 certificates
.SH SYNOPSIS
|
[-]
[+]
|
Changed |
check_ssl_cert-1.14.5.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.14.4
+%define version 1.14.5
%define release 0
%define sourcename check_ssl_cert
%define packagename nagios-plugins-check_ssl_cert
@@ -53,6 +53,9 @@
%{_mandir}/man1/%{sourcename}.1*
%changelog
+* Sat Mar 2 2013 Matteo Corti <matteo.corti@id.ethz.ch> - 1.14.5-0
+- Updated to 1.14.5 (TLS and multiple names fix)
+
* Fri Dec 7 2012 Matteo Corti <matteo.corti@id.ethz.ch> - 1.14.4-0
- Updated to 1.14.4 (bug fix release)
|