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
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Wim Lewis
nettle
Commits
3eff4cc8
Commit
3eff4cc8
authored
Sep 21, 2012
by
Niels Möller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pbkdf2: Reorganized loops.
parent
12bbae8b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
28 deletions
+28
-28
ChangeLog
ChangeLog
+3
-0
pbkdf2.c
pbkdf2.c
+25
-28
No files found.
ChangeLog
View file @
3eff4cc8
2012-09-21 Niels Möller <nisse@lysator.liu.se>
* pbkdf2.c (pbkdf2): assert that iterations > 0. Reorganized
loops.
* nettle.texinfo (Cipher functions): Stress that the salsa20 hash
function is not suitable as a general hash function.
...
...
pbkdf2.c
View file @
3eff4cc8
...
...
@@ -5,7 +5,7 @@
/* nettle, low-level cryptographics library
*
* Copyright (C) 2012 Simon Josefsson
* Copyright (C) 2012 Simon Josefsson
, Niels Möller
*
* The nettle library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
...
...
@@ -48,47 +48,44 @@ pbkdf2 (void *mac_ctx,
TMP_DECL
(
U
,
uint8_t
,
NETTLE_MAX_HASH_DIGEST_SIZE
);
TMP_DECL
(
T
,
uint8_t
,
NETTLE_MAX_HASH_DIGEST_SIZE
);
unsigned
int
u
;
unsigned
int
l
;
unsigned
int
r
;
unsigned
int
i
;
char
tmp
[
4
];
unsigned
i
;
if
(
iterations
==
0
)
return
;
assert
(
iterations
>
0
);
if
(
length
==
0
)
return
;
l
=
((
length
-
1
)
/
digest_size
)
+
1
;
r
=
length
-
(
l
-
1
)
*
digest_size
;
TMP_ALLOC
(
U
,
digest_size
);
TMP_ALLOC
(
T
,
digest_size
);
for
(
i
=
1
;
i
<=
l
;
i
++
)
for
(
i
=
1
;;
i
++
,
dst
+=
digest_size
,
length
-=
digest_size
)
{
memset
(
T
,
0
,
digest_size
);
for
(
u
=
1
;
u
<=
iterations
;
u
++
)
uint8_t
tmp
[
4
];
uint8_t
*
prev
;
unsigned
u
;
WRITE_UINT32
(
tmp
,
i
);
update
(
mac_ctx
,
salt_length
,
salt
);
update
(
mac_ctx
,
sizeof
(
tmp
),
tmp
);
digest
(
mac_ctx
,
digest_size
,
T
);
prev
=
T
;
for
(
u
=
1
;
u
<
iterations
;
u
++
,
prev
=
U
)
{
if
(
u
==
1
)
{
WRITE_UINT32
(
tmp
,
i
);
update
(
mac_ctx
,
salt_length
,
salt
);
update
(
mac_ctx
,
4
,
tmp
);
}
else
{
update
(
mac_ctx
,
digest_size
,
U
);
}
update
(
mac_ctx
,
digest_size
,
prev
);
digest
(
mac_ctx
,
digest_size
,
U
);
memxor
(
T
,
U
,
digest_size
);
}
memcpy
(
dst
+
(
i
-
1
)
*
digest_size
,
T
,
i
==
l
?
r
:
digest_size
);
if
(
length
<=
digest_size
)
{
memcpy
(
dst
,
T
,
length
);
return
;
}
memcpy
(
dst
,
T
,
digest_size
);
}
}
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