Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Nettle
nettle
Commits
4f34b218
Commit
4f34b218
authored
May 28, 2014
by
Niels Möller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for windows lineending in nettle-pbkdf2-test.
parent
03b633b4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
ChangeLog
ChangeLog
+3
-0
testsuite/nettle-pbkdf2-test
testsuite/nettle-pbkdf2-test
+4
-2
No files found.
ChangeLog
View file @
4f34b218
2014-05-28 Niels Möller <nisse@lysator.liu.se>
* testsuite/nettle-pbkdf2-test: Delete carriage return characters
from output.
* configure.ac (LIBHOGWEED_LIBS): Be explicit and link
libhogweed.so with libnettle.so, not -lnettle.
(LIBHOGWEED_LINK): Drop -L. flag, no longer needed, and previously
...
...
testsuite/nettle-pbkdf2-test
View file @
4f34b218
...
...
@@ -13,9 +13,11 @@ test_pbkdf2 () {
# $expected contains more than one space.
length
=
`
expr
"
$expected
"
:
'.*'
/ 2
`
# Delete carriage return characters, needed when testing with
# wine.
printf
"%s"
"
$password
"
|
$EMULATOR
../tools/nettle-pbkdf2
\
-i
"
$iters
"
-l
"
$length
"
"
$salt
"
>
test1.out
echo
"
$expected
"
>
test2.out
-i
"
$iters
"
-l
"
$length
"
"
$salt
"
|
tr
-d
'\r'
>
test1.out
echo
"
$expected
"
|
tr
-d
'\r'
>
test2.out
if
cmp test1.out test2.out
;
then
true
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment