diff options
| author | Werner Koch <[email protected]> | 2013-08-26 15:29:54 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2013-08-28 15:40:32 +0000 |
| commit | 780ba3233618393835970bac4cf8aab713f4d7fa (patch) | |
| tree | 646f0a60cff18fb3743abeecc46bb2a21877937c /scd/command.c | |
| parent | agent: Fix two compiler warnings. (diff) | |
| download | gnupg-780ba3233618393835970bac4cf8aab713f4d7fa.tar.gz gnupg-780ba3233618393835970bac4cf8aab713f4d7fa.zip | |
gpg: Make decryption with the OpenPGP card work.
* scd/app-common.h (APP_DECIPHER_INFO_NOPAD): New.
* scd/app-openpgp.c (do_decipher): Add arg R_INFO.
* scd/app-nks.c (do_decipher): Add arg R_INFO as a dummy.
* scd/app.c (app_decipher): Add arg R_INFO.
* scd/command.c (cmd_pkdecrypt): Print status line "PADDING".
* agent/call-scd.c (padding_info_cb): New.
(agent_card_pkdecrypt): Add arg R_PADDING.
* agent/divert-scd.c (divert_pkdecrypt): Ditto.
* agent/pkdecrypt.c (agent_pkdecrypt): Ditto.
* agent/command.c (cmd_pkdecrypt): Print status line "PADDING".
* g10/call-agent.c (padding_info_cb): New.
(agent_pkdecrypt): Add arg R_PADDING.
* g10/pubkey-enc.c (get_it): Use padding info.
--
Decryption using a card never worked in gpg 2.1 because the
information whether the pkcs#1 padding needs to be removed was not
available. Gpg < 2.1 too this info from the secret sub key but that
has gone in 2.1.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | scd/command.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/scd/command.c b/scd/command.c index d5cc32cd9..05b50b935 100644 --- a/scd/command.c +++ b/scd/command.c @@ -1089,6 +1089,7 @@ cmd_pkdecrypt (assuan_context_t ctx, char *line) unsigned char *outdata; size_t outdatalen; char *keyidstr; + unsigned int infoflags; if ( IS_LOCKED (ctrl) ) return gpg_error (GPG_ERR_LOCKED); @@ -1103,7 +1104,7 @@ cmd_pkdecrypt (assuan_context_t ctx, char *line) keyidstr, pin_cb, ctx, ctrl->in_data.value, ctrl->in_data.valuelen, - &outdata, &outdatalen); + &outdata, &outdatalen, &infoflags); xfree (keyidstr); if (rc) @@ -1112,6 +1113,13 @@ cmd_pkdecrypt (assuan_context_t ctx, char *line) } else { + /* If the card driver told us that there is no padding, send a + status line. If there is a padding it is assumed that the + caller knows what padding is used. It would have been better + to always send that information but for backward + compatibility we can't do that. */ + if ((infoflags & APP_DECIPHER_INFO_NOPAD)) + send_status_direct (ctrl, "PADDING", "0"); rc = assuan_send_data (ctx, outdata, outdatalen); xfree (outdata); if (rc) |