Merge pull request #10 from oyarzun/ecdsa-assertion

ecdsa: check for AssertionError
ojarva · Apr 12, 2016 · e46c4f8 · e46c4f8
2 parents 8c8bbb3 + a161159
commit e46c4f8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/sshpubkeys/__init__.py b/sshpubkeys/__init__.py
@@ -161,8 +161,10 @@ def parse(self):
             curve, hash_algorithm = curve_data[curve_information]
 
             data = self.unpack_by_int()
-
-            ecdsa_key = ecdsa.VerifyingKey.from_string(data[1:], curve, hash_algorithm)
+            try:
+                ecdsa_key = ecdsa.VerifyingKey.from_string(data[1:], curve, hash_algorithm)
+            except AssertionError:
+                raise InvalidKeyException("Invalid ecdsa key")  
             self.bits = int(curve_information.replace(b"nistp", b"")) # TODO
             self.ecdsa = ecdsa_key
         elif self.key_type == b"ssh-ed25519":

diff --git a/tests/invalid_keys.py b/tests/invalid_keys.py
@@ -11,6 +11,8 @@
  ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAH0GODBKRjsFB/1v3pDRGpA6xR+QpOJg9vat0brlbUNA=", TooShortKeyException, "too_short_ed25519"],
  ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIUGODBKRjsFB/1v3pDRGpA6xR+QpOJg9vat0brlbUNDDpA==", TooLongKeyException, "too_long_ed25519"],
 
+ ["ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE2gqbAChP2h3fTPx3Jy2KdOJUiBGEiqBUwoosfzllw+KrqmGiDEWlufSxdiSOFuLd4a8PSwhoWbdQgRVFrZAvFE=", InvalidKeyException, "invalid_ecdsa_key"],
+
  ["ecdsa-sha2-nistp255 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTUAAAAIbmlzdHAyNTUAAABBBE2gqbAChP2h3fTPx3Jy2KdOJUiBGEiqBUwoosfzllw+KrqmGiDEWlufSxdiSOFuLd4a8PSwhoWbdQRVFrZAvFE=", NotImplementedError, "invalid_nist_curve"],
  ["", InvalidKeyException, "empty_key"],
  ["- -", MalformedDataException, "no_content"],