| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Backport |
| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2 | CVE: CVE-2013-4351 |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 3 | |
| 4 | Index: gnupg-1.4.7/g10/getkey.c |
| 5 | =================================================================== |
| 6 | --- gnupg-1.4.7.orig/g10/getkey.c 2007-03-05 16:54:41.000000000 +0800 |
| 7 | +++ gnupg-1.4.7/g10/getkey.c 2013-11-28 14:41:59.640212240 +0800 |
| 8 | @@ -1454,7 +1454,11 @@ |
| 9 | |
| 10 | if(flags) |
| 11 | key_usage |= PUBKEY_USAGE_UNKNOWN; |
| 12 | + if (!key_usage) |
| 13 | + key_usage |= PUBKEY_USAGE_NONE; |
| 14 | } |
| 15 | + else if (p) |
| 16 | + key_usage |= PUBKEY_USAGE_NONE; |
| 17 | |
| 18 | /* We set PUBKEY_USAGE_UNKNOWN to indicate that this key has a |
| 19 | capability that we do not handle. This serves to distinguish |
| 20 | Index: gnupg-1.4.7/g10/keygen.c |
| 21 | =================================================================== |
| 22 | --- gnupg-1.4.7.orig/g10/keygen.c 2007-02-05 00:27:40.000000000 +0800 |
| 23 | +++ gnupg-1.4.7/g10/keygen.c 2013-11-28 14:43:05.016670092 +0800 |
| 24 | @@ -209,9 +209,6 @@ |
| 25 | if (use & PUBKEY_USAGE_AUTH) |
| 26 | buf[0] |= 0x20; |
| 27 | |
| 28 | - if (!buf[0]) |
| 29 | - return; |
| 30 | - |
| 31 | build_sig_subpkt (sig, SIGSUBPKT_KEY_FLAGS, buf, 1); |
| 32 | } |
| 33 | |
| 34 | Index: gnupg-1.4.7/include/cipher.h |
| 35 | =================================================================== |
| 36 | --- gnupg-1.4.7.orig/include/cipher.h 2006-04-21 20:39:49.000000000 +0800 |
| 37 | +++ gnupg-1.4.7/include/cipher.h 2013-11-28 14:49:24.159322744 +0800 |
| 38 | @@ -52,6 +52,7 @@ |
| 39 | #define PUBKEY_USAGE_CERT 4 /* key is also good to certify other keys*/ |
| 40 | #define PUBKEY_USAGE_AUTH 8 /* key is good for authentication */ |
| 41 | #define PUBKEY_USAGE_UNKNOWN 128 /* key has an unknown usage bit */ |
| 42 | +#define PUBKEY_USAGE_NONE 256 /* No usage given. */ |
| 43 | |
| 44 | #define DIGEST_ALGO_MD5 1 |
| 45 | #define DIGEST_ALGO_SHA1 2 |