From: David Bremner <david@tethera.net>
To: David Bremner <david@tethera.net>,
Daniel Kahn Gillmor <dkg@debian.org>,
notmuch@notmuchmail.org
Subject: [PATCH 1/2] configure: restructure gmime cert validity checker code
Date: Sat, 9 Apr 2022 09:34:52 -0300 [thread overview]
Message-ID: <20220409123453.606391-1-david@tethera.net> (raw)
In-Reply-To: <874k3pvrfq.fsf@tethera.net>
The goal is to generalize this to also check the output format of
g_mime_certificate_get_email.
---
configure | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
index 36f3f606..d6e1200e 100755
--- a/configure
+++ b/configure
@@ -552,11 +552,7 @@ EOF
rm -rf "$TEMP_GPG"
fi
- # see https://github.com/jstedfast/gmime/pull/90
- # should be fixed in GMime in 3.2.7, but some distros might patch
- printf "Checking for GMime X.509 certificate validity... "
-
- cat > _check_x509_validity.c <<EOF
+ cat > _check_gmime_cert.c <<EOF
#include <stdio.h>
#include <gmime/gmime.h>
@@ -589,16 +585,22 @@ int main () {
if (sig == NULL) return !! fprintf (stderr, "no GMimeSignature found at position 0\n");
cert = g_mime_signature_get_certificate (sig);
if (cert == NULL) return !! fprintf (stderr, "no GMimeCertificate found\n");
+#ifdef CHECK_VALIDITY
validity = g_mime_certificate_get_id_validity (cert);
if (validity != GMIME_VALIDITY_FULL) return !! fprintf (stderr, "Got validity %d, expected %d\n", validity, GMIME_VALIDITY_FULL);
-
+#endif
return 0;
}
EOF
+
+ # see https://github.com/jstedfast/gmime/pull/90
+ # should be fixed in GMime in 3.2.7, but some distros might patch
+ printf "Checking for GMime X.509 certificate validity... "
+
if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then
printf 'No.\nCould not make tempdir for testing X.509 certificate validity support.\n'
errors=$((errors + 1))
- elif ${CC} ${CFLAGS} ${gmime_cflags} _check_x509_validity.c ${gmime_ldflags} -o _check_x509_validity \
+ elif ${CC} -DCHECK_VALIDITY ${CFLAGS} ${gmime_cflags} _check_gmime_cert.c ${gmime_ldflags} -o _check_x509_validity \
&& echo disable-crl-checks > "$TEMP_GPG/gpgsm.conf" \
&& echo "4D:E0:FF:63:C0:E9:EC:01:29:11:C8:7A:EE:DA:3A:9A:7F:6E:C1:0D S" >> "$TEMP_GPG/trustlist.txt" \
&& GNUPGHOME=${TEMP_GPG} gpgsm --batch --quiet --import < "$srcdir"/test/smime/ca.crt
--
2.35.1
next prev parent reply other threads:[~2022-04-09 12:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-18 10:48 Failing notmuch/SMIME test David Bremner
2022-03-20 21:10 ` Daniel Kahn Gillmor
2022-03-22 17:16 ` David Bremner
2022-04-09 12:34 ` David Bremner [this message]
2022-04-09 12:34 ` [PATCH 2/2] test/smime: fix signature verification test with newer gmime David Bremner
2022-04-11 0:35 ` Daniel Kahn Gillmor
2022-04-11 8:44 ` Michael J Gruber
2022-04-11 21:53 ` Daniel Kahn Gillmor
2022-04-12 20:15 ` [PATCH v2 " michaeljgruber+grubix+git
2022-04-12 23:26 ` Daniel Kahn Gillmor
2022-04-13 11:28 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220409123453.606391-1-david@tethera.net \
--to=david@tethera.net \
--cc=dkg@debian.org \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).