deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix cmd_pso and cmd_internal_authenticate.

Browse Source
This commit is contained in:
NIIBE Yutaka
2018-11-09 18:57:51 +09:00
parent c800dee95e
commit 17492287f3
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -1,5 +1,8 @@
2018-11-09 NIIBE Yutaka <gniibe@fsij.org> 2018-11-09 NIIBE Yutaka <gniibe@fsij.org>
* src/openpgp.c (cmd_pso, cmd_internal_authenticate): Use
ccid_comm.
* src/usb-ccid.c (wait_for_tx_finish): New. * src/usb-ccid.c (wait_for_tx_finish): New.
(ccid_error, ccid_power_on, ccid_send_status, ccid_power_off) (ccid_error, ccid_power_on, ccid_send_status, ccid_power_off)
(ccid_send_data_block_internal, ccid_send_data_block_0x9000) (ccid_send_data_block_internal, ccid_send_data_block_0x9000)

4
src/openpgp.c
View File

@@ -1043,6 +1043,8 @@ cmd_pso (struct eventflag *ccid_comm)
#ifdef ACKBTN_SUPPORT #ifdef ACKBTN_SUPPORT
if (gpg_do_get_uif (GPG_KEY_FOR_DECRYPTION)) if (gpg_do_get_uif (GPG_KEY_FOR_DECRYPTION))
eventflag_signal (ccid_comm, EV_EXEC_ACK_REQUIRED); eventflag_signal (ccid_comm, EV_EXEC_ACK_REQUIRED);
#else
(void)ccid_comm;
#endif #endif
if (attr == ALGO_RSA2K || attr == ALGO_RSA4K) if (attr == ALGO_RSA2K || attr == ALGO_RSA4K)
@@ -1154,6 +1156,8 @@ cmd_internal_authenticate (struct eventflag *ccid_comm)
#ifdef ACKBTN_SUPPORT #ifdef ACKBTN_SUPPORT
if (gpg_do_get_uif (GPG_KEY_FOR_AUTHENTICATION)) if (gpg_do_get_uif (GPG_KEY_FOR_AUTHENTICATION))
eventflag_signal (ccid_comm, EV_EXEC_ACK_REQUIRED); eventflag_signal (ccid_comm, EV_EXEC_ACK_REQUIRED);
#else
(void)ccid_comm;
#endif #endif
if (attr == ALGO_RSA2K || attr == ALGO_RSA4K) if (attr == ALGO_RSA2K || attr == ALGO_RSA4K)