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