diff options
| -rw-r--r-- | scd/app-common.h | 4 | ||||
| -rw-r--r-- | scd/app-nks.c | 2 | ||||
| -rw-r--r-- | scd/app-p15.c | 2 | ||||
| -rw-r--r-- | scd/app-piv.c | 3 | ||||
| -rw-r--r-- | scd/app-sc-hsm.c | 2 | ||||
| -rw-r--r-- | scd/app.c | 2 | ||||
| -rw-r--r-- | scd/command.c | 4 |
7 files changed, 12 insertions, 7 deletions
diff --git a/scd/app-common.h b/scd/app-common.h index 5866c9b32..9fadafd6a 100644 --- a/scd/app-common.h +++ b/scd/app-common.h @@ -39,9 +39,11 @@ /* Flags used with app_readkey. */ #define APP_READKEY_FLAG_INFO 1 /* Send also a KEYPAIRINFO line. */ -/* Bit flags set by the decipher function into R_INFO. */ +/* Flags set by the decipher function into R_INFO. */ #define APP_DECIPHER_INFO_NOPAD 1 /* Padding has been removed. */ +/* Flags used by the app_write_learn_status. */ +#define APP_LEARN_FLAG_KEYPAIRINFO 1 /* Return only keypair infos. */ /* List of supported card types. Generic is the usual ISO7817-4 * compliant card. More specific card or token versions can be given diff --git a/scd/app-nks.c b/scd/app-nks.c index 898a838c3..bb5329bfe 100644 --- a/scd/app-nks.c +++ b/scd/app-nks.c @@ -420,7 +420,7 @@ do_learn_status_core (app_t app, ctrl_t ctrl, unsigned int flags, int is_sigg) if (!!filelist[i].is_sigg != !!is_sigg) continue; - if (filelist[i].certtype && !(flags &1)) + if (filelist[i].certtype && !(flags & APP_LEARN_FLAG_KEYPAIRINFO)) { size_t len; diff --git a/scd/app-p15.c b/scd/app-p15.c index ce82b34a9..348242f4f 100644 --- a/scd/app-p15.c +++ b/scd/app-p15.c @@ -2500,7 +2500,7 @@ do_learn_status (app_t app, ctrl_t ctrl, unsigned int flags) { gpg_error_t err; - if ((flags & 1)) + if ((flags & APP_LEARN_FLAG_KEYPAIRINFO)) err = 0; else { diff --git a/scd/app-piv.c b/scd/app-piv.c index 3b94a28e4..82d52aabc 100644 --- a/scd/app-piv.c +++ b/scd/app-piv.c @@ -1176,7 +1176,8 @@ do_learn_status (app_t app, ctrl_t ctrl, unsigned int flags) for (i=0; data_objects[i].tag; i++) if (data_objects[i].keypair) - send_keypair_and_cert_info (app, ctrl, data_objects + i, !!(flags & 1)); + send_keypair_and_cert_info (app, ctrl, data_objects + i, + !!(flags & APP_LEARN_FLAG_KEYPAIRINFO)); return 0; diff --git a/scd/app-sc-hsm.c b/scd/app-sc-hsm.c index 16d25b581..2f1ab2074 100644 --- a/scd/app-sc-hsm.c +++ b/scd/app-sc-hsm.c @@ -1407,7 +1407,7 @@ do_learn_status (app_t app, ctrl_t ctrl, unsigned int flags) { gpg_error_t err; - if ((flags & 1)) + if ((flags & APP_LEARN_FLAG_KEYPAIRINFO)) err = 0; else { @@ -1054,7 +1054,7 @@ app_write_learn_status (card_t card, ctrl_t ctrl, unsigned int flags) app = card->app; /* We do not send CARD and APPTYPE if only keypairinfo is requested. */ - if (!(flags &1)) + if (!(flags & APP_LEARN_FLAG_KEYPAIRINFO)) { if (card->cardtype) send_status_direct (ctrl, "CARDTYPE", strcardtype (card->cardtype)); diff --git a/scd/command.c b/scd/command.c index d6962a946..1baa9670d 100644 --- a/scd/command.c +++ b/scd/command.c @@ -475,7 +475,9 @@ cmd_learn (assuan_context_t ctx, char *line) /* Let the application print out its collection of useful status information. */ if (!rc) - rc = app_write_learn_status (ctrl->card_ctx, ctrl, only_keypairinfo); + rc = app_write_learn_status + (ctrl->card_ctx, ctrl, + (only_keypairinfo? APP_LEARN_FLAG_KEYPAIRINFO : 0)); return rc; } |