From 51bb0047ac6097a3d6ae0bbcfebccba594313b40 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Wed, 16 Nov 2011 21:07:27 -0800
Subject: [PATCH] Tweak regexp for private key

---
 webmin/savekey.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webmin/savekey.cgi b/webmin/savekey.cgi
index 15f0b6214..1d817adff 100755
--- a/webmin/savekey.cgi
+++ b/webmin/savekey.cgi
@@ -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'};