projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing newlines to some error messages.
[tinc]
/
src
/
nolegacy
/
prf.c
diff --git
a/src/nolegacy/prf.c
b/src/nolegacy/prf.c
index
3c4c27e
..
ce80f8c
100644
(file)
--- a/
src/nolegacy/prf.c
+++ b/
src/nolegacy/prf.c
@@
-23,43
+23,55
@@
#include "../ed25519/sha512.h"
static void memxor(char *buf, char c, size_t len) {
#include "../ed25519/sha512.h"
static void memxor(char *buf, char c, size_t len) {
- for(size_t i = 0; i < len; i++)
+ for(size_t i = 0; i < len; i++)
{
buf[i] ^= c;
buf[i] ^= c;
+ }
}
static const size_t mdlen = 64;
}
static const size_t mdlen = 64;
+static const size_t blklen = 128;
static bool hmac_sha512(const char *key, size_t keylen, const char *msg, size_t msglen, char *out) {
static bool hmac_sha512(const char *key, size_t keylen, const char *msg, size_t msglen, char *out) {
- char tmp[
2 *
mdlen];
+ char tmp[
blklen +
mdlen];
sha512_context md;
sha512_context md;
- if(keylen <=
md
len) {
+ if(keylen <=
blk
len) {
memcpy(tmp, key, keylen);
memcpy(tmp, key, keylen);
- memset(tmp + keylen, 0,
md
len - keylen);
+ memset(tmp + keylen, 0,
blk
len - keylen);
} else {
} else {
- if(sha512(key, keylen, tmp) != 0)
+ if(sha512(key, keylen, tmp) != 0)
{
return false;
return false;
+ }
+
+ memset(tmp + mdlen, 0, blklen - mdlen);
}
}
- if(sha512_init(&md) != 0)
+ if(sha512_init(&md) != 0)
{
return false;
return false;
+ }
// ipad
// ipad
- memxor(tmp, 0x36, mdlen);
- if(sha512_update(&md, tmp, mdlen) != 0)
+ memxor(tmp, 0x36, blklen);
+
+ if(sha512_update(&md, tmp, blklen) != 0) {
return false;
return false;
+ }
// message
// message
- if(sha512_update(&md, msg, msglen) != 0)
+ if(sha512_update(&md, msg, msglen) != 0)
{
return false;
return false;
+ }
- if(sha512_final(&md, tmp +
mdlen) != 0)
+ if(sha512_final(&md, tmp +
blklen) != 0) {
return false;
return false;
+ }
// opad
// opad
- memxor(tmp, 0x36 ^ 0x5c, mdlen);
- if(sha512(tmp, sizeof tmp, out) != 0)
+ memxor(tmp, 0x36 ^ 0x5c, blklen);
+
+ if(sha512(tmp, sizeof(tmp), out) != 0) {
return false;
return false;
+ }
return true;
}
return true;
}
@@
-82,18
+94,23
@@
bool prf(const char *secret, size_t secretlen, char *seed, size_t seedlen, char
while(outlen > 0) {
/* Inner HMAC */
while(outlen > 0) {
/* Inner HMAC */
- if(!hmac_sha512(
data, sizeof data, secret, secretlen, data))
+ if(!hmac_sha512(
secret, secretlen, data, sizeof(data), data)) {
return false;
return false;
+ }
/* Outer HMAC */
if(outlen >= mdlen) {
/* Outer HMAC */
if(outlen >= mdlen) {
- if(!hmac_sha512(
data, sizeof data, secret, secretlen, out))
+ if(!hmac_sha512(
secret, secretlen, data, sizeof(data), out)) {
return false;
return false;
+ }
+
out += mdlen;
outlen -= mdlen;
} else {
out += mdlen;
outlen -= mdlen;
} else {
- if(!hmac_sha512(
data, sizeof data, secret, secretlen, hash))
+ if(!hmac_sha512(
secret, secretlen, data, sizeof(data), hash)) {
return false;
return false;
+ }
+
memcpy(out, hash, outlen);
out += outlen;
outlen = 0;
memcpy(out, hash, outlen);
out += outlen;
outlen = 0;