bytes input for VerifyingKey.from_der()

Author: tomato42

src/ecdsa/der.py

@@ -135,7 +135,7 @@ def remove_constructed(string):
 def remove_sequence(string):
     if not string:
         raise UnexpectedDER("Empty string does not encode a sequence")
-    if not string.startswith(b("\x30")):
+    if string[:1] != b"\x30":
         n = string[0] if isinstance(string[0], integer_types) else \
                 ord(string[0])
         raise UnexpectedDER("wanted type 'sequence' (0x30), got 0x%02x" % n)
@@ -157,7 +157,7 @@ def remove_octet_string(string):
 
 
 def remove_object(string):
-    if not string.startswith(b("\x06")):
+    if string[:1] != b"\x06":
         n = string[0] if isinstance(string[0], integer_types) else ord(string[0])
         raise UnexpectedDER("wanted type 'object' (0x06), got 0x%02x" % n)
     length, lengthlength = read_length(string[1:])
@@ -302,7 +302,7 @@ def remove_bitstring(string, expect_unused=_sentry):
                       " specified",
                       DeprecationWarning)
     num = string[0] if isinstance(string[0], integer_types) else ord(string[0])
-    if not string.startswith(b("\x03")):
+    if string[:1] != b"\x03":
         raise UnexpectedDER("wanted bitstring (0x03), got 0x%02x" % num)
     length, llen = read_length(string[1:])
     if not length:

src/ecdsa/keys.py

@@ -328,24 +328,25 @@ def from_der(cls, string):
         :return: Initialised VerifyingKey object
         :rtype: VerifyingKey
         """
+        string = normalise_bytes(string)
         # [[oid_ecPublicKey,oid_curve], point_str_bitstring]
         s1, empty = der.remove_sequence(string)
-        if empty != b(""):
+        if empty != b"":
             raise der.UnexpectedDER("trailing junk after DER pubkey: %s" %
                                     binascii.hexlify(empty))
         s2, point_str_bitstring = der.remove_sequence(s1)
         # s2 = oid_ecPublicKey,oid_curve
         oid_pk, rest = der.remove_object(s2)
         oid_curve, empty = der.remove_object(rest)
-        if empty != b(""):
+        if empty != b"":
             raise der.UnexpectedDER("trailing junk after DER pubkey objects: %s" %
                                     binascii.hexlify(empty))
         if not oid_pk == oid_ecPublicKey:
             raise der.UnexpectedDER("Unexpected object identifier in DER "
                                     "encoding: {0!r}".format(oid_pk))
         curve = find_curve(oid_curve)
         point_str, empty = der.remove_bitstring(point_str_bitstring, 0)
-        if empty != b(""):
+        if empty != b"":
             raise der.UnexpectedDER("trailing junk after pubkey pointstring: %s" %
                                     binascii.hexlify(empty))
         # raw encoding of point is invalid in DER files

src/ecdsa/test_keys.py

@@ -127,7 +127,6 @@ def test_bytes(self):
 
         self.assertEqual(self.vk.to_string(), vk.to_string())
 
-    @unittest.expectedFailure
     def test_bytes_memoryview(self):
         vk = VerifyingKey.from_der(buffer(self.key_bytes))
 
@@ -138,15 +137,19 @@ def test_bytearray(self):
 
         self.assertEqual(self.vk.to_string(), vk.to_string())
 
-    @unittest.expectedFailure
     def test_bytesarray_memoryview(self):
         vk = VerifyingKey.from_der(buffer(bytearray(self.key_bytes)))
 
         self.assertEqual(self.vk.to_string(), vk.to_string())
 
-    @unittest.expectedFailure
     def test_array_array_of_bytes(self):
         arr = array.array('B', self.key_bytes)
         vk = VerifyingKey.from_der(arr)
 
         self.assertEqual(self.vk.to_string(), vk.to_string())
+
+    def test_array_array_of_bytes_memoryview(self):
+        arr = array.array('B', self.key_bytes)
+        vk = VerifyingKey.from_der(buffer(arr))
+
+        self.assertEqual(self.vk.to_string(), vk.to_string())