be18d9f77a
Starting with version 1.12.0, libgcrypt was failing to validate Curve25519 secret keys on FreeBSD-main. This resulted in failures such as in the example below. Incorporate the patch from https://dev.gnupg.org/T8094 to fix the problem. % TEMP_GPG=$(mktemp -d) % GNUPGHOME=$TEMP_GPG gpg --batch --import < ./test/openpgp4-secret-key.asc gpg: keybox '/tmp/tmp.gkqFaMAlVu/pubring.kbx' created gpg: /tmp/tmp.gkqFaMAlVu/trustdb.gpg: trustdb created gpg: key 7E6ABE924645CC60: public key "Notmuch Test Suite (INSECURE!) <test_suite@notmuchmail.org>" imported gpg: key 7E6ABE924645CC60: secret key imported gpg: Total number processed: 1 gpg: imported: 1 gpg: secret keys read: 1 gpg: secret keys imported: 1 % GNUPGHOME=$TEMP_GPG gpg --decrypt ./test/corpora/crypto/basic-encrypted.eml gpg: encrypted with cv25519 key, ID 1D71CFF38F6B48AF, created 2022-09-07 "Notmuch Test Suite (INSECURE!) <test_suite@notmuchmail.org>" gpg: public key decryption failed: Bad secret key gpg: decryption failed: Bad secret key Approved by: cy (maintainer) Obtained from: https://dev.gnupg.org/T8094 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D55280