[openssh-commits] [openssh] 01/01: upstream commit
git+noreply at mindrot.org
git+noreply at mindrot.org
Tue Nov 28 17:19:20 AEDT 2017
This is an automated email from the git hooks/post-receive script.
djm pushed a commit to branch master
in repository openssh.
commit 2937dd02c572a12f33d5c334d518f6cbe0b645eb
Author: djm at openbsd.org <djm at openbsd.org>
Date: Tue Nov 28 06:09:38 2017 +0000
upstream commit
more whitespace errors
OpenBSD-Commit-ID: 5e11c125378327b648940b90145e0d98beb05abb
---
umac.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/umac.c b/umac.c
index b1997fc2..b6b256a7 100644
--- a/umac.c
+++ b/umac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umac.c,v 1.14 2017/11/28 06:04:51 djm Exp $ */
+/* $OpenBSD: umac.c,v 1.15 2017/11/28 06:09:38 djm Exp $ */
/* -----------------------------------------------------------------------
*
* umac.c -- C Implementation UMAC Message Authentication
@@ -682,7 +682,7 @@ static void nh_final(nh_ctx *hc, UINT8 *result)
nh_transform(hc, hc->data, nh_len);
hc->bytes_hashed += hc->next_data_empty;
} else if (hc->bytes_hashed == 0) {
- nh_len = L1_PAD_BOUNDARY;
+ nh_len = L1_PAD_BOUNDARY;
zero_pad(hc->data, L1_PAD_BOUNDARY);
nh_transform(hc, hc->data, nh_len);
}
@@ -1133,10 +1133,10 @@ static int uhash(uhash_ctx_t ahc, u_char *msg, long len, u_char *res)
* the polyhash.
*/
if (len <= L1_KEY_LEN) {
- if (len == 0) /* If zero length messages will not */
- nh_len = L1_PAD_BOUNDARY; /* be seen, comment out this case */
- else
- nh_len = ((len + (L1_PAD_BOUNDARY - 1)) & ~(L1_PAD_BOUNDARY - 1));
+ if (len == 0) /* If zero length messages will not */
+ nh_len = L1_PAD_BOUNDARY; /* be seen, comment out this case */
+ else
+ nh_len = ((len + (L1_PAD_BOUNDARY - 1)) & ~(L1_PAD_BOUNDARY - 1));
extra_zeroes_needed = nh_len - len;
zero_pad((UINT8 *)msg + len, extra_zeroes_needed);
nh(&ahc->hash, (UINT8 *)msg, nh_len, len, nh_result);
--
To stop receiving notification emails like this one, please contact
djm at mindrot.org.
More information about the openssh-commits
mailing list