diff options
| author | Kali Kaneko <kali@leap.se> | 2013-12-10 18:11:08 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-12-10 18:11:08 -0400 |
| commit | 2ca219c87a0a338d145cc52171864106688a7297 (patch) | |
| tree | 1207f4dbb76e4ef1992ec7b506912176b30bca92 /src/leap/keymanager/__init__.py | |
| parent | 99ee292afceac503f96689906351b84ca64265b7 (diff) | |
| parent | 441b7a40e1e41993d3909ebeab520b59058a6112 (diff) | |
Merge branch 'debian-0.3.7' into debian
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 |