changelog: start 0.6.8

[secnet.git] / pubkeys.fl.pl

diff --git a/pubkeys.fl.pl b/pubkeys.fl.pl
index 4c3009107701cb841dda38728e3cb58f965fe07b..da1e4d40ce396e255ff685c181710b531c23f8b8 100755 (executable)
--- a/pubkeys.fl.pl
+++ b/pubkeys.fl.pl
@@ -161,7 +161,6 @@ struct pubkeyset_context {
     /* filled in during setup: */
     struct cloc loc; /* line is runtime */
     struct log_if *log;
-    struct hash_if *defhash;
     struct buffer_if *data_buf;
     struct peer_keyset *building;
     /* runtime: */
@@ -228,23 +227,16 @@ static struct pubkeyset_context c[1];
 !FINAL {
     if (c->building->nkeys >= MAX_SIG_KEYS) DOSKIP("too many public keys");
     struct sigpubkey_if *pubkey;
+    closure_t *cl;
     bool_t ok=c->scheme->loadpub(c->scheme,c->data_buf,
-                                &pubkey,c->log,c->loc);
+                                &pubkey,&cl,c->log,c->loc);
     if (!ok) break;
-    if (pubkey->sethash) {
-       if (!c->defhash) {
-           pubkey->dispose(pubkey->st);
-           DOSKIP("public key requires default hash to load");
-       }
-       pubkey->sethash(pubkey->st,c->defhash);
-    }
-    memcpy(c->building->keys[c->building->nkeys].id.b,
-          c->grpid,
-           GRPIDSZ);
+    struct peer_pubkey *fill=&c->building->keys[c->building->nkeys];
+    memcpy(fill->id.b,c->grpid,GRPIDSZ);
     assert(ALGIDSZ==1); /* otherwise need htons or htonl or something */
-    c->building->keys[c->building->nkeys].id.b[GRPIDSZ]=
-      c->scheme->algid;
-    c->building->keys[c->building->nkeys++].pubkey=pubkey;
+    fill->id.b[GRPIDSZ]=c->scheme->algid;
+    fill->pubkey=pubkey;
+    c->building->nkeys++;
 !}
 
 !KEYWORD serial
@@ -291,11 +283,9 @@ static struct pubkeyset_context c[1];
 
 extern struct peer_keyset *
 keyset_load(const char *path, struct buffer_if *data_buf,
-           struct log_if *log, int logcl_enoent,
-           struct hash_if *defhash) {
+           struct log_if *log, int logcl_enoent) {
     assert(!c->building);
     c->log=log;
-    c->defhash=defhash;
     c->loc.file=path;
     pkyyin = fopen(path, "r");
     if (!pkyyin) {