summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2016-11-11 21:18:35 +0100
committerAndrew Gregory <andrew.gregory.8@gmail.com>2017-05-09 05:27:45 +0200
commitcd8debfbfb148981ff8f2d793db5764d7cc928f7 (patch)
treed8c9eb1ce44599191d08d4b7da87b5e0cb55e2d8
parent0fd8455c66ae574e479f9d9a645f2e8366bac993 (diff)
downloadpacman-cd8debfbfb148981ff8f2d793db5764d7cc928f7.tar.gz
pacman-cd8debfbfb148981ff8f2d793db5764d7cc928f7.tar.xz
libalpm/signing: support EDDSA from gpgme 1.7.0
Signed-off-by: Christian Hesse <mail@eworm.de> Signed-off-by: Allan McRae <allan@archlinux.org> (cherry picked from commit c3b954e7b93140aa85559fa350582160f3c0a72b)
-rw-r--r--lib/libalpm/signing.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c
index 02671582..e26d9fdb 100644
--- a/lib/libalpm/signing.c
+++ b/lib/libalpm/signing.c
@@ -356,6 +356,10 @@ static int key_search(alpm_handle_t *handle, const char *fpr,
#if GPGME_VERSION_NUMBER >= 0x010500
case GPGME_PK_ECC:
#endif
+/* value added in gpgme 1.7.0 */
+#if GPGME_VERSION_NUMBER >= 0x010700
+ case GPGME_PK_EDDSA:
+#endif
pgpkey->pubkey_algo = 'E';
break;
}