[openssl-commits] [openssl] OpenSSL-fips-2_0-dev update

[Andy Polyakov]

The branch OpenSSL-fips-2_0-dev has been updated
       via  d8a23532dd3a023b7fa43db7d1dc4433a42363cb (commit)
      from  8a09500d9cc1bafcbafb4d18c1bf2238bf354171 (commit)


- Log -----------------------------------------------------------------
commit d8a23532dd3a023b7fa43db7d1dc4433a42363cb
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Apr 13 20:57:37 2013 +0200

    crypto/modes/modes_lcl.h: let STRICT_ALIGNMENT be on ARMv7.
    
    While ARMv7 in general is capable of unaligned access, not all instructions
    actually are. And trouble is that compiler doesn't seem to differentiate
    those capable and incapable of unaligned access. Side effect is that kernel
    goes into endless loop retrying same instruction triggering unaligned trap.
    Problem was observed in xts128.c and ccm128.c modules. It's possible to
    resolve it by using (volatile u32*) casts, but letting STRICT_ALIGNMENT
    be feels more appropriate.
    
    (cherry picked from commit 3bdd80521a81d50ade4214053cd9b293f920a77b)
    Reviewed-by: Dr. Stephen Henson <steve at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

Summary of changes:
 crypto/modes/modes_lcl.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/crypto/modes/modes_lcl.h b/crypto/modes/modes_lcl.h
index 4dab6a6..fa5d3b0 100644
--- a/crypto/modes/modes_lcl.h
+++ b/crypto/modes/modes_lcl.h
@@ -29,10 +29,7 @@ typedef unsigned char u8;
 #if defined(__i386)	|| defined(__i386__)	|| \
     defined(__x86_64)	|| defined(__x86_64__)	|| \
     defined(_M_IX86)	|| defined(_M_AMD64)	|| defined(_M_X64) || \
-    defined(__s390__)	|| defined(__s390x__)	|| \
-    ( (defined(__arm__)	|| defined(__arm)) && \
-      (defined(__ARM_ARCH_7__)	|| defined(__ARM_ARCH_7A__) || \
-       defined(__ARM_ARCH_7R__)	|| defined(__ARM_ARCH_7M__)) )
+    defined(__s390__)	|| defined(__s390x__)
 # undef STRICT_ALIGNMENT
 #endif