OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 12-Dec-2003 16:45:59
Branch: OPENPKG_1_2_SOLID HEAD Handle: 2003121215455602
Modified files:
openpkg-web news.txt
Modified files: (Branch: OPENPKG_1_2_SOLID)
openpkg-src/gnupg gnupg.patch gnupg.spec
Log:
CAN-2003-0971
Summary:
Revision Changes Path
1.1.2.2 +60 -0 openpkg-src/gnupg/gnupg.patch
1.30.2.1.2.3+1 -1 openpkg-src/gnupg/gnupg.spec
1.7742 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gnupg/gnupg.patch
============================================================================
$ cvs diff -u -r1.1.2.1 -r1.1.2.2 gnupg.patch
--- openpkg-src/gnupg/gnupg.patch 16 May 2003 09:20:00 -0000 1.1.2.1
+++ openpkg-src/gnupg/gnupg.patch 12 Dec 2003 15:45:58 -0000 1.1.2.2
@@ -160,3 +160,63 @@
trustlevel = get_validity (pk, pk->namehash);
if( (trustlevel & TRUST_FLAG_DISABLED) ) {
+
+David Shaw wrote a patch against GnuPG 1.2.3 to disable the ability to
+create signatures using the ElGamal sign+encrypt (type 20) keys as
+well as to remove the option to create such keys.
+
+Index: g10/getkey.c
+--- g10/getkey.c.orig 2002-10-12 13:39:35.000000000 +0200
++++ g10/getkey.c 2003-12-12 16:39:12.000000000 +0100
+@@ -1566,6 +1566,11 @@
+ if ( x ) /* mask it down to the actual allowed usage */
+ key_usage &= x;
+ }
++
++ /* Type 20 Elgamal keys are not usable. */
++ if(pk->pubkey_algo==PUBKEY_ALGO_ELGAMAL)
++ key_usage=0;
++
+ pk->pubkey_usage = key_usage;
+
+ if ( !key_expire_seen ) {
+@@ -1736,6 +1741,13 @@
+ if ( x ) /* mask it down to the actual allowed usage */
+ key_usage &= x;
+ }
++
++ /* Type 20 Elgamal subkeys or any subkey on a type 20 primary are
++ not usable. */
++ if(mainpk->pubkey_algo==PUBKEY_ALGO_ELGAMAL
++ || subpk->pubkey_algo==PUBKEY_ALGO_ELGAMAL)
++ key_usage=0;
++
+ subpk->pubkey_usage = key_usage;
+
+ p = parse_sig_subpkt (sig->hashed, SIGSUBPKT_KEY_EXPIRE, NULL);
+Index: g10/keygen.c
+--- g10/keygen.c.orig 2002-10-12 13:31:38.000000000 +0200
++++ g10/keygen.c 2003-12-12 16:40:26.000000000 +0100
+@@ -944,8 +944,6 @@
+ tty_printf( _(" (%d) DSA (sign only)\n"), 2 );
+ if( addmode )
+ tty_printf( _(" (%d) ElGamal (encrypt only)\n"), 3 );
+- if (opt.expert)
+- tty_printf( _(" (%d) ElGamal (sign and encrypt)\n"), 4 );
+ tty_printf( _(" (%d) RSA (sign only)\n"), 5 );
+ if (addmode)
+ tty_printf( _(" (%d) RSA (encrypt only)\n"), 6 );
+@@ -979,13 +977,6 @@
+ *r_usage = PUBKEY_USAGE_SIG;
+ break;
+ }
+- else if( algo == 4 && opt.expert) {
+- if( cpr_get_answer_is_yes("keygen.algo.elg_se",_(
+- "The use of this algorithm is deprecated - create anyway? "))){
+- algo = PUBKEY_ALGO_ELGAMAL;
+- break;
+- }
+- }
+ else if( algo == 3 && addmode ) {
+ algo = PUBKEY_ALGO_ELGAMAL_E;
+ break;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/gnupg/gnupg.spec
============================================================================
$ cvs diff -u -r1.30.2.1.2.2 -r1.30.2.1.2.3 gnupg.spec
--- openpkg-src/gnupg/gnupg.spec 16 May 2003 09:19:27 -0000 1.30.2.1.2.2
+++ openpkg-src/gnupg/gnupg.spec 12 Dec 2003 15:45:58 -0000 1.30.2.1.2.3
@@ -33,7 +33,7 @@
Group: Cryptography
License: GPL
Version: 1.2.1
-Release: 1.2.1
+Release: 1.2.2
# list of sources
Source0: ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7741 -r1.7742 news.txt
--- openpkg-web/news.txt 12 Dec 2003 15:36:18 -0000 1.7741
+++ openpkg-web/news.txt 12 Dec 2003 15:45:56 -0000 1.7742
@@ -1,3 +1,4 @@
+12-Dec-2003: Upgraded package: P<gnupg-1.2.1-1.2.2>
12-Dec-2003: Upgraded package: P<gnupg-1.2.2-1.3.1>
12-Dec-2003: Upgraded package: P<tinyca-0.5.4-20031212>
12-Dec-2003: Upgraded package: P<perl-gtk-20031212-20031212>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
