From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 6 Dec 2019 23:53:35 +0000 (+0000)
Subject: pubkeys: Provide `fallback_skip' variable
X-Git-Tag: v0.6.0~192
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=commitdiff_plain;h=d27e77d0b3a7cbbbc2da207673cdab17f1f298ea

pubkeys: Provide `fallback_skip' variable

Currently nothing sets this nonzero.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/pubkeys.fl.pl b/pubkeys.fl.pl
index b89d191..da22a25 100755
--- a/pubkeys.fl.pl
+++ b/pubkeys.fl.pl
@@ -159,6 +159,7 @@ struct pubkeyset_context {
     /* runtime: */
     bool_t had_serial;
     int lno;
+    bool_t fallback_skip;
     const struct sigscheme_info *scheme;
     uint8_t grpid[GRPIDSZ];
     serialt serial;
@@ -191,7 +192,7 @@ static struct pubkeyset_context c[1];
 
 %%
 
-!KEYWORD pkg
+!KEYWORD pkg  { c->fallback_skip=0; }
 !ARG id [0-9a-f]{!2GRPIDSZ} {
     HEX2BIN_ARRAY(c->grpid);
 !}
@@ -199,6 +200,7 @@ static struct pubkeyset_context c[1];
 !}
 !KEYWORD pub
 !ARG algo [-0-9a-z]+ {
+    if (c->fallback_skip) DOSKIP("fallback not needed");
     c->scheme = sigscheme_lookup(yytext);
     if (!c->scheme) DOSKIP("unknown pk algorithm");
 !}
@@ -285,6 +287,7 @@ keyset_load(const char *path, struct buffer_if *data_buf,
     NEW(c->building);
     c->building->nkeys=0;
     c->building->refcount=1;
+    c->fallback_skip=0;
     c->had_serial=0;
     c->lno=1;
     FILLZERO(c->grpid);