diff options
| author | Werner Koch <[email protected]> | 2007-03-20 10:17:05 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2007-03-20 10:17:05 +0000 |
| commit | 75f761e6ef107d5e6b2a31d3c12eb57ed3acd97a (patch) | |
| tree | b4cdcf699fb36fe9632f42ee67c7bc34e301d8ea | |
| parent | Allow setting of the passphrase encoding of pkcs#12 files. (diff) | |
| download | gnupg-75f761e6ef107d5e6b2a31d3c12eb57ed3acd97a.tar.gz gnupg-75f761e6ef107d5e6b2a31d3c12eb57ed3acd97a.zip | |
Make gpgconf aware of --p12-charset.
Diffstat (limited to '')
| -rw-r--r-- | sm/gpgsm.c | 2 | ||||
| -rw-r--r-- | tools/ChangeLog | 4 | ||||
| -rw-r--r-- | tools/gpgconf-comp.c | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/sm/gpgsm.c b/sm/gpgsm.c index 9abd0636e..263632c6f 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -1439,6 +1439,8 @@ main ( int argc, char **argv) GC_OPT_FLAG_NONE ); printf ("cipher-algo:%lu:\"3DES:\n", GC_OPT_FLAG_DEFAULT ); + printf ("p12-charset:%lu:\n", + GC_OPT_FLAG_DEFAULT ); } break; diff --git a/tools/ChangeLog b/tools/ChangeLog index c369506ae..d5f3c4d75 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,3 +1,7 @@ +2007-03-20 Werner Koch <[email protected]> + + * gpgconf-comp.c (gc_options_gpgsm): Add p12-charset. + 2007-03-07 Werner Koch <[email protected]> * applygnupgdefaults: New. diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c index 1eb6353fb..7bb92ebd9 100644 --- a/tools/gpgconf-comp.c +++ b/tools/gpgconf-comp.c @@ -665,6 +665,9 @@ static gc_option_t gc_options_gpgsm[] = { "prefer-system-dirmngr", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED, "gnupg", "use system's dirmngr if available", GC_ARG_TYPE_NONE, GC_BACKEND_GPGSM }, + { "p12-charset", GC_OPT_FLAG_NONE, GC_LEVEL_ADVANCED, + "gnupg", N_("|NAME|use encoding NAME for PKCS#12 passphrases"), + GC_ARG_TYPE_STRING, GC_BACKEND_GPGSM }, { "Debug", GC_OPT_FLAG_GROUP, GC_LEVEL_ADVANCED, |