diff options
author | Werner Koch <[email protected]> | 2014-05-08 12:03:14 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2014-05-08 12:11:58 +0000 |
commit | d5fb92cdaed21eea2f1a921e4f11df72635a8462 (patch) | |
tree | 9c219a9cfa334c021853091a0717f8135733a06a /src/gpgme.h.in | |
parent | Add GPGME_ENCRYPT_NO_COMPRESS flag. (diff) | |
download | gpgme-d5fb92cdaed21eea2f1a921e4f11df72635a8462.tar.gz gpgme-d5fb92cdaed21eea2f1a921e4f11df72635a8462.zip |
Map public key algos returned by gpg to gpgme values.
* src/conversion.c (_gpgme_map_pk_algo): New.
* src/decrypt.c (parse_enc_to): Add arg PROTOCOL and map pubkey algo.
(_gpgme_decrypt_status_handler): Map pubkey algo.
* src/keylist.c (keylist_colon_handler): Map pubkey algo.
* src/sign.c (parse_sig_created): Add arg PROTOCOL and map pubkey
algo.
* src/verify.c (parse_new_sig): Ditto.
(parse_valid_sig): Ditto.
* src/gpgme.h.in (GPGME_PK_ECC): New.
(GPGME_MD_SHA224): New.
* src/gpgme.c (gpgme_pubkey_algo_name): Add GPGME_PK_ECC case.
(gpgme_hash_algo_name): Add GPGME_MD_SHA224.
--
This affects only the not yet released ECC code of GnuPG 2.1.
Diffstat (limited to 'src/gpgme.h.in')
-rw-r--r-- | src/gpgme.h.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gpgme.h.in b/src/gpgme.h.in index efc58ea5..d58c114d 100644 --- a/src/gpgme.h.in +++ b/src/gpgme.h.in @@ -227,7 +227,7 @@ typedef enum gpgme_data_type_t; -/* Public key algorithms from libgcrypt. */ +/* Public key algorithms. */ typedef enum { GPGME_PK_RSA = 1, @@ -235,6 +235,7 @@ typedef enum GPGME_PK_RSA_S = 3, GPGME_PK_ELG_E = 16, GPGME_PK_DSA = 17, + GPGME_PK_ECC = 18, GPGME_PK_ELG = 20, GPGME_PK_ECDSA = 301, GPGME_PK_ECDH = 302 @@ -242,7 +243,7 @@ typedef enum gpgme_pubkey_algo_t; -/* Hash algorithms from libgcrypt. */ +/* Hash algorithms (the values match those from libgcrypt). */ typedef enum { GPGME_MD_NONE = 0, @@ -255,6 +256,7 @@ typedef enum GPGME_MD_SHA256 = 8, GPGME_MD_SHA384 = 9, GPGME_MD_SHA512 = 10, + GPGME_MD_SHA224 = 11, GPGME_MD_MD4 = 301, GPGME_MD_CRC32 = 302, GPGME_MD_CRC32_RFC1510 = 303, |