Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nettle
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
5
Merge Requests
5
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Nettle
nettle
Commits
1eeedf51
Commit
1eeedf51
authored
Oct 21, 2014
by
Niels Möller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rewrote hex decoding for test programs.
parent
451ec8e0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
76 deletions
+14
-76
ChangeLog
ChangeLog
+6
-0
testsuite/testutils.c
testsuite/testutils.c
+8
-76
No files found.
ChangeLog
View file @
1eeedf51
2014-10-21 Niels Möller <nisse@lysator.liu.se>
* testsuite/testutils.c (tstring_hex): Rewrite, using Nettle's
base16 functions.
(decode_hex, decode_hex_length): Deleted functions.
2014-10-20 Niels Möller <nisse@lysator.liu.se>
* eddsa.h (ED25519_KEY_SIZE): New constant.
...
...
testsuite/testutils.c
View file @
1eeedf51
...
...
@@ -2,6 +2,7 @@
#include "testutils.h"
#include "base16.h"
#include "cbc.h"
#include "ctr.h"
#include "knuth-lfib.h"
...
...
@@ -11,27 +12,6 @@
#include <assert.h>
#include <ctype.h>
/* -1 means invalid */
static
const
signed
char
hex_digits
[
0x100
]
=
{
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
0
,
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
10
,
11
,
12
,
13
,
14
,
15
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
10
,
11
,
12
,
13
,
14
,
15
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
,
-
1
};
void
die
(
const
char
*
format
,
...)
{
...
...
@@ -89,67 +69,19 @@ tstring_data(size_t length, const char *data)
return
s
;
}
static
size_t
decode_hex_length
(
const
char
*
h
)
{
const
unsigned
char
*
hex
=
(
const
unsigned
char
*
)
h
;
size_t
count
;
size_t
i
;
for
(
count
=
i
=
0
;
hex
[
i
];
i
++
)
{
if
(
isspace
(
hex
[
i
]))
continue
;
if
(
hex_digits
[
hex
[
i
]]
<
0
)
abort
();
count
++
;
}
if
(
count
%
2
)
abort
();
return
count
/
2
;
}
static
void
decode_hex
(
uint8_t
*
dst
,
const
char
*
h
)
{
const
unsigned
char
*
hex
=
(
const
unsigned
char
*
)
h
;
size_t
i
=
0
;
for
(;;)
{
int
high
,
low
;
while
(
*
hex
&&
isspace
(
*
hex
))
hex
++
;
if
(
!*
hex
)
return
;
high
=
hex_digits
[
*
hex
++
];
ASSERT
(
high
>=
0
);
while
(
*
hex
&&
isspace
(
*
hex
))
hex
++
;
ASSERT
(
*
hex
);
low
=
hex_digits
[
*
hex
++
];
ASSERT
(
low
>=
0
);
dst
[
i
++
]
=
(
high
<<
4
)
|
low
;
}
}
struct
tstring
*
tstring_hex
(
const
char
*
hex
)
{
struct
base16_decode_ctx
ctx
;
struct
tstring
*
s
;
size_t
length
=
decode_hex_length
(
hex
);
size_t
length
=
strlen
(
hex
);
s
=
tstring_alloc
(
length
);
s
=
tstring_alloc
(
BASE16_DECODE_LENGTH
(
length
));
base16_decode_init
(
&
ctx
);
ASSERT
(
base16_decode_update
(
&
ctx
,
&
s
->
length
,
s
->
data
,
length
,
hex
));
ASSERT
(
base16_decode_final
(
&
ctx
));
decode_hex
(
s
->
data
,
hex
);
return
s
;
}
...
...
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