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/keylist.c | |
| 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/keylist.c')
| -rw-r--r-- | src/keylist.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/keylist.c b/src/keylist.c index 465b4720..a3613339 100644 --- a/src/keylist.c +++ b/src/keylist.c @@ -537,7 +537,7 @@ keylist_colon_handler (void *priv, char *line) { int i = atoi (field[3]); if (i >= 1 && i < 128) - subkey->pubkey_algo = i; + subkey->pubkey_algo = _gpgme_map_pk_algo (i, ctx->protocol); } /* Field 5 has the long keyid. Allow short key IDs for the @@ -614,7 +614,7 @@ keylist_colon_handler (void *priv, char *line) { int i = atoi (field[3]); if (i >= 1 && i < 128) - subkey->pubkey_algo = i; + subkey->pubkey_algo = _gpgme_map_pk_algo (i, ctx->protocol); } /* Field 5 has the long keyid. */ @@ -728,7 +728,7 @@ keylist_colon_handler (void *priv, char *line) { int i = atoi (field[3]); if (i >= 1 && i < 128) - keysig->pubkey_algo = i; + keysig->pubkey_algo = _gpgme_map_pk_algo (i, ctx->protocol); } /* Field 5 has the long keyid. */ |