diff options
| author | Werner Koch <[email protected]> | 2011-02-03 15:39:03 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2011-02-03 15:39:03 +0000 |
| commit | 38904b697c4d27a70281149c6070e6dfca4e893b (patch) | |
| tree | 72ae98a01f64dbe2df74d9687faba0c97159d799 /kbx/keybox-openpgp.c | |
| parent | Add gitattributes (diff) | |
| parent | Finished ECC integration. (diff) | |
| download | gnupg-38904b697c4d27a70281149c6070e6dfca4e893b.tar.gz gnupg-38904b697c4d27a70281149c6070e6dfca4e893b.zip | |
Merge branch 'ECC-INTEGRATION-2-1'ecc-integration-done
Diffstat (limited to 'kbx/keybox-openpgp.c')
| -rw-r--r-- | kbx/keybox-openpgp.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/kbx/keybox-openpgp.c b/kbx/keybox-openpgp.c index 0968cf8b3..f1de685cf 100644 --- a/kbx/keybox-openpgp.c +++ b/kbx/keybox-openpgp.c @@ -186,7 +186,7 @@ next_packet (unsigned char const **bufptr, size_t *buflen, } -/* Parse a key packet and store the ionformation in KI. */ +/* Parse a key packet and store the information in KI. */ static gpg_error_t parse_key (const unsigned char *data, size_t datalen, struct _keybox_openpgp_key_info *ki) @@ -243,6 +243,12 @@ parse_key (const unsigned char *data, size_t datalen, case 17: /* DSA */ npkey = 4; break; + case 18: /* ECDH */ + npkey = 3; + break; + case 19: /* ECDSA */ + npkey = 2; + break; default: /* Unknown algorithm. */ return gpg_error (GPG_ERR_UNKNOWN_ALGORITHM); } |