diff options
author | Jeremy T. Bouse <jbouse@debian.org> | 2015-03-12 21:35:59 -0400 |
---|---|---|
committer | Jeremy T. Bouse <jbouse@debian.org> | 2015-03-12 21:35:59 -0400 |
commit | 01653e8710c38f3066078b2773ad47ccb3670c58 (patch) | |
tree | 8284e75857a06945167186d09dd9021fd24c2ee1 /paramiko/dsskey.py | |
parent | 74794f84c2d9906aea5024dfccd90482fff9bab3 (diff) | |
parent | f784a533d6e1d09e89dc254f3493b491e19c94f0 (diff) | |
download | python-paramiko-01653e8710c38f3066078b2773ad47ccb3670c58.tar python-paramiko-01653e8710c38f3066078b2773ad47ccb3670c58.tar.gz |
Merge tag 'upstream/1.15.2'
Upstream version 1.15.2
Diffstat (limited to 'paramiko/dsskey.py')
-rw-r--r-- | paramiko/dsskey.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/paramiko/dsskey.py b/paramiko/dsskey.py index 1901596..d7dd627 100644 --- a/paramiko/dsskey.py +++ b/paramiko/dsskey.py @@ -154,6 +154,7 @@ class DSSKey (PKey): def write_private_key(self, file_obj, password=None): self._write_private_key('DSA', file_obj, self._encode_key(), password) + @staticmethod def generate(bits=1024, progress_func=None): """ Generate a new private DSS key. This factory function can be used to @@ -169,7 +170,6 @@ class DSSKey (PKey): key = DSSKey(vals=(dsa.p, dsa.q, dsa.g, dsa.y)) key.x = dsa.x return key - generate = staticmethod(generate) ### internals... |