Keys generated under debian sid just read "BEGIN PRIVATE KEY" rather
than "BEGIN RSA PRIVATE KEY".

Signed-off-by: Guido Trotter <[email protected]>
---
 test/ganeti.utils.x509_unittest.py |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/ganeti.utils.x509_unittest.py 
b/test/ganeti.utils.x509_unittest.py
index 33e553e..2249e89 100755
--- a/test/ganeti.utils.x509_unittest.py
+++ b/test/ganeti.utils.x509_unittest.py
@@ -210,8 +210,10 @@ class TestGenerateSelfSignedX509Cert(unittest.TestCase):
 
   def _checkRsaPrivateKey(self, key):
     lines = key.splitlines()
-    return ("-----BEGIN RSA PRIVATE KEY-----" in lines and
-            "-----END RSA PRIVATE KEY-----" in lines)
+    return (("-----BEGIN RSA PRIVATE KEY-----" in lines and
+             "-----END RSA PRIVATE KEY-----" in lines) or
+            ("-----BEGIN PRIVATE KEY-----" in lines and
+             "-----END PRIVATE KEY-----" in lines))
 
   def _checkCertificate(self, cert):
     lines = cert.splitlines()
-- 
1.7.2.5

Reply via email to