summaryrefslogtreecommitdiff
path: root/includes/lib/check_weak_key.php
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2014-12-04 18:26:23 +0100
committerMichael Tänzer <neo@nhng.de>2014-12-04 18:26:23 +0100
commitb0904b2bda37b292fa5d29d5d3b7ec64d100ad16 (patch)
treea10f5fb0dfefccc4bbf5890d02f273ef770ba4b6 /includes/lib/check_weak_key.php
parentc7c4d077688807bcbec21e11d0aeb0af9ebfbd30 (diff)
downloadcacert-b0904b2bda37b292fa5d29d5d3b7ec64d100ad16.tar.gz
cacert-b0904b2bda37b292fa5d29d5d3b7ec64d100ad16.tar.xz
cacert-b0904b2bda37b292fa5d29d5d3b7ec64d100ad16.zip
Source code taken from cacert-20141124.tar.bz2HEADmaster
Diffstat (limited to 'includes/lib/check_weak_key.php')
-rw-r--r--includes/lib/check_weak_key.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/includes/lib/check_weak_key.php b/includes/lib/check_weak_key.php
index 8ad2ccf..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");
@@ -173,7 +173,7 @@ function checkWeakKeyText($text)
$exponent = $exponent[1]; // exponent might be very big =>
//handle as string using bc*()
- if (bccomp($exponent, "3") === 0)
+ if (bccomp($exponent, "65537") < 0)
{
return sprintf(_("The keys you use might be insecure. ".
"Although there is currently no known attack for ".
@@ -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))
{