diff options
| author | Werner Koch <wk@gnupg.org> | 2020-02-09 14:00:57 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2020-02-09 14:04:18 +0100 |
| commit | 49c891a9bfac24a1d95e76d33d44a49426247777 (patch) | |
| tree | 9803fe27ec8e3f8274f16da2db1191522cea6dfa /common/openpgpdefs.h | |
| parent | card: Support brainpool curves in the generate command. (diff) | |
| download | gnupg2-49c891a9bfac24a1d95e76d33d44a49426247777.tar.xz gnupg2-49c891a9bfac24a1d95e76d33d44a49426247777.zip | |
common: Add OpenPGP<->Gcrypt pubkey id mapping functions.
* g10/misc.c (map_pk_gcry_to_openpgp): Move to ...
* common/openpgp-oid.c (map_gcry_pk_to_openpgp): here and rename.
Change all 4 callers.
(map_openpgp_pk_to_gcry): New.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'common/openpgpdefs.h')
| -rw-r--r-- | common/openpgpdefs.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/common/openpgpdefs.h b/common/openpgpdefs.h index 868e141ce..2962fe2d4 100644 --- a/common/openpgpdefs.h +++ b/common/openpgpdefs.h @@ -209,8 +209,14 @@ compress_algo_t; #define S2K_DECODE_COUNT(_val) ((16ul + ((_val) & 15)) << (((_val) >> 4) + 6)) -/*--openpgp-s2k.c --*/ +/*-- openpgp-s2k.c --*/ unsigned char encode_s2k_iterations (int iterations); +/*-- openpgp-oid.c --*/ +pubkey_algo_t map_gcry_pk_to_openpgp (enum gcry_pk_algos algo); +enum gcry_pk_algos map_openpgp_pk_to_gcry (pubkey_algo_t algo); + + + #endif /*GNUPG_COMMON_OPENPGPDEFS_H*/ |