diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-12-06 15:34:13 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-12-06 15:34:13 -0300 |
| commit | 77e4e1d037a8eb796553b3f28f31e4f4d1ccee84 (patch) | |
| tree | b667d20fe552ed26c8094712beb2e81c1e637aab /src/leap/keymanager/__init__.py | |
| parent | ae80ea1f0a748c2746026bd1a17815d786722b84 (diff) | |
| parent | 48751fa19bf9d9dfd1acbe96c582d08d57b81d07 (diff) | |
Merge branch 'release-0.3.7'0.3.7
Diffstat (limited to 'src/leap/keymanager/__init__.py')
| -rw-r--r-- | src/leap/keymanager/__init__.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/leap/keymanager/__init__.py b/src/leap/keymanager/__init__.py index dbc5489..6cfbf71 100644 --- a/src/leap/keymanager/__init__.py +++ b/src/leap/keymanager/__init__.py @@ -425,6 +425,9 @@ class KeyManager(object): :type data: str :param privkey: The key used to decrypt. :type privkey: OpenPGPKey + :param passphrase: The passphrase for the secret key used for + decryption. + :type passphrase: str :param verify: The key used to verify a signature. :type verify: OpenPGPKey |