projects
/
webmin.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5fe301b
)
Handle lack of RSA in kekey
author
Jamie Cameron
<jcameron@webmin.com>
Wed, 5 Jan 2011 18:04:48 +0000
(10:04 -0800)
committer
Jamie Cameron
<jcameron@webmin.com>
Wed, 5 Jan 2011 18:04:48 +0000
(10:04 -0800)
webmin/webmin-lib.pl
patch
|
blob
|
history
diff --git
a/webmin/webmin-lib.pl
b/webmin/webmin-lib.pl
index
3dd18fd
..
b9abf10
100755
(executable)
--- a/
webmin/webmin-lib.pl
+++ b/
webmin/webmin-lib.pl
@@
-978,7
+978,9
@@
line.
sub validate_key_cert
{
local $key = &read_file_contents($_[0]);
-$key =~ /BEGIN RSA PRIVATE KEY/i || &error(&text('ssl_ekey', $_[0]));
+$key =~ /BEGIN RSA PRIVATE KEY/i ||
+ $key =~ /BEGIN PRIVATE KEY/i ||
+ &error(&text('ssl_ekey', $_[0]));
if (!$_[1]) {
$key =~ /BEGIN CERTIFICATE/ || &error(&text('ssl_ecert', $_[0]));
}