summaryrefslogtreecommitdiff
path: root/paramiko/dsskey.py
diff options
context:
space:
mode:
authorRobey Pointer <robey@lag.net>2005-02-15 15:48:47 +0000
committerRobey Pointer <robey@lag.net>2005-02-15 15:48:47 +0000
commitfb2d7bbdddeefd7c519c5a300b2f810fb364884f (patch)
treea7c2a512898ad49f8b83dea08464e63a9291526c /paramiko/dsskey.py
parentc7d56a309d8a1e0b9999cc39e24697f3d45eedcf (diff)
downloadparamiko-fb2d7bbdddeefd7c519c5a300b2f810fb364884f.tar.gz
[project @ Arch-1:robey@lag.net--2003-public%secsh--dev--1.0--patch-146]
raise better exception on empty key raise a clearer exception when trying to create an empty key.
Diffstat (limited to 'paramiko/dsskey.py')
-rw-r--r--paramiko/dsskey.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/paramiko/dsskey.py b/paramiko/dsskey.py
index 09952b9d..f1fe5ae1 100644
--- a/paramiko/dsskey.py
+++ b/paramiko/dsskey.py
@@ -47,7 +47,9 @@ class DSSKey (PKey):
if vals is not None:
self.p, self.q, self.g, self.y = vals
else:
- if (msg is None) or (msg.get_string() != 'ssh-dss'):
+ if msg is None:
+ raise SSHException('Key object may not be empty')
+ if msg.get_string() != 'ssh-dss':
raise SSHException('Invalid key')
self.p = msg.get_mpint()
self.q = msg.get_mpint()