diff options
| author |   tim <tim@openbsd.org> | 2019-11-21 20:02:20 +0000 |
|---|---|---|
| committer | tim <tim@openbsd.org> | 2019-11-21 20:02:20 +0000 |
| commit | 4855ec3212f50b1bc8675645d7b4845cc92fc331 (patch) | |
| tree | 8514158d559a67209a934a8bb3c68d1b37d85401 | |
| parent | Use explicit_bzero() to clear key material (diff) | |
| download | wireguard-openbsd-4855ec3212f50b1bc8675645d7b4845cc92fc331.tar.xz wireguard-openbsd-4855ec3212f50b1bc8675645d7b4845cc92fc331.zip | |
A touch of style(9)
OK tb@ tedu@
| -rw-r--r-- | lib/libcrypto/hkdf/hkdf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libcrypto/hkdf/hkdf.c b/lib/libcrypto/hkdf/hkdf.c index 2327bdf6254..b8be10bfcb8 100644 --- a/lib/libcrypto/hkdf/hkdf.c +++ b/lib/libcrypto/hkdf/hkdf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hkdf.c,v 1.3 2019/11/21 20:01:06 tim Exp $ */ +/* $OpenBSD: hkdf.c,v 1.4 2019/11/21 20:02:20 tim Exp $ */ /* Copyright (c) 2014, Google Inc. * * Permission to use, copy, modify, and/or distribute this software for any @@ -32,10 +32,10 @@ HKDF(uint8_t *out_key, size_t out_len, const EVP_MD *digest, size_t prk_len; if (!HKDF_extract(prk, &prk_len, digest, secret, secret_len, salt, - salt_len)) + salt_len)) return 0; if (!HKDF_expand(out_key, out_len, digest, prk, prk_len, info, - info_len)) + info_len)) return 0; return 1; @@ -50,8 +50,8 @@ HKDF_extract(uint8_t *out_key, size_t *out_len, unsigned int len; /* - * If salt is not given, HashLength zeros are used. However, HMAC does that - * internally already so we can ignore it. + * If salt is not given, HashLength zeros are used. However, HMAC does + * that internally already so we can ignore it. */ if (HMAC(digest, salt, salt_len, secret, secret_len, out_key, &len) == NULL) { @@ -91,7 +91,7 @@ HKDF_expand(uint8_t *out_key, size_t out_len, size_t todo; if (i != 0 && (!HMAC_Init_ex(&hmac, NULL, 0, NULL, NULL) || - !HMAC_Update(&hmac, previous, digest_len))) + !HMAC_Update(&hmac, previous, digest_len))) goto out; if (!HMAC_Update(&hmac, info, info_len) || |