commit 54cdd120aa654b5eb0647e44bdcd94d2275f8761
author Adam Langley <agl@google.com> Tue Jun 24 19:20:43 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 24 18:01:32 2014 +0000
tree 8ac205f014e3c7b516f349a1753bdf4ee793018e
parent 3f4e13c7dab89994c7c104c3309ea1ed2f26dfd1
parent 30eda1d2b80b8a943d3fb792f623a232646b0dbc

Merge "Include some build fixes for OS X."

BUGS

diff --git a/BUGS b/BUGS
deleted file mode 100644
index dd92dfa..0000000
--- a/BUGS
+++ /dev/null
@@ -1 +0,0 @@
-On 32-bit, if the CPUID is clear, GCM is miscalculated.

crypto/modes/gcm.c

diff --git a/crypto/modes/gcm.c b/crypto/modes/gcm.c
index 116eab8..982f823 100644
--- a/crypto/modes/gcm.c
+++ b/crypto/modes/gcm.c
@@ -113,7 +113,7 @@
   Htable[14].hi = V.hi ^ Htable[6].hi, Htable[14].lo = V.lo ^ Htable[6].lo;
   Htable[15].hi = V.hi ^ Htable[7].hi, Htable[15].lo = V.lo ^ Htable[7].lo;
 
-#if defined(GHASH_ASM)
+#if defined(GHASH_ASM) && defined(OPENSSL_ARM)
   /* ARM assembler expects specific dword order in Htable. */
   {
     int j;