[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  02d6070430de33cf09e1db6b77a6aa43390c62a8 (commit)
      from  03b89819f58b100c1e13ca2661a70f2403a187d1 (commit)


- Log -----------------------------------------------------------------
commit 02d6070430de33cf09e1db6b77a6aa43390c62a8
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Jun 2 13:53:49 2016 +0100

    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/bn/rsaz_exp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/bn/rsaz_exp.c b/crypto/bn/rsaz_exp.c
index 3398cce..1a70f6c 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;