Merge branch '2.2' into 2.3

1 files changed, 8 insertions, 0 deletions

diff --git a/tests/test_pkey.py b/tests/test_pkey.py
index 08d38e3b..4e84da7b 100644
--- a/tests/test_pkey.py
+++ b/tests/test_pkey.py
@@ -468,6 +468,14 @@ class KeyTest(unittest.TestCase):
         )
         self.assertNotEqual(key1.asbytes(), key2.asbytes())
 
+    def test_ed25519_funky_padding(self):
+        # Proves #1306 by just not exploding with 'Invalid key'.
+        Ed25519Key.from_private_key_file(_support("test_ed25519-funky-padding.key"))
+
+    def test_ed25519_funky_padding_with_passphrase(self):
+        # Proves #1306 by just not exploding with 'Invalid key'.
+        Ed25519Key.from_private_key_file(_support("test_ed25519-funky-padding_password.key"), b"asdf")
+
     def test_ed25519_compare(self):
         # verify that the private & public keys compare equal
         key = Ed25519Key.from_private_key_file(_support("test_ed25519.key"))