nss: go back to 3.43 release

security/nss/lib/freebl/blinit.c

@@ -92,32 +92,23 @@ CheckX86CPUSupport()
 #endif /* NSS_X86_OR_X64 */
 
 /* clang-format off */
-#if defined(__aarch64__) || defined(__arm__)
+#if (defined(__aarch64__) || defined(__arm__)) && !defined(__ANDROID__)
 #ifndef __has_include
 #define __has_include(x) 0
 #endif
 #if (__has_include(<sys/auxv.h>) || defined(__linux__)) && \
     defined(__GNUC__) && __GNUC__ >= 2 && defined(__ELF__)
-/* This might be conflict with host compiler */
-#if !defined(__ANDROID__)
 #include <sys/auxv.h>
-#endif
 extern unsigned long getauxval(unsigned long type) __attribute__((weak));
 #else
 static unsigned long (*getauxval)(unsigned long) = NULL;
+#define AT_HWCAP2 0
+#define AT_HWCAP 0
 #endif /* defined(__GNUC__) && __GNUC__ >= 2 && defined(__ELF__)*/
-
-#ifndef AT_HWCAP2
-#define AT_HWCAP2 26
-#endif
-#ifndef AT_HWCAP
-#define AT_HWCAP 16
-#endif
-
-#endif /* defined(__aarch64__) || defined(__arm__) */
+#endif /* (defined(__aarch64__) || defined(__arm__)) && !defined(__ANDROID__) */
 /* clang-format on */
 
-#if defined(__aarch64__)
+#if defined(__aarch64__) && !defined(__ANDROID__)
 // Defines from hwcap.h in Linux kernel - ARM64
 #ifndef HWCAP_AES
 #define HWCAP_AES (1 << 3)
@@ -147,9 +138,9 @@ CheckARMSupport()
     /* aarch64 must support NEON. */
     arm_neon_support_ = disable_arm_neon == NULL;
 }
-#endif /* defined(__aarch64__) */
+#endif /* defined(__aarch64__) && !defined(__ANDROID__) */
 
-#if defined(__arm__)
+#if defined(__arm__) && !defined(__ANDROID__)
 // Defines from hwcap.h in Linux kernel - ARM
 /*
  * HWCAP flags - for elf_hwcap (in kernel) and AT_HWCAP
@@ -174,58 +165,23 @@ CheckARMSupport()
 #define HWCAP2_SHA2 (1 << 3)
 #endif
 
-PRBool
-GetNeonSupport()
-{
-    char *disable_arm_neon = PR_GetEnvSecure("NSS_DISABLE_ARM_NEON");
-    if (disable_arm_neon) {
-        return PR_FALSE;
-    }
-#if defined(__ARM_NEON) || defined(__ARM_NEON__)
-    // Compiler generates NEON instruction as default option.
-    // If no getauxval, compiler generate NEON instruction by default,
-    // we should allow NOEN support.
-    return PR_TRUE;
-#elif !defined(__ANDROID__)
-    // Android's cpu-features.c detects features by the following logic
-    //
-    // - Call getauxval(AT_HWCAP)
-    // - Parse /proc/self/auxv if getauxval is nothing or returns 0
-    // - Parse /proc/cpuinfo if both cannot detect features
-    //
-    // But we don't use it for Android since Android document
-    // (https://developer.android.com/ndk/guides/cpu-features) says
-    // one problem with AT_HWCAP sometimes devices (Nexus 4 and emulator)
-    // are mistaken for IDIV.
-    if (getauxval) {
-        return (getauxval(AT_HWCAP) & HWCAP_NEON);
-    }
-#endif /* defined(__ARM_NEON) || defined(__ARM_NEON__) */
-    return PR_FALSE;
-}
-
 void
 CheckARMSupport()
 {
+    char *disable_arm_neon = PR_GetEnvSecure("NSS_DISABLE_ARM_NEON");
     char *disable_hw_aes = PR_GetEnvSecure("NSS_DISABLE_HW_AES");
     if (getauxval) {
-        // Android's cpu-features.c uses AT_HWCAP2 for newer features.
-        // AT_HWCAP2 is implemented on newer devices / kernel, so we can trust
-        // it since cpu-features.c doesn't have workaround / fallback.
-        // Also, AT_HWCAP2 is supported by glibc 2.18+ on Linux/arm, If
-        // AT_HWCAP2 isn't supported by glibc or Linux kernel, getauxval will
-        // returns 0.
         long hwcaps = getauxval(AT_HWCAP2);
         arm_aes_support_ = hwcaps & HWCAP2_AES && disable_hw_aes == NULL;
         arm_pmull_support_ = hwcaps & HWCAP2_PMULL;
         arm_sha1_support_ = hwcaps & HWCAP2_SHA1;
         arm_sha2_support_ = hwcaps & HWCAP2_SHA2;
+        arm_neon_support_ = hwcaps & HWCAP_NEON && disable_arm_neon == NULL;
     }
-    arm_neon_support_ = GetNeonSupport();
 }
-#endif /* defined(__arm__) */
+#endif /* defined(__arm__) && !defined(__ANDROID__) */
 
-// Enable when Firefox can use it for Android API 16 and 17.
+// Enable when Firefox can use it.
 // #if defined(__ANDROID__) && (defined(__arm__) || defined(__aarch64__))
 // #include <cpu-features.h>
 // void
@@ -306,7 +262,7 @@ FreeblInit(void)
 {
 #ifdef NSS_X86_OR_X64
     CheckX86CPUSupport();
-#elif (defined(__aarch64__) || defined(__arm__))
+#elif (defined(__aarch64__) || defined(__arm__)) && !defined(__ANDROID__)
     CheckARMSupport();
 #endif
     return PR_SUCCESS;

security/nss/lib/freebl/chacha20poly1305.c

@@ -157,7 +157,6 @@ ChaCha20Poly1305_DestroyContext(ChaCha20Poly1305Context *ctx, PRBool freeit)
 #endif
 }
 
-#ifndef NSS_DISABLE_CHACHAPOLY
 void
 ChaCha20Xor(uint8_t *output, uint8_t *block, uint32_t len, uint8_t *k,
             uint8_t *nonce, uint32_t ctr)
@@ -168,7 +167,6 @@ ChaCha20Xor(uint8_t *output, uint8_t *block, uint32_t len, uint8_t *k,
         Hacl_Chacha20_chacha20(output, block, len, k, nonce, ctr);
     }
 }
-#endif /* NSS_DISABLE_CHACHAPOLY */
 
 SECStatus
 ChaCha20Poly1305_Seal(const ChaCha20Poly1305Context *ctx, unsigned char *output,

security/nss/lib/freebl/crypto_primitives.c

@@ -22,7 +22,7 @@ swap8b(PRUint64 value)
     return (value);
 }
 
-#elif !defined(_MSC_VER) && !__has_builtin(__builtin_bswap64)
+#elif !defined(_MSC_VER)
 
 PRUint64
 swap8b(PRUint64 x)

security/nss/lib/freebl/crypto_primitives.h

@@ -11,11 +11,6 @@
 #include <stdlib.h>
 #include "prtypes.h"
 
-/* For non-clang platform */
-#ifndef __has_builtin
-#define __has_builtin(x) 0
-#endif
-
 /* Unfortunately this isn't always set when it should be. */
 #if defined(HAVE_LONG_LONG)
 
@@ -34,16 +29,11 @@
 /*
  * FREEBL_HTONLL(x): swap bytes in a 64-bit integer.
  */
-#if defined(IS_LITTLE_ENDIAN)
 #if defined(_MSC_VER)
 
 #pragma intrinsic(_byteswap_uint64)
 #define FREEBL_HTONLL(x) _byteswap_uint64(x)
 
-#elif __has_builtin(__builtin_bswap64)
-
-#define FREEBL_HTONLL(x) __builtin_bswap64(x)
-
 #elif defined(__GNUC__) && (defined(__x86_64__) || defined(__x86_64))
 
 PRUint64 swap8b(PRUint64 value);
@@ -58,8 +48,4 @@ PRUint64 swap8b(PRUint64 x);
 
 #endif /* _MSC_VER */
 
-#else /* IS_LITTLE_ENDIAN */
-#define FREEBL_HTONLL(x) (x)
-#endif
-
-#endif /* HAVE_LONG_LONG */
+#endif /* HAVE_LONG_LONG */

security/nss/lib/freebl/freebl.gyp

@@ -76,11 +76,11 @@
             '__SSSE3__',
           ],
         }],
-        [ 'target_arch=="arm"', {
-          # Gecko doesn't support non-NEON platform on Android, but tier-3
-          # platform such as Linux/arm will need it
-          'cflags_mozilla': [
-            '-mfpu=neon'
+        [ 'OS=="android"', {
+          # On Android we can't use any of the hardware acceleration :(
+          'defines!': [
+            '__ARM_NEON__',
+            '__ARM_NEON',
           ],
         }],
       ],