diff options
| author | Werner Koch <[email protected]> | 2013-02-12 18:17:42 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2013-02-12 18:17:42 +0000 |
| commit | caddeef4a7ffe5f2eb6453d364b6ae152e0f6625 (patch) | |
| tree | 5894e3f0e365b0c9035efecea2bbd5ad3042ca51 /g10/main.h | |
| parent | kbx: Switch from MD5 to SHA-1 for the checksum. (diff) | |
| parent | gpg: Implement card_store_subkey again. (diff) | |
| download | gnupg-caddeef4a7ffe5f2eb6453d364b6ae152e0f6625.tar.gz gnupg-caddeef4a7ffe5f2eb6453d364b6ae152e0f6625.zip | |
Merge branch 'master' into key-storage-work
Diffstat (limited to '')
| -rw-r--r-- | g10/main.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/g10/main.h b/g10/main.h index d25265aa7..15d3b7627 100644 --- a/g10/main.h +++ b/g10/main.h @@ -353,6 +353,8 @@ void unblock_all_signals(void); /*-- server.c --*/ int gpg_server (ctrl_t); +gpg_error_t gpg_proxy_pinentry_notify (ctrl_t ctrl, + const unsigned char *line); #ifdef ENABLE_CARD_SUPPORT /*-- card-util.c --*/ |