77 lines
2.0 KiB
Diff
77 lines
2.0 KiB
Diff
[PATCH] force the MAC output to be 64-bit aligned
|
|
|
|
Upstream-Status: Backport[anoncvs.mindrot.org/index.cgi/openssh/mac.c?r1=1.27&r2=1.28]
|
|
|
|
Backport patch to fix segment fault due to unaligned memory access
|
|
|
|
Wed Jun 5 22:12:37 2013 UTC (7 days, 3 hours ago) by dtucker
|
|
Branch: MAIN
|
|
CVS Tags: HEAD
|
|
Changes since 1.27: +11 -8 lines
|
|
Diff to previous 1.27
|
|
|
|
- dtucker@cvs.openbsd.org 2013/06/03 00:03:18
|
|
[mac.c]
|
|
force the MAC output to be 64-bit aligned so umac won't see
|
|
unaligned
|
|
accesses on strict-alignment architectures. bz#2101, patch from
|
|
tomas.kuthan at oracle.com, ok djm@
|
|
---
|
|
mac.c | 18 +++++++++++-------
|
|
1 file changed, 11 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/mac.c b/mac.c
|
|
index 3f2dc6f..a5a80d3 100644
|
|
--- a/mac.c
|
|
+++ b/mac.c
|
|
@@ -152,12 +152,16 @@ mac_init(Mac *mac)
|
|
u_char *
|
|
mac_compute(Mac *mac, u_int32_t seqno, u_char *data, int datalen)
|
|
{
|
|
- static u_char m[EVP_MAX_MD_SIZE];
|
|
+ static union {
|
|
+ u_char m[EVP_MAX_MD_SIZE];
|
|
+ u_int64_t for_align;
|
|
+ } u;
|
|
+
|
|
u_char b[4], nonce[8];
|
|
|
|
- if (mac->mac_len > sizeof(m))
|
|
+ if (mac->mac_len > sizeof(u))
|
|
fatal("mac_compute: mac too long %u %lu",
|
|
- mac->mac_len, (u_long)sizeof(m));
|
|
+ mac->mac_len, (u_long)sizeof(u));
|
|
|
|
switch (mac->type) {
|
|
case SSH_EVP:
|
|
@@ -166,22 +170,22 @@ mac_compute(Mac *mac, u_int32_t seqno, u_char *data, int datalen)
|
|
HMAC_Init(&mac->evp_ctx, NULL, 0, NULL);
|
|
HMAC_Update(&mac->evp_ctx, b, sizeof(b));
|
|
HMAC_Update(&mac->evp_ctx, data, datalen);
|
|
- HMAC_Final(&mac->evp_ctx, m, NULL);
|
|
+ HMAC_Final(&mac->evp_ctx, u.m, NULL);
|
|
break;
|
|
case SSH_UMAC:
|
|
put_u64(nonce, seqno);
|
|
umac_update(mac->umac_ctx, data, datalen);
|
|
- umac_final(mac->umac_ctx, m, nonce);
|
|
+ umac_final(mac->umac_ctx, u.m, nonce);
|
|
break;
|
|
case SSH_UMAC128:
|
|
put_u64(nonce, seqno);
|
|
umac128_update(mac->umac_ctx, data, datalen);
|
|
- umac128_final(mac->umac_ctx, m, nonce);
|
|
+ umac128_final(mac->umac_ctx, u.m, nonce);
|
|
break;
|
|
default:
|
|
fatal("mac_compute: unknown MAC type");
|
|
}
|
|
- return (m);
|
|
+ return (u.m);
|
|
}
|
|
|
|
void
|
|
--
|
|
1.7.9.5
|
|
|