mirror of
				https://github.com/drwetter/testssl.sh.git
				synced 2025-10-31 05:45:26 +01:00 
			
		
		
		
	Merge pull request #2792 from testssl/fix_issuerCN
Fix missing issuer CN
This commit is contained in:
		| @@ -26,8 +26,8 @@ my $openssl_json=""; | |||||||
| #       @args="$prg $check2run $uri >/dev/null"; | #       @args="$prg $check2run $uri >/dev/null"; | ||||||
| #       system("@args") == 0 | #       system("@args") == 0 | ||||||
| #           or die ("FAILED: \"@args\" "); | #           or die ("FAILED: \"@args\" "); | ||||||
| my $socket_errors='(e|E)rror|\.\/testssl\.sh: line |(f|F)atal|(c|C)ommand not found'; | my $socket_errors='(e|E)rror|FIXME|\.\/testssl\.sh: line |(f|F)atal|(c|C)ommand not found'; | ||||||
| my $openssl_errors='(e|E)rror|(f|F)atal|\.\/testssl\.sh: line |Oops|s_client connect problem|(c|C)ommand not found'; | my $openssl_errors='(e|E)rror|FIXME|(f|F)atal|\.\/testssl\.sh: line |Oops|s_client connect problem|(c|C)ommand not found'; | ||||||
| my $json_errors='(id".*:\s"scanProblem"|severity".*:\s"FATAL"|"Scan interrupted")'; | my $json_errors='(id".*:\s"scanProblem"|severity".*:\s"FATAL"|"Scan interrupted")'; | ||||||
|  |  | ||||||
|  |  | ||||||
|   | |||||||
| @@ -10121,9 +10121,12 @@ certificate_info() { | |||||||
|                expok="OK" |                expok="OK" | ||||||
|           fi |           fi | ||||||
|           out " ($enddate). " |           out " ($enddate). " | ||||||
|           # Match on Subject/Issuer plus next 3 lines |           # Match Subject/Issuer on next 5 lines, where the CN is (4 lines is fine in most cases, 5 should suffice for all certs) | ||||||
|           cn="$(awk '/Subject:/{stop=NR+3}; NR<=stop' <<< "${intermediate_certs_txt[i]}" | awk -F= '/CN/ { print $NF }')" |           cn="$(awk '/Subject:/{stop=NR+5}; NR<=stop' <<< "${intermediate_certs_txt[i]}" | awk -F= '/CN/ { print $NF }')" | ||||||
|           issuer_CN="$(awk '/Issuer:/{stop=NR+3}; NR<=stop' <<< "${intermediate_certs_txt[i]}" | awk -F= '/CN/ { print $NF }')" |           issuer_CN="$(awk '/Issuer:/{stop=NR+5}; NR<=stop' <<< "${intermediate_certs_txt[i]}" | awk -F= '/CN/ { print $NF }')" | ||||||
|  |           # to catch errors like #2789 during unit test: | ||||||
|  |           [[ -z "$cn" ]] && cn="FIXME: cn error" | ||||||
|  |           [[ -z "$issuer_CN" ]] && issuer_CN="FIXME: issuer_CN error" | ||||||
|           pr_italic "$(strip_leading_space "$cn")"; out " <-- "; prln_italic "$(strip_leading_space "$issuer_CN")" |           pr_italic "$(strip_leading_space "$cn")"; out " <-- "; prln_italic "$(strip_leading_space "$issuer_CN")" | ||||||
|           fileout "intermediate_cert_notAfter <#${i}>${json_postfix}" "$expok" "$enddate" |           fileout "intermediate_cert_notAfter <#${i}>${json_postfix}" "$expok" "$enddate" | ||||||
|           fileout "intermediate_cert_expiration <#${i}>${json_postfix}" "$expok" "$cn_finding" |           fileout "intermediate_cert_expiration <#${i}>${json_postfix}" "$expok" "$cn_finding" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Dirk Wetter
					Dirk Wetter