~mdw
/
secnet
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a47ab75
)
@@@ import-catacomb-crypto keccak/sha3
author
Mark Wooding
<mdw@distorted.org.uk>
Thu, 26 Sep 2019 03:43:00 +0000
(
04:43
+0100)
committer
Mark Wooding
<mdw@distorted.org.uk>
Thu, 26 Sep 2019 03:43:00 +0000
(
04:43
+0100)
import-catacomb-crypto
patch
|
blob
|
blame
|
history
diff --git
a/import-catacomb-crypto
b/import-catacomb-crypto
index
497b299
..
fc01f30
100755
(executable)
--- a/
import-catacomb-crypto
+++ b/
import-catacomb-crypto
@@
-411,6
+411,9
@@
EOF
{ push @lookahead, $line2, $line1; }
}
{ 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;
## 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{\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/) {
## Fix the provenance note.
if ($line =~ /^ \* This file is part of Catacomb/) {