diff options
Diffstat (limited to 'g10/call-agent.c')
| -rw-r--r-- | g10/call-agent.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/g10/call-agent.c b/g10/call-agent.c index a1a48c75c..5e13a3e52 100644 --- a/g10/call-agent.c +++ b/g10/call-agent.c @@ -1082,7 +1082,7 @@ agent_keytotpm (ctrl_t ctrl, const char *hexgrip) if (strchr (hexgrip, ',')) { - log_error ("storing a part of a dual key is not yet supported\n"); + log_error ("storing a part of a composite key is not yet supported\n"); return gpg_error (GPG_ERR_NOT_IMPLEMENTED); } @@ -1117,7 +1117,7 @@ agent_keytocard (const char *hexgrip, int keyno, int force, if (strchr (hexgrip, ',')) { - log_error ("storing a part of a dual key is not yet supported\n"); + log_error ("storing a part of a composite key is not yet supported\n"); return gpg_error (GPG_ERR_NOT_IMPLEMENTED); } @@ -2484,8 +2484,6 @@ agent_get_keyinfo (ctrl_t ctrl, const char *hexkeygrip, if (err) return err; - /* FIXME: Support dual keys. Maybe under the assumption that the - * first key might be on a card. */ if (!hexkeygrip) return gpg_error (GPG_ERR_INV_VALUE); s = strchr (hexkeygrip, ','); @@ -3236,7 +3234,7 @@ agent_export_key (ctrl_t ctrl, const char *hexkeygrip, const char *desc, snprintf (line, DIM(line), "EXPORT_KEY %s%s%s %s", mode1003? "--mode1003" : openpgp_protected ? "--openpgp ":"", - cache_nonce_addr && *cache_nonce_addr? "--cache-nonce=":"", + cache_nonce_addr && *cache_nonce_addr? " --cache-nonce=":"", cache_nonce_addr && *cache_nonce_addr? *cache_nonce_addr:"", hexkeygrip); @@ -3322,7 +3320,7 @@ agent_delete_key (ctrl_t ctrl, const char *hexkeygrip, const char *desc, return err; } - /* FIXME: Shall we add support to DELETE_KEY for dual keys? */ + /* FIXME: Shall we add support to DELETE_KEY for composite keys? */ snprintf (line, DIM(line), "DELETE_KEY%s %s", force? " --force":"", hexkeygrip); err = assuan_transact (agent_ctx, line, NULL, NULL, |