diff options
| author | Benny Baumann <BenBE@geshi.org> | 2014-08-20 22:34:25 +0200 |
|---|---|---|
| committer | Benny Baumann <BenBE@geshi.org> | 2014-08-20 22:34:25 +0200 |
| commit | f7509bc9a6a2bcc1cae277d159aed71d6a0049c3 (patch) | |
| tree | 64608aa5b791333407ce6e1a1e238890d51c1e19 | |
| parent | 113e61529e3192197203a7acb3a73019fd251de1 (diff) | |
| parent | 061fec271f164c0efb356d98b5b4f640ed3c6c2f (diff) | |
| download | cacert-devel-f7509bc9a6a2bcc1cae277d159aed71d6a0049c3.tar.gz cacert-devel-f7509bc9a6a2bcc1cae277d159aed71d6a0049c3.tar.xz cacert-devel-f7509bc9a6a2bcc1cae277d159aed71d6a0049c3.zip | |
Merge branch 'bug-1297' into release
| -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 59c6cd6..dd4f3a5 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)) { |