michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 08:40:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

On newer openssl versions, the format for CN and other cert fields has changed

Browse Source
This commit is contained in:
Jamie Cameron
2021-01-24 21:25:52 -08:00
parent 97a51f33f0
commit 958d807567
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
webmin/webmin-lib.pl
View File

@@ -1836,22 +1836,22 @@ local $_;
open(OUT, "openssl x509 -in ".quotemeta($_[0])." -issuer -subject -enddate -text |");
while(<OUT>) {
s/\r|\n//g;
if (/subject=.*CN\s*=\s*([^\/]+)/) {
if (/subject=.*CN\s*=\s*([^\/,]+)/) {
$rv{'cn'} = $1;
}
if (/subject=.*O\s*=\s*([^\/]+)/) {
if (/subject=.*O\s*=\s*([^\/,]+)/) {
$rv{'o'} = $1;
}
if (/subject=.*Email\s*=\s*([^\/]+)/) {
if (/subject=.*Email\s*=\s*([^\/,]+)/) {
$rv{'email'} = $1;
}
if (/issuer=.*CN\s*=\s*([^\/]+)/) {
if (/issuer=.*CN\s*=\s*([^\/,]+)/) {
$rv{'issuer_cn'} = $1;
}
if (/issuer=.*O\s*=\s*([^\/]+)/) {
if (/issuer=.*O\s*=\s*([^\/,]+)/) {
$rv{'issuer_o'} = $1;
}
if (/issuer=.*Email\s*=\s*([^\/]+)/) {
if (/issuer=.*Email\s*=\s*([^\/,]+)/) {
$rv{'issuer_email'} = $1;
}
if (/notAfter\s*=\s*(.*)/) {