From 22dbb73fb1081160dad0259efca4463439214f65 Mon Sep 17 00:00:00 2001 From: Jonathan McDowell Date: Fri, 1 Nov 2013 20:56:41 -0700 Subject: [PATCH] Add some more algorithm constants to openpgp.h Some from RFC2440 (MD2/SHA1X), some from GnuPG (CAMELLIA). --- openpgp.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/openpgp.h b/openpgp.h index 1d40533..f78f10c 100644 --- a/openpgp.h +++ b/openpgp.h @@ -25,21 +25,33 @@ #define OPENPGP_PKALGO_RSA_SIGN 3 #define OPENPGP_PKALGO_ELGAMAL_ENC 16 #define OPENPGP_PKALGO_DSA 17 +#define OPENPGP_PKALGO_EC 18 +#define OPENPGP_PKALGO_ECDSA 19 #define OPENPGP_PKALGO_ELGAMAL_SIGN 20 +#define OPENPGP_PKALGO_DH 21 #define OPENPGP_SYMALGO_PLAIN 0 #define OPENPGP_SYMALGO_IDEA 1 #define OPENPGP_SYMALGO_3DES 2 #define OPENPGP_SYMALGO_CAST5 3 #define OPENPGP_SYMALGO_BLOWFISH 4 +#define OPENPGP_SYMALGO_SAFER_SK128 5 /* In RFC2440, not in RFC4880 */ +#define OPENPGP_SYMALGO_DES_SK 6 /* In RFC2440, not in RFC4880 */ #define OPENPGP_SYMALGO_AES128 7 #define OPENPGP_SYMALGO_AES192 8 #define OPENPGP_SYMALGO_AES256 9 #define OPENPGP_SYMALGO_TWOFISH 10 +#define OPENPGP_SYMALGO_CAMELLIA128 11 /* From GnuPG */ +#define OPENPGP_SYMALGO_CAMELLIA192 12 /* From GnuPG */ +#define OPENPGP_SYMALGO_CAMELLIA256 13 /* From GnuPG */ #define OPENPGP_HASH_MD5 1 #define OPENPGP_HASH_SHA1 2 #define OPENPGP_HASH_RIPEMD160 3 +#define OPENPGP_HASH_SHA1X 4 /* In RFC2440, not in RFC4880 */ +#define OPENPGP_HASH_MD2 5 /* In RFC2440, not in RFC4880 */ +#define OPENPGP_HASH_TIGER192 6 /* In RFC2440, not in RFC4880 */ +#define OPENPGP_HASH_HAVAL_5_160 7 /* In RFC2440, not in RFC4880 */ #define OPENPGP_HASH_SHA256 8 #define OPENPGP_HASH_SHA384 9 #define OPENPGP_HASH_SHA512 10 -- 2.39.2