From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 26 Sep 2019 03:43:00 +0000 (+0100)
Subject: @@@ import-catacomb-crypto keccak/sha3
X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/commitdiff_plain/b823ca7c52b5a2434a61d086a8aec1579be2f4d2

@@@ import-catacomb-crypto keccak/sha3
---

diff --git a/import-catacomb-crypto b/import-catacomb-crypto
index 497b299..fc01f30 100755
--- a/import-catacomb-crypto
+++ b/import-catacomb-crypto
@@ -411,6 +411,9 @@ EOF
 	{ push @lookahead, $line2, $line1; }
     }
 
+    if ($line eq "static void rightenc_sz(shake_ctx *ctx, size_t n)")
+      { $skip_reason = "defun"; next LINE; }
+
     ## Other random tweaks.
     $line =~ s/ct_memeq/consttime_memeq/g;
     $line =~ s/\bSHA512_HASHSZ\b/SHA512_DIGEST_SIZE/g;
@@ -419,6 +422,7 @@ EOF
     $line =~ s{\b sha512_hash \( ([^,]+) (,\s*) ([^,]+) (,\s*) ([^)]+) \)}
 	      {sha512_process_bytes($3$2$5$2$1)}gx;
     $line =~ s/\bsha512_done\b/sha512_finish_ctx/g;
+    $line =~ s/\bdo\s*;\s*while\b/do {} while/g;
 
     ## Fix the provenance note.
     if ($line =~ /^ \* This file is part of Catacomb/) {