WSAA: fix issue reingart#131

Author: abernardi

wsaa.py

@@ -112,7 +112,10 @@ def create_tra(service=SERVICE, ttl=2400):
 def sign_tra_new(tra, cert=CERT, privatekey=PRIVATEKEY, passphrase=""):
     "Sign Digital transactions with cryptography versions >= 39 in python 3"
     # Leer privatekey y cert
-    if not privatekey.startswith(b"-----BEGIN RSA PRIVATE KEY-----"):
+    if not privatekey.startswith((
+            b"-----BEGIN RSA PRIVATE KEY-----",
+            b"-----BEGIN PRIVATE KEY-----",
+            b"-----BEGIN ENCRYPTED PRIVATE KEY-----")):
         privatekey = open(privatekey).read()
         if isinstance(privatekey, str):
             privatekey = privatekey.encode("utf-8")
@@ -155,7 +158,10 @@ def sign_tra_old(tra, cert=CERT, privatekey=PRIVATEKEY, passphrase=""):
     "Legacy method for signing python 2.7 digital transactions on python 2.7"
 
     # Leer privatekey y cert
-    if not privatekey.startswith(b"-----BEGIN RSA PRIVATE KEY-----"):
+    if not privatekey.startswith((
+            b"-----BEGIN RSA PRIVATE KEY-----",
+            b"-----BEGIN PRIVATE KEY-----",
+            b"-----BEGIN ENCRYPTED PRIVATE KEY-----")):
         privatekey = open(privatekey).read()
         if isinstance(privatekey, str):
             privatekey = privatekey.encode("utf-8")