diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2017-09-05 19:08:23 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2017-09-05 19:08:23 -0700 |
| commit | 57af3091bd5d178c9eb52f20fbcaa8c08005bc05 (patch) | |
| tree | c68417dacc6fa10ff3480ef3609e5a7649ed09bd /paramiko/dsskey.py | |
| parent | cf14b9ff3004b9c9316417cd657a77797675b628 (diff) | |
| parent | 6ab07ec442e0a7cc2436a90c800c0d10cc9adbd6 (diff) | |
| download | paramiko-57af3091bd5d178c9eb52f20fbcaa8c08005bc05.tar.gz | |
Merge branch 'master' into 979-int
Diffstat (limited to 'paramiko/dsskey.py')
| -rw-r--r-- | paramiko/dsskey.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/paramiko/dsskey.py b/paramiko/dsskey.py index 99734458..ac1d4c2e 100644 --- a/paramiko/dsskey.py +++ b/paramiko/dsskey.py @@ -49,6 +49,7 @@ class DSSKey(PKey): self.g = None self.y = None self.x = None + self.public_blob = None if file_obj is not None: self._from_private_key(file_obj, password) return @@ -60,10 +61,11 @@ class DSSKey(PKey): if vals is not None: self.p, self.q, self.g, self.y = vals else: - if msg is None: - raise SSHException('Key object may not be empty') - if msg.get_text() != 'ssh-dss': - raise SSHException('Invalid key') + self._check_type_and_load_cert( + msg=msg, + key_type='ssh-dss', + cert_type='ssh-dss-cert-v01@openssh.com', + ) self.p = msg.get_mpint() self.q = msg.get_mpint() self.g = msg.get_mpint() |