diff options
| author | Felix Dörre <felix@dogcraft.de> | 2014-08-09 01:27:10 +0200 |
|---|---|---|
| committer | Felix Dörre <felix@dogcraft.de> | 2014-08-09 01:27:10 +0200 |
| commit | 061fec271f164c0efb356d98b5b4f640ed3c6c2f (patch) | |
| tree | 2421934849030b3304890f9fb5e5c31ec1c75b88 | |
| parent | fa3a17789986431c15dac26c43a8100ee7e8d0d4 (diff) | |
| download | cacert-devel-bug-1297.tar.gz cacert-devel-bug-1297.tar.xz cacert-devel-bug-1297.zip | |
bug-1297: update openssl regexes to openssl 1.0.1bug-1297
Some keywords in the "req"-output have changed.
| -rw-r--r-- | includes/lib/check_weak_key.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/lib/check_weak_key.php b/includes/lib/check_weak_key.php index 8ad2ccf..2a789d0 100644 --- a/includes/lib/check_weak_key.php +++ b/includes/lib/check_weak_key.php @@ -128,7 +128,7 @@ function checkWeakKeyText($text) if ($algorithm === "rsaEncryption") { - if (!preg_match('/^\s*RSA Public Key: \((\d+) bit\)$/m', $text, $keysize)) + if (!preg_match('/^\s*Public-Key: \((\d+) bit\)$/m', $text, $keysize)) { return failWithId("checkWeakKeyText(): Couldn't parse the RSA ". "key size.\nData:\n$text"); @@ -308,7 +308,7 @@ function checkDebianVulnerability($text, $keysize = 0) if ($algorithm !== "rsaEncryption") return false; /* Extract public key size */ - if (!preg_match('/^\s*RSA Public Key: \((\d+) bit\)$/m', $text, + if (!preg_match('/^\s*Public-Key: \((\d+) bit\)$/m', $text, $keysize)) { trigger_error("checkDebianVulnerability(): Couldn't parse the ". @@ -338,7 +338,7 @@ function checkDebianVulnerability($text, $keysize = 0) /* Extract RSA modulus */ - if (!preg_match('/^\s*Modulus \(\d+ bit\):\n'. + if (!preg_match('/^\s*Modulus:\n'. '((?:\s*[0-9a-f][0-9a-f]:(?:\n)?)+[0-9a-f][0-9a-f])$/m', $text, $modulus)) { |