[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Andy Polyakov]

The branch OpenSSL_1_0_1-stable has been updated
       via  38b7073328fc0f2713d377472de8d189ae42eda1 (commit)
      from  75077a2277f95cc293e1f5d0538b426ae5e99e6f (commit)


- Log -----------------------------------------------------------------
commit 38b7073328fc0f2713d377472de8d189ae42eda1
Author: Andy Polyakov <appro at openssl.org>
Date:   Sun May 24 22:51:12 2015 +0200

    md32_common.h: backport ICC fix.
    
    RT#3843
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 crypto/md32_common.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crypto/md32_common.h b/crypto/md32_common.h
index c1efb45..1823833 100644
--- a/crypto/md32_common.h
+++ b/crypto/md32_common.h
@@ -142,8 +142,10 @@
  */
 #undef ROTATE
 #ifndef PEDANTIC
-# if defined(_MSC_VER) || defined(__ICC)
+# if defined(_MSC_VER)
 #  define ROTATE(a,n)   _lrotl(a,n)
+# elif defined(__ICC)
+#  define ROTATE(a,n)   _rotl(a,n)
 # elif defined(__MWERKS__)
 #  if defined(__POWERPC__)
 #   define ROTATE(a,n)  __rlwinm(a,n,0,31)