employer
/
tame
1
0
Fork 0
Code Packages Releases Activity

list2typedef: Remove trailing newline from preimage 

Oops---we do not want a newline as part of the preimage, which is what
`<<<' does.

* build-aux/list2typedef (output-item)[value]: Remove newline from preimage.
* build-aux/test/test-list2typedef (test-typedef-gen): Update hashes.
  (test-collision-value-check): Add new collisions.
master
Mike Gerwitz 2018-05-15 16:47:21 -04:00
parent e3b0baec1a
commit fafbf3921e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-aux/list2typedef
View File

@ -66,7 +66,7 @@ output-item()
local name; read -r name
local -r const=$( constify "$typedef" <<< "$name" )
local -r value=$( hash-name "$bytes" <<< "$name" )
local -r value=$( echo -n "$name" | hash-name "$bytes" )
assert-collision "$const" "$value"

12
build-aux/test/test-list2typedef
View File

@ -41,9 +41,9 @@ Second'\''s @ @Line
title="FooType Type">
<typedef name="FooType" desc="FooType">
<enum type="integer">
<item name="FOOTYPE_FIRST" value="4285081399" desc="First" />
<item name="FOOTYPE_SECONDS_LINE" value="582715539" desc="Second'\''s @ @Line" />
<item name="FOOTYPE_THIRD" value="3355510722" desc="!!!THIRD!!!" />
<item name="FOOTYPE_FIRST" value="2706493105" desc="First" />
<item name="FOOTYPE_SECONDS_LINE" value="3512333918" desc="Second'\''s @ @Line" />
<item name="FOOTYPE_THIRD" value="519392729" desc="!!!THIRD!!!" />
</enum>
</typedef>
</package>'
@ -79,11 +79,11 @@ test-collision-value-check()
# we can easily force a collision by reducing the number of bytes to 1 and
# calculating hashes from /usr/share/dict/words; this is one example
local err=$( ../list2typedef Foo 1 2>&1 >/dev/null <<< 'abacist
abatis
local err=$( ../list2typedef Foo 1 2>&1 >/dev/null <<< 'abase
abate
' && echo 'EXPECTED FAILURE' )
[[ "$err" =~ ABATIS && "$err" =~ '44' ]] || {
[[ "$err" =~ ABATE && "$err" =~ '157' ]] || {
echo 'expecting useful error message for value collion' >&2
return 1
}