diff -Nru gnupg-1.4.16/debian/changelog gnupg-1.4.16/debian/changelog --- gnupg-1.4.16/debian/changelog 2015-03-25 17:29:48.000000000 +0000 +++ gnupg-1.4.16/debian/changelog 2015-03-27 12:21:56.000000000 +0000 @@ -1,4 +1,4 @@ -gnupg (1.4.16-1.2ubuntu1.1) utopic-security; urgency=medium +gnupg (1.4.16-1.2ubuntu1.2) utopic-security; urgency=medium * Screen responses from keyservers (LP: #1409117) - d/p/0001-Screen-keyserver-responses.patch @@ -28,7 +28,7 @@ g10/trustdb.c, include/host2net.h. - CVE-2015-1607 - -- Marc Deslauriers Wed, 25 Mar 2015 13:16:11 -0400 + -- Marc Deslauriers Fri, 27 Mar 2015 08:21:50 -0400 gnupg (1.4.16-1.2ubuntu1) utopic; urgency=medium diff -Nru gnupg-1.4.16/debian/patches/Add-build-and-runtime-support-for-larger-RSA-key.patch gnupg-1.4.16/debian/patches/Add-build-and-runtime-support-for-larger-RSA-key.patch --- gnupg-1.4.16/debian/patches/Add-build-and-runtime-support-for-larger-RSA-key.patch 2015-03-25 17:14:39.000000000 +0000 +++ gnupg-1.4.16/debian/patches/Add-build-and-runtime-support-for-larger-RSA-key.patch 2015-03-27 12:21:46.000000000 +0000 @@ -142,54 +142,6 @@ case oEnableDSA2: opt.flags.dsa2=1; break; case oDisableDSA2: opt.flags.dsa2=0; break; -Index: gnupg-1.4.16/g10/keygen.c -=================================================================== ---- gnupg-1.4.16.orig/g10/keygen.c 2015-03-25 13:10:51.162800684 -0400 -+++ gnupg-1.4.16/g10/keygen.c 2015-03-25 13:14:30.584572663 -0400 -@@ -1039,10 +1039,14 @@ - - assert( is_ELGAMAL(algo) ); - -- if( nbits < 512 ) { -+ if (nbits < 1024) { - nbits = 2048; - log_info(_("keysize invalid; using %u bits\n"), nbits ); - } -+ else if (nbits > 4096) { -+ nbits = 4096; -+ log_info(_("keysize invalid; using %u bits\n"), nbits ); -+ } - - if( (nbits % 32) ) { - nbits = ((nbits + 31) / 32) * 32; -@@ -1121,7 +1125,7 @@ - MPI *factors; - unsigned int qbits; - -- if( nbits < 512) -+ if( nbits < 768) - { - nbits = 2048; - log_info(_("keysize invalid; using %u bits\n"), nbits ); -@@ -1249,6 +1253,7 @@ - PKT_public_key *pk; - MPI skey[6]; - MPI *factors; -+ const unsigned maxsize = (opt.flags.large_rsa ? 8192 : 4096); - - assert( is_RSA(algo) ); - -@@ -1256,6 +1261,10 @@ - nbits = 2048; - log_info(_("keysize invalid; using %u bits\n"), nbits ); - } -+ else if (nbits > maxsize) { -+ nbits = maxsize; -+ log_info(_("keysize invalid; using %u bits\n"), nbits ); -+ } - - if( (nbits % 32) ) { - nbits = ((nbits + 31) / 32) * 32; Index: gnupg-1.4.16/g10/options.h =================================================================== --- gnupg-1.4.16.orig/g10/options.h 2015-03-25 13:10:51.162800684 -0400