diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-19 04:34:14 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-19 04:34:52 +0000 |
commit | f6297192911d3090d831d70dfed3fc071c12d456 (patch) | |
tree | 24becd8768c9ac4e277f41ed6d06611f32514eef | |
parent | Merging debian version 2.2.43-1. (diff) | |
download | gnupg2-f6297192911d3090d831d70dfed3fc071c12d456.tar.xz gnupg2-f6297192911d3090d831d70dfed3fc071c12d456.zip |
Refreshing gpgsm-default-to-4096-bit-keys.patch.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | debian/patches/progress-linux/0001-gpgsm-default-to-4096-bit-keys.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches/progress-linux/0001-gpgsm-default-to-4096-bit-keys.patch b/debian/patches/progress-linux/0001-gpgsm-default-to-4096-bit-keys.patch index 4187e6e..02d79ce 100644 --- a/debian/patches/progress-linux/0001-gpgsm-default-to-4096-bit-keys.patch +++ b/debian/patches/progress-linux/0001-gpgsm-default-to-4096-bit-keys.patch @@ -4,12 +4,12 @@ Subject: gpgsm: default to 4096-bit keys. diff -Naurp gnupg2.orig/doc/gpgsm.texi gnupg2/doc/gpgsm.texi --- gnupg2.orig/doc/gpgsm.texi +++ gnupg2/doc/gpgsm.texi -@@ -1124,7 +1124,7 @@ key. The algorithm must be capable of si - parameter. The only supported value for @var{algo} is @samp{rsa}. +@@ -1161,7 +1161,7 @@ parameter. The supported values for @va @item Key-Length: @var{nbits} --The requested length of a generated key in bits. Defaults to 3072. -+The requested length of a generated key in bits. Defaults to 4096. + The requested length of a generated key in bits. Defaults to +-3072. The value is ignored for ECC algorithms. ++4096. The value is ignored for ECC algorithms. @item Key-Grip: @var{hexstring} This is optional and used to generate a CSR or certificate for an @@ -62,9 +62,9 @@ diff -Naurp gnupg2.orig/sm/certreqgen.c gnupg2/sm/certreqgen.c Name-DN: CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=Ddorf,C=DE Name-Email: joe@foo.bar # Do a commit here, so that we can later print a "done" -@@ -471,7 +471,7 @@ proc_parameters (ctrl_t ctrl, struct par +@@ -475,7 +475,7 @@ proc_parameters (ctrl_t ctrl, struct par /* Check the keylength. NOTE: If you change this make sure that it - macthes the gpgconflist item in gpgsm.c */ + matches the gpgconflist item in gpgsm.c */ if (!get_parameter (para, pKEYLENGTH, 0)) - nbits = 3072; + nbits = 4096; @@ -74,7 +74,7 @@ diff -Naurp gnupg2.orig/sm/certreqgen.c gnupg2/sm/certreqgen.c diff -Naurp gnupg2.orig/sm/certreqgen-ui.c gnupg2/sm/certreqgen-ui.c --- gnupg2.orig/sm/certreqgen-ui.c +++ gnupg2/sm/certreqgen-ui.c -@@ -138,7 +138,7 @@ gpgsm_gencertreq_tty (ctrl_t ctrl, estre +@@ -140,7 +140,7 @@ gpgsm_gencertreq_tty (ctrl_t ctrl, estre unsigned int nbits; int minbits = 1024; int maxbits = 4096; @@ -86,7 +86,7 @@ diff -Naurp gnupg2.orig/sm/certreqgen-ui.c gnupg2/sm/certreqgen-ui.c diff -Naurp gnupg2.orig/sm/gpgsm.c gnupg2/sm/gpgsm.c --- gnupg2.orig/sm/gpgsm.c +++ gnupg2/sm/gpgsm.c -@@ -1737,7 +1737,7 @@ main ( int argc, char **argv) +@@ -1787,7 +1787,7 @@ main ( int argc, char **argv) /* The next one is an info only item and should match what proc_parameters actually implements. */ es_printf ("default_pubkey_algo:%lu:\"%s:\n", GC_OPT_FLAG_DEFAULT, |