Fixed some non-working tests and prepared the new release

matteocorti · Apr 21, 2023 · 7f79f86 · 7f79f86
1 parent d424dba
commit 7f79f86
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 27 deletions.
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -147,3 +147,4 @@ Maintainer: [Matteo Corti](https://github.com/matteocorti) <[[email protected]](ma
 * Many thanks to [Peter](https://github.com/Peter2121) for the FreeBSD jail patch
 * Many thanks to [Marcel Burkhalter](https://github.com/marcel-burkhalter) for the path check
 * Many thanks to [Slavko](https://github.com/slavkoja) for the RSA algorithms patch
+* Many thanks to [Ben Byrne](https://github.com/benbyr) for the CRL output format patch
diff --git a/CITATION.cff b/CITATION.cff
@@ -14,6 +14,9 @@ authors:
 - family-names: "Miśkiewicz"
   given-names: "Arkadiusz"
   website: https://github.com/arekm
+- family-names: "Byrne"
+  given-names: "Ben"
+  website: https://github.com/benbyr
 - family-names: "Strößenreuther"
   given-names: "Bernd"
   website: https://github.com/booboo-at-gluga-de
@@ -248,8 +251,8 @@ authors:
   given-names: "Дилян"
   website: https://github.com/dilyanpalauzov
 title: "check_ssl_cert"
-version: 2.64.0
-date-released: 2023-04-07
+version: 2.65.0
+date-released: 2023-04-21
 url: "https://github.com/matteocorti/check_ssl_cert"
 repository-code: "https://github.com/matteocorti/check_ssl_cert"
 keywords:

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2023-04-21  Matteo Corti  <[email protected]>
+
+        * check_ssl_cert (extract_cert_attribute): Fix CRL output format parsing
+
 2023-04-07  Matteo Corti  <[email protected]>
 
         * check_ssl_cert (main): Fixed the resolution of hosts with IPv6 addresses only

diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,7 @@
 # News
 
+* 2023-04-21 Version 2.65.0
+  * Fixed CRL output format parsing
 * 2023-04-07 Version 2.64.0
   * Fixed the resolution of hosts with IPv6 addresses only
 * 2023-04-05 Version 2.63.0

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1 +1 @@
-Fixed the resolution of hosts with IPv6 addresses only
+Fixed CRL output format parsing
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.64.0
+2.65.0
diff --git a/check_ssl_cert b/check_ssl_cert
@@ -31,7 +31,7 @@
 ################################################################################
 # Constants
 
-VERSION=2.64.0
+VERSION=2.65.0
 SHORTNAME="SSL_CERT"
 
 VALID_ATTRIBUTES=",startdate,enddate,subject,issuer,modulus,serial,hash,email,ocsp_uri,fingerprint,"

diff --git a/check_ssl_cert.1 b/check_ssl_cert.1
@@ -1,7 +1,7 @@
 .\" Process this file with
 .\" groff -man -Tascii check_ssl_cert.1
 .\"
-.TH "check_ssl_cert" 1 "April, 2023" "2.64.0" "USER COMMANDS"
+.TH "check_ssl_cert" 1 "April, 2023" "2.65.0" "USER COMMANDS"
 .SH NAME
 check_ssl_cert \- checks the validity of X.509 certificates
 .SH SYNOPSIS

diff --git a/check_ssl_cert.spec b/check_ssl_cert.spec
@@ -1,4 +1,4 @@
-%global version          2.64.0
+%global version          2.65.0
 %global release          0
 %global sourcename       check_ssl_cert
 %global packagename      nagios-plugins-check_ssl_cert
@@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Apr  21 2023 Matteo Corti <[email protected]> - 2.65.0-0
+- Updated to 2.65.0
+
 * Fri Apr   7 2023 Matteo Corti <[email protected]> - 2.64.0-0
 - Updated to 2.64.0
 

diff --git a/test/integration_tests.sh b/test/integration_tests.sh
@@ -1033,12 +1033,6 @@ testNotExistingHosts() {
     assertEquals "wrong exit code" "${NAGIOS_CRITICAL}" "${EXIT_CODE}"
     assertContains "wrong error message" "${OUTPUT}" "Cannot resolve"
 
-    # shellcheck disable=SC2086
-    OUTPUT=$( ${SCRIPT} ${TEST_DEBUG} --rootcert-file cabundle.crt --host www.ltri.eu )
-    EXIT_CODE=$?
-    assertEquals "wrong exit code" "${NAGIOS_CRITICAL}" "${EXIT_CODE}"
-    assertContains "wrong error message" "${OUTPUT}" "Cannot resolve"
-
 }
 
 
@@ -1536,20 +1530,6 @@ testConfigurationWrongOption() {
     assertEquals "wrong exit code" "${NAGIOS_UNKNOWN}" "${EXIT_CODE}"
 }
 
-testRootCertInChain() {
-    # shellcheck disable=SC2086
-    ${SCRIPT} ${TEST_DEBUG} -H matteo.ethz.ch --verbose | grep -q 'The root certificate is unnecessarily present in the delivered certificate chain'
-    EXIT_CODE=$?
-    assertEquals "wrong exit code" "${OK}" "${EXIT_CODE}"
-}
-
-testRootCertInChainEnforceFail() {
-    # shellcheck disable=SC2086
-    ${SCRIPT} ${TEST_DEBUG} -H matteo.ethz.ch --check-chain
-    EXIT_CODE=$?
-    assertEquals "wrong exit code" "${NAGIOS_CRITICAL}" "${EXIT_CODE}"
-}
-
 testRootCertInChainEnforceOK() {
     # shellcheck disable=SC2086
     ${SCRIPT} ${TEST_DEBUG} --host www.github.com --check-chain
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Fixed the resolution of hosts with IPv6 addresses only
		Fixed CRL output format parsing