Clean up use of label and s/n in CK_TOKEN_INFO.
authorWerner Koch <wk@gnupg.org>
Mon, 18 Feb 2019 15:53:23 +0000 (16:53 +0100)
committerWerner Koch <wk@gnupg.org>
Mon, 18 Feb 2019 15:53:23 +0000 (16:53 +0100)
commit90fe9f7be2a386fa7e4d7869fec32a4f4e24151b
tree586d9485bec8b77ac241401d0f663b7afbc56a3d
parenta148c216517c6dcf2d339f5060c5b09164dd18c9
Clean up use of label and s/n in CK_TOKEN_INFO.

* src/agent.c (scute_agent_learn): Also get the DISPSERIALNO.
(learn_status_cb): Support it.
* src/p11-gettokeninfo.c (C_GetTokenInfo): Simplify serialNumber
setting.
* src/slots.c (slot_token_label): Redirect to ...
(slot_token_serial): here and remove the secial OpenPGP card handling
which is not needed due to DISPSERIALNO.

Signed-off-by: Werner Koch <wk@gnupg.org>
src/agent.c
src/agent.h
src/p11-gettokeninfo.c
src/slots.c
src/slots.h