Update to NSS 3.12.7 and NSPR 4.8.6....

nss/mozilla/security/nss/lib/freebl/camellia.c

 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ skipping 18 matching lines @@
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 /*
- * $Id: camellia.c,v 1.2 2008/11/18 19:48:22 rrelyea%redhat.com Exp $
+ * $Id: camellia.c,v 1.3 2010/04/30 00:10:53 wtc%google.com Exp $
  */
 
 #ifdef FREEBL_NO_DEPEND
 #include "stubs.h"
 #endif
 
 #include "prinit.h"
 #include "prerr.h"
 #include "secerr.h"
 
@@ skipping 15 matching lines @@
 #define CAMELLIA_SIGMA5L (0x10E527FAL)
 #define CAMELLIA_SIGMA5R (0xDE682D1DL)
 #define CAMELLIA_SIGMA6L (0xB05688C2L)
 #define CAMELLIA_SIGMA6R (0xB3E6C1FDL)
 
 /*
  *  macros
  */
 
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && defined(NSS_X86_OR_X64)
+
+/* require a little-endian CPU that allows unaligned access */
 
 # define SWAP(x) (_lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00)
 # define GETU32(p) SWAP(*((PRUint32 *)(p)))
 # define PUTU32(ct, st) {*((PRUint32 *)(ct)) = SWAP((st));}
 
-#else /* not MS-VC */
+#else /* not MSVC or not x86/x64 */
 
 # define GETU32(pt)                                     \
     (((PRUint32)(pt)[0] << 24)                          \
      ^ ((PRUint32)(pt)[1] << 16)                        \
      ^ ((PRUint32)(pt)[2] <<  8)                        \
      ^ ((PRUint32)(pt)[3]))
 
 # define PUTU32(ct, st)  {                              \
         (ct)[0] = (PRUint8)((st) >> 24);                \
         (ct)[1] = (PRUint8)((st) >> 16);                \
@@ skipping 1694 matching lines @@
     }
     if (maxOutputLen < inputLen) {
         PORT_SetError(SEC_ERROR_OUTPUT_LEN);
         return SECFailure;
     }
     *outputLen = inputLen;
 
     return (*cx->worker)(cx, output, outputLen, maxOutputLen,   
                          input, inputLen);
 }