aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2013-07-25 07:11:08 +0000
committerWerner Koch <[email protected]>2013-07-25 08:37:41 +0000
commit801803ab6e954173c2dcb7f0eb6eb8623238e99c (patch)
tree4f88b7fefec36a18d94c64e40fed6bf314db0747
parentMitigate a flush+reload cache attack on RSA secret exponents. (diff)
downloadgnupg-801803ab6e954173c2dcb7f0eb6eb8623238e99c.tar.gz
gnupg-801803ab6e954173c2dcb7f0eb6eb8623238e99c.zip
Prepare for a forthcoming new algorithm id.
* include/cipher.h (PUBKEY_ALGO_ECC): New. * g10/keyid.c (pubkey_letter): Add letter 'C'. -- ID 22 will be used for generic ECC, i.e. one which can be used for ECDSA and ECDH. The only support in 1.4 will pretty printing the algorithm id.
-rw-r--r--g10/keyid.c1
-rw-r--r--include/cipher.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/g10/keyid.c b/g10/keyid.c
index f04bea635..d7072d42f 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -53,6 +53,7 @@ pubkey_letter( int algo )
case PUBKEY_ALGO_DSA: return 'D' ;
case PUBKEY_ALGO_ECDSA: return 'E' ; /* ECC DSA (sign only) */
case PUBKEY_ALGO_ECDH: return 'e' ; /* ECC DH (encrypt only) */
+ case PUBKEY_ALGO_ECC: return 'C' ; /* ECC generic */
default: return '?';
}
}
diff --git a/include/cipher.h b/include/cipher.h
index 9c25605a8..a69c6b38d 100644
--- a/include/cipher.h
+++ b/include/cipher.h
@@ -50,6 +50,7 @@
#define PUBKEY_ALGO_ECDH 18
#define PUBKEY_ALGO_ECDSA 19
#define PUBKEY_ALGO_ELGAMAL 20 /* sign and encrypt elgamal */
+#define PUBKEY_ALGO_ECC 22 /* Generic ECC. */
#define PUBKEY_USAGE_SIG 1 /* key is good for signatures */