diff options
| author | NIIBE Yutaka <[email protected]> | 2017-04-13 03:54:52 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2017-04-13 03:54:52 +0000 |
| commit | 74258278efacd7069e8c1df8ff6fc3f4675d713e (patch) | |
| tree | 9d524e133a7715f4836e5e6351455a42b897e20c /common/openpgpdefs.h | |
| parent | dirmngr: More fix for Windows. (diff) | |
| download | gnupg-74258278efacd7069e8c1df8ff6fc3f4675d713e.tar.gz gnupg-74258278efacd7069e8c1df8ff6fc3f4675d713e.zip | |
common, g10: Fix enumeration types.
* common/openpgpdefs.h (CIPHER_ALGO_PRIVATE10, PUBKEY_ALGO_PRIVATE10)
(DIGEST_ALGO_PRIVATE10, COMPRESS_ALGO_PRIVATE10): New.
* g10/misc.c (map_pk_gcry_to_openpgp): Add type conversion.
(map_cipher_openpgp_to_gcry, openpgp_cipher_algo_name)
(openpgp_pk_test_algo2, map_md_openpgp_to_gcry)
(pubkey_get_npkey): Add default handling.
--
Compilers may emit code assuming the maximum value of enum type.
According to OpenPGP specification, there are cases for private uses.
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | common/openpgpdefs.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/common/openpgpdefs.h b/common/openpgpdefs.h index 3d5d306c2..85a4251de 100644 --- a/common/openpgpdefs.h +++ b/common/openpgpdefs.h @@ -136,7 +136,8 @@ typedef enum CIPHER_ALGO_TWOFISH = 10, /* 256 bit */ CIPHER_ALGO_CAMELLIA128 = 11, CIPHER_ALGO_CAMELLIA192 = 12, - CIPHER_ALGO_CAMELLIA256 = 13 + CIPHER_ALGO_CAMELLIA256 = 13, + CIPHER_ALGO_PRIVATE10 = 110 } cipher_algo_t; @@ -152,7 +153,8 @@ typedef enum PUBKEY_ALGO_ECDSA = 19, /* RFC-6637 */ PUBKEY_ALGO_ELGAMAL = 20, /* Elgamal encrypt+sign (legacy). */ /* 21 reserved by OpenPGP. */ - PUBKEY_ALGO_EDDSA = 22 /* EdDSA (not yet assigned). */ + PUBKEY_ALGO_EDDSA = 22, /* EdDSA (not yet assigned). */ + PUBKEY_ALGO_PRIVATE10 = 110 } pubkey_algo_t; @@ -166,7 +168,8 @@ typedef enum DIGEST_ALGO_SHA256 = 8, DIGEST_ALGO_SHA384 = 9, DIGEST_ALGO_SHA512 = 10, - DIGEST_ALGO_SHA224 = 11 + DIGEST_ALGO_SHA224 = 11, + DIGEST_ALGO_PRIVATE10 = 110 } digest_algo_t; @@ -176,7 +179,8 @@ typedef enum COMPRESS_ALGO_NONE = 0, COMPRESS_ALGO_ZIP = 1, COMPRESS_ALGO_ZLIB = 2, - COMPRESS_ALGO_BZIP2 = 3 + COMPRESS_ALGO_BZIP2 = 3, + COMPRESS_ALGO_PRIVATE10 = 110 } compress_algo_t; |