summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2013-10-15 22:36:31 +0200
committerBenny Baumann <BenBE@geshi.org>2013-10-15 22:36:31 +0200
commit8947e9bec9c0b39a62fb852f3e87702cfadb9211 (patch)
tree48f6f03470353d5f4f33bff9f7ffc10e02c570d4 /includes
parent02f5da9c7ed1c6882320f64b5da753841be7ad70 (diff)
parentc190302739d470d6c8fd43d93b5fad776323d467 (diff)
downloadcacert-devel-8947e9bec9c0b39a62fb852f3e87702cfadb9211.tar.gz
cacert-devel-8947e9bec9c0b39a62fb852f3e87702cfadb9211.tar.xz
cacert-devel-8947e9bec9c0b39a62fb852f3e87702cfadb9211.zip
Merge branch 'bug-918' into release
Diffstat (limited to 'includes')
-rw-r--r--includes/keygen.php2
-rw-r--r--includes/lib/check_weak_key.php7
2 files changed, 2 insertions, 7 deletions
diff --git a/includes/keygen.php b/includes/keygen.php
index 09ec7f9..2713a81 100644
--- a/includes/keygen.php
+++ b/includes/keygen.php
@@ -75,7 +75,7 @@ if (array_key_exists('HTTP_USER_AGENT',$_SERVER) && strstr($_SERVER['HTTP_USER_A
<p style="color:red"><?php
printf(_('Please note that RSA key sizes smaller than %d bit '.
'will not be accepted by CAcert.'),
- 1024)?>
+ 2048)?>
</p>
</fieldset>
diff --git a/includes/lib/check_weak_key.php b/includes/lib/check_weak_key.php
index ca13ba2..217b885 100644
--- a/includes/lib/check_weak_key.php
+++ b/includes/lib/check_weak_key.php
@@ -137,7 +137,7 @@ function checkWeakKeyText($text)
$keysize = intval($keysize[1]);
}
- if ($keysize < 1024)
+ if ($keysize < 2048)
{
return sprintf(_("The keys that you use are very small ".
"and therefore insecure. Please generate stronger ".
@@ -145,11 +145,6 @@ function checkWeakKeyText($text)
"found in %sthe wiki%s"),
"<a href='//wiki.cacert.org/WeakKeys#SmallKey'>",
"</a>");
- } elseif ($keysize < 2048) {
- // not critical but log so we have some statistics about
- // affected users
- trigger_error("checkWeakKeyText(): Certificate for small ".
- "key (< 2048 bit) requested", E_USER_NOTICE);
}