[openssl-commits] [openssl] master update

[Viktor Dukhovni]

The branch master has been updated
       via  35ade23b02a02b5514941586030016b67ac0934e (commit)
      from  987157f6f63fa70dbeffca3c8bc62f26e9767ff2 (commit)


- Log -----------------------------------------------------------------
commit 35ade23b02a02b5514941586030016b67ac0934e
Author: Viktor Dukhovni <openssl-users at dukhovni.org>
Date:   Thu Jan 28 19:04:49 2016 -0500

    Keep RC5 bit shifts in [0..31]
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 crypto/rc5/rc5_locl.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/rc5/rc5_locl.h b/crypto/rc5/rc5_locl.h
index 9944440..6b34f92 100644
--- a/crypto/rc5/rc5_locl.h
+++ b/crypto/rc5/rc5_locl.h
@@ -170,10 +170,10 @@
 # endif
 #endif
 #ifndef ROTATE_l32
-# define ROTATE_l32(a,n)     (((a)<<(n&0x1f))|(((a)&0xffffffff)>>(32-(n&0x1f))))
+# define ROTATE_l32(a,n)     (((a)<<(n&0x1f))|(((a)&0xffffffff)>>((32-n)&0x1f)))
 #endif
 #ifndef ROTATE_r32
-# define ROTATE_r32(a,n)     (((a)<<(32-(n&0x1f)))|(((a)&0xffffffff)>>(n&0x1f)))
+# define ROTATE_r32(a,n)     (((a)<<((32-n)&0x1f))|(((a)&0xffffffff)>>(n&0x1f)))
 #endif
 
 #define RC5_32_MASK     0xffffffffL