diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 21:21:03 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 21:21:03 +0000 |
| commit | 69349561bf941cc67f1afcbbc115af8dbd624f94 (patch) | |
| tree | 49d5db9fac516d5de488244d4cffd2e9d74220e7 /common/openpgpdefs.h | |
| parent | Adding debian version 2.2.40-3. (diff) | |
| download | gnupg2-69349561bf941cc67f1afcbbc115af8dbd624f94.tar.xz gnupg2-69349561bf941cc67f1afcbbc115af8dbd624f94.zip | |
Merging upstream version 2.2.43.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'common/openpgpdefs.h')
| -rw-r--r-- | common/openpgpdefs.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/common/openpgpdefs.h b/common/openpgpdefs.h index 05f3621..e50c94e 100644 --- a/common/openpgpdefs.h +++ b/common/openpgpdefs.h @@ -130,8 +130,8 @@ sigsubpkttype_t; typedef enum { AEAD_ALGO_NONE = 0, - AEAD_ALGO_EAX = 1, - AEAD_ALGO_OCB = 2 + AEAD_ALGO_EAX = 1, /* Deprecated. */ + AEAD_ALGO_OCB = 2 /* The one and only. */ } aead_algo_t; @@ -226,5 +226,8 @@ gpg_error_t compute_openpgp_fpr_ecc (int keyversion, unsigned char *result, unsigned int *r_resultlen); +/*-- openpgp-oid.c --*/ +enum gcry_pk_algos map_openpgp_pk_to_gcry (pubkey_algo_t algo); + #endif /*GNUPG_COMMON_OPENPGPDEFS_H*/ |