diff options
| author | Werner Koch <[email protected]> | 2008-12-05 16:31:39 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2008-12-05 16:31:39 +0000 |
| commit | 5bc9948f699b70c76dc0c7c406817d077b61317d (patch) | |
| tree | 2c59e77471cbf6f02fea58466c4b5544a9b74cad /sm/certreqgen.c | |
| parent | Add option --card-timeout. (diff) | |
| download | gnupg-5bc9948f699b70c76dc0c7c406817d077b61317d.tar.gz gnupg-5bc9948f699b70c76dc0c7c406817d077b61317d.zip | |
Add a custom prompt for the CSR generation.
Add a new percent escape fucntion.
Diffstat (limited to 'sm/certreqgen.c')
| -rw-r--r-- | sm/certreqgen.c | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/sm/certreqgen.c b/sm/certreqgen.c index 30b8179fd..ca791aab8 100644 --- a/sm/certreqgen.c +++ b/sm/certreqgen.c @@ -788,6 +788,8 @@ create_request (ctrl_t ctrl, gcry_sexp_release (s_pkey); bin2hex (grip, 20, hexgrip); + log_info ("about to sign CSR for key: &%s\n", hexgrip); + if (carddirect) rc = gpgsm_scd_pksign (ctrl, carddirect, NULL, gcry_md_read(md, GCRY_MD_SHA1), @@ -795,11 +797,23 @@ create_request (ctrl_t ctrl, GCRY_MD_SHA1, &sigval, &siglen); else - rc = gpgsm_agent_pksign (ctrl, hexgrip, NULL, - gcry_md_read(md, GCRY_MD_SHA1), - gcry_md_get_algo_dlen (GCRY_MD_SHA1), - GCRY_MD_SHA1, - &sigval, &siglen); + { + char *orig_codeset; + char *desc; + + orig_codeset = i18n_switchto_utf8 (); + desc = percent_plus_escape + (_("To complete this certificate request please enter" + " the passphrase for the key you just created once" + " more.\n")); + i18n_switchback (orig_codeset); + rc = gpgsm_agent_pksign (ctrl, hexgrip, desc, + gcry_md_read(md, GCRY_MD_SHA1), + gcry_md_get_algo_dlen (GCRY_MD_SHA1), + GCRY_MD_SHA1, + &sigval, &siglen); + xfree (desc); + } if (rc) { log_error ("signing failed: %s\n", gpg_strerror (rc)); @@ -818,7 +832,7 @@ create_request (ctrl_t ctrl, } } while (stopreason != KSBA_SR_READY); - + leave: gcry_md_close (md); |