Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Brian Smith
nettle
Commits
95c8eb72
Commit
95c8eb72
authored
Apr 17, 2012
by
Niels Möller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Test that salsa20_crypt doesn't overwrite the destination area.
parent
f908487f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
6 deletions
+21
-6
ChangeLog
ChangeLog
+4
-0
testsuite/salsa20-test.c
testsuite/salsa20-test.c
+17
-6
No files found.
ChangeLog
View file @
95c8eb72
2012-04-17 Niels Möller <nisse@lysator.liu.se>
* testsuite/salsa20-test.c (test_salsa20_stream): Check that
salsa20_crypt doesn't write beyond the given destination area.
(test_salsa20): Likewise.
* salsa20-crypt.c: Renamed file, from...
* salsa20.c: ... old name.
...
...
testsuite/salsa20-test.c
View file @
95c8eb72
...
...
@@ -27,15 +27,19 @@ test_salsa20_stream(unsigned key_length,
{
struct
salsa20_ctx
ctx
;
uint8_t
data
[
STREAM_LENGTH
+
1
];
uint8_t
stream
[
STREAM_LENGTH
];
uint8_t
stream
[
STREAM_LENGTH
+
1
];
uint8_t
xor
[
SALSA20_BLOCK_SIZE
];
unsigned
j
;
salsa20_set_key
(
&
ctx
,
key_length
,
key
);
salsa20_set_iv
(
&
ctx
,
iv
);
memset
(
stream
,
0
,
STREAM_LENGTH
);
memset
(
stream
,
0
,
STREAM_LENGTH
+
1
);
salsa20_crypt
(
&
ctx
,
STREAM_LENGTH
,
stream
,
stream
);
if
(
stream
[
STREAM_LENGTH
])
{
fprintf
(
stderr
,
"Stream of %d bytes wrote too much!
\n
"
,
STREAM_LENGTH
);
FAIL
();
}
if
(
!
MEMEQ
(
64
,
stream
,
ciphertext
))
{
fprintf
(
stderr
,
"Error failed, offset 0:
\n
"
);
...
...
@@ -100,7 +104,7 @@ test_salsa20_stream(unsigned key_length,
}
if
(
!
memzero_p
(
data
+
j
,
STREAM_LENGTH
+
1
-
j
))
{
fprintf
(
stderr
,
"Encrypt failed for length
,
%u wrote too much:
\n
"
,
j
);
fprintf
(
stderr
,
"Encrypt failed for length %u
,
wrote too much:
\n
"
,
j
);
fprintf
(
stderr
,
"
\n
Output: "
);
print_hex
(
STREAM_LENGTH
+
1
-
j
,
data
+
j
);
fprintf
(
stderr
,
"
\n
"
);
...
...
@@ -118,12 +122,19 @@ test_salsa20(unsigned key_length,
const
uint8_t
*
ciphertext
)
{
struct
salsa20_ctx
ctx
;
uint8_t
*
data
=
xalloc
(
length
);
uint8_t
*
data
=
xalloc
(
length
+
1
);
salsa20_set_key
(
&
ctx
,
key_length
,
key
);
salsa20_set_iv
(
&
ctx
,
iv
);
data
[
length
]
=
17
;
salsa20_crypt
(
&
ctx
,
length
,
data
,
cleartext
);
if
(
data
[
length
]
!=
17
)
{
fprintf
(
stderr
,
"Encrypt of %u bytes wrote too much!
\n
Input:"
,
length
);
print_hex
(
length
,
cleartext
);
fprintf
(
stderr
,
"
\n
"
);
FAIL
();
}
if
(
!
MEMEQ
(
length
,
data
,
ciphertext
))
{
fprintf
(
stderr
,
"Encrypt failed:
\n
Input:"
);
...
...
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