diff options
| author | Werner Koch <[email protected]> | 2004-04-28 11:55:46 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2004-04-28 11:55:46 +0000 |
| commit | 75f14e85713dfcd5a851489d491506d5e34aba01 (patch) | |
| tree | 1793dbaba0c34f651c045d0c164de645c45844d6 /g10/app-openpgp.c | |
| parent | (keyserver_spawn) [EXEC_TEMPFILE_ONLY]: Removed (diff) | |
| download | gnupg-75f14e85713dfcd5a851489d491506d5e34aba01.tar.gz gnupg-75f14e85713dfcd5a851489d491506d5e34aba01.zip | |
* card-util.c (card_edit): Require PIN only for generate.
* app-openpgp.c (do_setattr): Sync FORCE_CHV1.
Diffstat (limited to '')
| -rw-r--r-- | g10/app-openpgp.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/g10/app-openpgp.c b/g10/app-openpgp.c index 07420c697..f40951941 100644 --- a/g10/app-openpgp.c +++ b/g10/app-openpgp.c @@ -704,13 +704,14 @@ do_setattr (APP app, const char *name, static struct { const char *name; int tag; + int special; } table[] = { { "DISP-NAME", 0x005B }, { "LOGIN-DATA", 0x005E }, { "DISP-LANG", 0x5F2D }, { "DISP-SEX", 0x5F35 }, { "PUBKEY-URL", 0x5F50 }, - { "CHV-STATUS-1", 0x00C4 }, + { "CHV-STATUS-1", 0x00C4, 1 }, { "CA-FPR-1", 0x00CA }, { "CA-FPR-2", 0x00CB }, { "CA-FPR-3", 0x00CC }, @@ -735,6 +736,9 @@ do_setattr (APP app, const char *name, if (rc) log_error ("failed to set `%s': %s\n", table[idx].name, gpg_strerror (rc)); + if (table[idx].special == 1) + app->force_chv1 = (valuelen && *value == 0); + return rc; } |