Merge pull request #2145 from dcooper16/ossl3_fix

More OpenSSL compatibility fixes
This commit is contained in:
Dirk Wetter 2022-04-12 18:50:26 +02:00 committed by GitHub
commit 6054be6dff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -8615,7 +8615,9 @@ determine_cert_fingerprint_serial() {
result="${result//serial=}" result="${result//serial=}"
result="${result//:/}" result="${result//:/}"
result="${result//SHA1 /}" result="${result//SHA1 /}"
result="${result//sha1 /}"
result="${result//SHA256 /}" result="${result//SHA256 /}"
result="${result//sha256 /}"
# When the serial number is too large we'll get a 0x0a LF after 70 ASCII chars (see #2010). # When the serial number is too large we'll get a 0x0a LF after 70 ASCII chars (see #2010).
# Thus we clean them here so that it is displayed correctly. # Thus we clean them here so that it is displayed correctly.
result="${result/[$'\n\r']/}" result="${result/[$'\n\r']/}"
@ -9706,7 +9708,7 @@ certificate_info() {
out " ($enddate). " out " ($enddate). "
cn="$(awk -F= '/Subject:.*CN/ { print $NF }' <<< "${intermediate_certs_txt[i]}")" cn="$(awk -F= '/Subject:.*CN/ { print $NF }' <<< "${intermediate_certs_txt[i]}")"
issuer_CN="$(awk -F= '/Issuer:.*CN/ { print $NF }' <<< "${intermediate_certs_txt[i]}")" issuer_CN="$(awk -F= '/Issuer:.*CN/ { print $NF }' <<< "${intermediate_certs_txt[i]}")"
pr_italic "$cn"; out " <-- "; prln_italic "$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"
fileout "intermediate_cert_chain <#${i}>${json_postfix}" "INFO" "$cn <-- $issuer_CN" fileout "intermediate_cert_chain <#${i}>${json_postfix}" "INFO" "$cn <-- $issuer_CN"