diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-12-18 11:19:35 -0800 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-12-18 11:19:35 -0800 |
| commit | b3884d2c44233f16cd334c4abcfddcf5e8bf8ef6 (patch) | |
| tree | 107d26c33a7fb1428bda2ed5be9b9e2e09277c72 /paramiko/rsakey.py | |
| parent | 37756f3a8892dbb41dfda74dcf37e21053bf4e34 (diff) | |
| parent | 681f32583fe052c0516a2fda67e163169676ad11 (diff) | |
| download | paramiko-b3884d2c44233f16cd334c4abcfddcf5e8bf8ef6.tar.gz | |
Merge branch 'master' into switch-to-cryptography
Conflicts:
paramiko/ecdsakey.py
paramiko/util.py
Diffstat (limited to 'paramiko/rsakey.py')
| -rw-r--r-- | paramiko/rsakey.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/paramiko/rsakey.py b/paramiko/rsakey.py index ef39c41f..aac57f91 100644 --- a/paramiko/rsakey.py +++ b/paramiko/rsakey.py @@ -155,6 +155,7 @@ class RSAKey(PKey): def write_private_key(self, file_obj, password=None): self._write_private_key('RSA', file_obj, self._encode_key(), password) + @staticmethod def generate(bits, progress_func=None): """ Generate a new private RSA key. This factory function can be used to @@ -175,7 +176,6 @@ class RSAKey(PKey): key.dmq1 = numbers.dmq1 key.iqmp = numbers.iqmp return key - generate = staticmethod(generate) ### internals... |