From cf2ec5673f02ddf3a4910ec47b476351dd68c243 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 23 Nov 2009 19:18:04 +0000 Subject: Add gpgconf related dummy options default_pubkey_algo. Add option --skip-hidden-recipients Comment updates. --- sm/ChangeLog | 4 ++++ sm/certreqgen.c | 3 ++- sm/gpgsm.c | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'sm') diff --git a/sm/ChangeLog b/sm/ChangeLog index 40a5eb3c5..f5d8da515 100644 --- a/sm/ChangeLog +++ b/sm/ChangeLog @@ -1,3 +1,7 @@ +2009-11-23 Werner Koch + + * gpgsm.c (main) : Add key "default_pubkey_algo". + 2009-11-10 Marcus Brinkmann * server.c (cmd_getauditlog): Don't dup FD for es_fdopen_nc as diff --git a/sm/certreqgen.c b/sm/certreqgen.c index 49b2b9208..7026a303f 100644 --- a/sm/certreqgen.c +++ b/sm/certreqgen.c @@ -475,7 +475,8 @@ proc_parameters (ctrl_t ctrl, return gpg_error (GPG_ERR_INV_PARAMETER); } - /* Check the keylength. */ + /* Check the keylength. NOTE: If you change this make sure that it + macthes the gpgconflist item in gpgsm.c */ if (!get_parameter (para, pKEYLENGTH, 0)) nbits = 2048; else diff --git a/sm/gpgsm.c b/sm/gpgsm.c index adfe6cdbf..2d262b707 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -1634,6 +1634,11 @@ main ( int argc, char **argv) printf ("encrypt-to:%lu:\n", GC_OPT_FLAG_DEFAULT); printf ("keyserver:%lu:\n", GC_OPT_FLAG_NONE); + /* The next one is an info only item and should match what + proc_parameters actually implements. */ + printf ("default_pubkey_algo:%lu:\"%s:\n", GC_OPT_FLAG_DEFAULT, + "RSA-2048"); + } break; case aGPGConfTest: -- cgit v1.2.3