From: Matt Caswell <matt@openssl.org>
Date: Thu, 2 Jun 2016 12:53:49 +0000 (+0100)
Subject: Fix test failures when using enable-ubsan
X-Git-Tag: OpenSSL_1_1_0-pre6~594
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=02d6070430de33cf09e1db6b77a6aa43390c62a8;p=oweals%2Fopenssl.git

Fix test failures when using enable-ubsan

Numerous test failures were occuring when Configured with enable-ubsan
although they could all be traced back to one issue.

Reviewed-by: Andy Polyakov <appro@openssl.org>
---

diff --git a/crypto/bn/rsaz_exp.c b/crypto/bn/rsaz_exp.c
index 3398cce9ab..1a70f6cade 100644
--- a/crypto/bn/rsaz_exp.c
+++ b/crypto/bn/rsaz_exp.c
@@ -253,7 +253,7 @@ void RSAZ_1024_mod_exp_avx2(BN_ULONG result_norm[16],
 
         rsaz_1024_sqr_avx2(result, result, m, k0, 5);
 
-        wvalue = *((unsigned short *)&p_str[index / 8]);
+        wvalue = (p_str[(index / 8) + 1] << 8) | p_str[index / 8];
         wvalue = (wvalue >> (index % 8)) & 31;
         index -= 5;