Update NSS to 3.21 RTM and NSPR to 4.11 RTM

nss/lib/freebl/des.c

 /*
  *  des.c
  *
  *  core source file for DES-150 library
  *  Make key schedule from DES key.
  *  Encrypt/Decrypt one 8-byte block.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "des.h"
 #include <stddef.h>     /* for ptrdiff_t */
 /* #define USE_INDEXING 1 */
 
+/* Some processors automatically fix up unaligned memory access, so they can
+ * read or write a HALF (4 bytes) at a time whether the address is 4-byte
+ * aligned or not. */
+#if defined(NSS_X86_OR_X64)
+#define HAVE_UNALIGNED_ACCESS 1
+#endif
+
 /*
  * The tables below are the 8 sbox functions, with the 6-bit input permutation 
  * and the 32-bit output permutation pre-computed.
  * They are shifted circularly to the left 3 bits, which removes 2 shifts
  * and an or from each round by reducing the number of sboxes whose
  * indices cross word broundaries from 2 to 1.  
  */
 
 static const HALF SP[8][64] = {
 /* Box S1 */ { 
@@ skipping 388 matching lines @@
 
 void 
 DES_MakeSchedule( HALF * ks, const BYTE * key,   DESDirection direction)
 {
     register HALF left, right;
     register HALF c0, d0;
     register HALF temp;
     int           delta;
     unsigned int  ls;
 
-#if defined(NSS_X86_OR_X64)
+#if defined(HAVE_UNALIGNED_ACCESS)
     left  = HALFPTR(key)[0]; 
     right = HALFPTR(key)[1]; 
+#if defined(IS_LITTLE_ENDIAN)
     BYTESWAP(left, temp);
     BYTESWAP(right, temp);
+#endif
 #else
     if (((ptrdiff_t)key & 0x03) == 0) {
         left  = HALFPTR(key)[0]; 
         right = HALFPTR(key)[1]; 
 #if defined(IS_LITTLE_ENDIAN)
         BYTESWAP(left, temp);
         BYTESWAP(right, temp);
 #endif
     } else {
         left    = ((HALF)key[0] << 24) | ((HALF)key[1] << 16) | 
@@ skipping 126 matching lines @@
     left  ^= temp << 16; \
     right ^= temp = ((left >> 4) ^  right) & 0x0f0f0f0f; \
     left  ^= temp << 4; 
 
 void 
 DES_Do1Block(HALF * ks, const BYTE * inbuf, BYTE * outbuf)
 {
     register HALF left, right;
     register HALF temp;
 
-#if defined(NSS_X86_OR_X64)
+#if defined(HAVE_UNALIGNED_ACCESS)
     left  = HALFPTR(inbuf)[0]; 
     right = HALFPTR(inbuf)[1]; 
+#if defined(IS_LITTLE_ENDIAN)
     BYTESWAP(left, temp);
     BYTESWAP(right, temp);
+#endif
 #else
     if (((ptrdiff_t)inbuf & 0x03) == 0) {
         left  = HALFPTR(inbuf)[0]; 
         right = HALFPTR(inbuf)[1]; 
 #if defined(IS_LITTLE_ENDIAN)
         BYTESWAP(left, temp);
         BYTESWAP(right, temp);
 #endif
     } else {
         left    = ((HALF)inbuf[0] << 24) | ((HALF)inbuf[1] << 16) | 
@@ skipping 46 matching lines @@
 
     /* now shift circularly right 3 bits to undo the shifting done 
     ** above.  switch left and right here. 
     */
     temp  = (left >> 3) | (left << 29); 
     left  = (right >> 3) | (right << 29); 
     right = temp;
 
     FP(left, right, temp);
 
-#if defined(NSS_X86_OR_X64)
+#if defined(HAVE_UNALIGNED_ACCESS)
+#if defined(IS_LITTLE_ENDIAN)
     BYTESWAP(left, temp);
     BYTESWAP(right, temp);
+#endif
     HALFPTR(outbuf)[0]  = left; 
     HALFPTR(outbuf)[1]  = right; 
 #else
     if (((ptrdiff_t)outbuf & 0x03) == 0) {
 #if defined(IS_LITTLE_ENDIAN)
         BYTESWAP(left, temp);
         BYTESWAP(right, temp);
 #endif
         HALFPTR(outbuf)[0]  = left; 
         HALFPTR(outbuf)[1]  = right; 
@@ skipping 12 matching lines @@
 
 }
 
 /* Ackowledgements:
 ** Two ideas used in this implementation were shown to me by Dennis Ferguson 
 ** in 1990.  He credits them to Richard Outerbridge and Dan Hoey.  They were:
 ** 1. The method of computing the Initial and Final permutations.
 ** 2. Circularly rotating the SP tables and the initial values of left and 
 **      right to reduce the number of shifts required during the 16 rounds.
 */