aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2019-03-19 09:23:54 +0800
committerAlex Gaynor <alex.gaynor@gmail.com>2019-03-18 21:23:54 -0400
commitf2c2dfd7ce179b1763a98747282ea2ce019d6c1a (patch)
tree38570dd473bce7562aaf8ae725f10eb2331a76fc /src
parentc05b44b6d229e66cb16d4697d96918e1d0dccb41 (diff)
downloadcryptography-f2c2dfd7ce179b1763a98747282ea2ce019d6c1a.tar.gz
cryptography-f2c2dfd7ce179b1763a98747282ea2ce019d6c1a.tar.bz2
cryptography-f2c2dfd7ce179b1763a98747282ea2ce019d6c1a.zip
add new branch for unsupported openssh serialization (#4813)
we don't support ed448 openssh keys so we'll use that to test this branch. if we ever do support ed448 keys we can always just call this private method directly to keep coverage.
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/hazmat/backends/openssl/backend.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py
index 779d2ee1..74dedbe0 100644
--- a/src/cryptography/hazmat/backends/openssl/backend.py
+++ b/src/cryptography/hazmat/backends/openssl/backend.py
@@ -1892,8 +1892,7 @@ class Backend(object):
ssh._ssh_write_string(b"ssh-ed25519") +
ssh._ssh_write_string(raw_bytes)
)
- else:
- assert isinstance(key, ec.EllipticCurvePublicKey)
+ elif isinstance(key, ec.EllipticCurvePublicKey):
public_numbers = key.public_numbers()
try:
curve_name = {
@@ -1916,6 +1915,10 @@ class Backend(object):
ssh._ssh_write_string(curve_name) +
ssh._ssh_write_string(point)
)
+ else:
+ raise ValueError(
+ "OpenSSH encoding is not supported for this key type"
+ )
def _parameter_bytes(self, encoding, format, cdata):
if encoding is serialization.Encoding.OpenSSH: