Tweak regexp for private key

This commit is contained in:
Jamie Cameron
2011-11-16 21:07:27 -08:00
parent ac702c3b3c
commit 51bb0047ac

View File

@@ -8,8 +8,8 @@ require './webmin-lib.pl';
# Validate inputs
$key = $in{'key'} || $in{'keyfile'};
$key =~ s/\r//g;
$key =~ /BEGIN .*PRIVATE KEY/ &&
$key =~ /END .*PRIVATE KEY/ || &error($text{'savekey_ekey'});
$key =~ /BEGIN (RSA )?PRIVATE KEY/ &&
$key =~ /END (RSA )?PRIVATE KEY/ || &error($text{'savekey_ekey'});
if (!$in{'cert_def'}) {
# Make sure cert is valid
$cert = $in{'cert'} || $in{'certfile'};