summaryrefslogtreecommitdiffstats
path: root/sm/call-agent.c
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2022-02-03 14:14:14 +0100
committerWerner Koch <wk@gnupg.org>2022-02-03 14:17:10 +0100
commite23dc755fa725877ce96eb5a6a6f5788457267f4 (patch)
treed0c1a1c26a0e2424fe91f4266b4216eb8a2dd7f2 /sm/call-agent.c
parentgpg: Fix for -Wformat when using uint64_t. (diff)
downloadgnupg2-e23dc755fa725877ce96eb5a6a6f5788457267f4.tar.xz
gnupg2-e23dc755fa725877ce96eb5a6a6f5788457267f4.zip
sm: New option --ignore-cert-with-oid.
* sm/gpgsm.c (oIgnoreCertWithOID): New. (opts): Add option. (main): Store its value. * sm/call-agent.c (learn_cb): Test against that list.
Diffstat (limited to 'sm/call-agent.c')
-rw-r--r--sm/call-agent.c34
1 files changed, 34 insertions, 0 deletions
diff --git a/sm/call-agent.c b/sm/call-agent.c
index 868497e0d..6373829e8 100644
--- a/sm/call-agent.c
+++ b/sm/call-agent.c
@@ -1032,6 +1032,8 @@ learn_cb (void *opaque, const void *buffer, size_t length)
char *buf;
ksba_cert_t cert;
int rc;
+ char *string, *p, *pend;
+ strlist_t sl;
if (parm->error)
return 0;
@@ -1068,6 +1070,35 @@ learn_cb (void *opaque, const void *buffer, size_t length)
return 0;
}
+ /* Ignore certificates matching certain extended usage flags. */
+ rc = ksba_cert_get_ext_key_usages (cert, &string);
+ if (!rc)
+ {
+ p = string;
+ while (p && (pend=strchr (p, ':')))
+ {
+ *pend++ = 0;
+ for (sl=opt.ignore_cert_with_oid;
+ sl && strcmp (sl->d, p); sl = sl->next)
+ ;
+ if (sl)
+ {
+ if (opt.verbose)
+ log_info ("certificate ignored due to OID %s\n", sl->d);
+ goto leave;
+ }
+ p = pend;
+ if ((p = strchr (p, '\n')))
+ p++;
+ }
+ }
+ else if (gpg_err_code (rc) != GPG_ERR_NO_DATA)
+ log_error (_("error getting key usage information: %s\n"),
+ gpg_strerror (rc));
+ xfree (string);
+ string = NULL;
+
+
/* We do not store a certifciate with missing issuers as ephemeral
because we can assume that the --learn-card command has been used
on purpose. */
@@ -1088,6 +1119,9 @@ learn_cb (void *opaque, const void *buffer, size_t length)
}
}
+ leave:
+ xfree (string);
+ string = NULL;
ksba_cert_release (cert);
init_membuf (parm->data, 4096);
return 0;