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>