| 1 |
brianr |
1.1 |
diff -ruN phpki.old/phpki-0.82/include/openssl_functions.php phpki/phpki-0.82/include/openssl_functions.php |
| 2 |
|
|
--- phpki.old/phpki-0.82/include/openssl_functions.php 2018-11-17 14:06:06.551603435 +0100 |
| 3 |
|
|
+++ phpki/phpki-0.82/include/openssl_functions.php 2018-11-17 14:07:21.651270471 +0100 |
| 4 |
|
|
@@ -801,31 +801,31 @@ |
| 5 |
|
|
$certtext = CA_cert_text($serial); |
| 6 |
|
|
|
| 7 |
|
|
#if (ereg('OpenSSL.* (E.?mail|Personal) .*Certificate', $certtext) && ereg('Code Signing', $certtest)) { |
| 8 |
|
|
- if (preg_match('OpenSSL.* (E.?mail|Personal) .*Certificate', $certtext) && preg_match('Code Signing', $certtest)) { |
| 9 |
|
|
+ if (preg_match('~OpenSSL.* (E.?mail|Personal) .*Certificate~', $certtext) && preg_match('~Code Signing~', $certtest)) { |
| 10 |
|
|
$cert_type = 'email_codesigning'; |
| 11 |
|
|
} |
| 12 |
|
|
#if (ereg('OpenSSL.* (E.?mail|Personal) .*Certificate', $certtext)) { |
| 13 |
|
|
- if (preg_match('OpenSSL.* (E.?mail|Personal) .*Certificate', $certtext)) { |
| 14 |
|
|
+ if (preg_match('~OpenSSL.* (E.?mail|Personal) .*Certificate~', $certtext)) { |
| 15 |
|
|
$cert_type = 'email'; |
| 16 |
|
|
} |
| 17 |
|
|
#elseif (ereg('OpenSSL.* Server .*Certificate', $certtext)) { |
| 18 |
|
|
- elseif (preg_match('OpenSSL.* Server .*Certificate', $certtext)) { |
| 19 |
|
|
+ elseif (preg_match('~OpenSSL.* Server .*Certificate~', $certtext)) { |
| 20 |
|
|
$cert_type = 'server'; |
| 21 |
|
|
} |
| 22 |
|
|
#elseif (ereg('timeStamping|Time Stamping', $certtext)) { |
| 23 |
|
|
- elseif (preg_match('timeStamping|Time Stamping', $certtext)) { |
| 24 |
|
|
+ elseif (preg_match('~timeStamping|Time Stamping~', $certtext)) { |
| 25 |
|
|
$cert_type = 'time_stamping'; |
| 26 |
|
|
} |
| 27 |
|
|
#elseif (ereg('TLS Web Client Authentication', $certtext) && ereg('TLS Web Server Authentication', $certtext)) { |
| 28 |
|
|
- elseif (preg_match('TLS Web Client Authentication', $certtext) && preg_match('TLS Web Server Authentication', $certtext)) { |
| 29 |
|
|
+ elseif (preg_match('~TLS Web Client Authentication~', $certtext) && preg_match('~TLS Web Server Authentication~', $certtext)) { |
| 30 |
|
|
$cert_type = 'vpn_client_server'; |
| 31 |
|
|
} |
| 32 |
|
|
#elseif (ereg('TLS Web Client Authentication', $certtext)) { |
| 33 |
|
|
- elseif (preg_match('TLS Web Client Authentication', $certtext)) { |
| 34 |
|
|
+ elseif (preg_match('~TLS Web Client Authentication~', $certtext)) { |
| 35 |
|
|
$cert_type = 'vpn_client'; |
| 36 |
|
|
} |
| 37 |
|
|
#elseif (ereg('TLS Web Server Authentication', $certtext)) { |
| 38 |
|
|
- elseif (preg_match('TLS Web Server Authentication', $certtext)) { |
| 39 |
|
|
+ elseif (preg_match('~TLS Web Server Authentication~', $certtext)) { |
| 40 |
|
|
$cert_type = 'vpn_server'; |
| 41 |
|
|
} |
| 42 |
|
|
else { |
Parent Directory
| 
Revision Log
| 
Revision Graph
