Update NSPR to 4.12 and NSS to 3.23 on iOS

nss/lib/ckfw/builtins/constants.c

Index: nss/lib/ckfw/builtins/constants.c
diff --git a/nss/lib/ckfw/builtins/constants.c b/nss/lib/ckfw/builtins/constants.c
index 71146e60d45dd501283c3a5bf9ec44764471e4fd..f5d267b3d0d792dcad12112c6e1a77e0a67b9bc5 100644
--- a/nss/lib/ckfw/builtins/constants.c
+++ b/nss/lib/ckfw/builtins/constants.c
@@ -21,41 +21,44 @@
 #endif /* NSSCKBI_H */
 
 const CK_VERSION
-nss_builtins_CryptokiVersion =  {
-		NSS_BUILTINS_CRYPTOKI_VERSION_MAJOR,
-		NSS_BUILTINS_CRYPTOKI_VERSION_MINOR };
+    nss_builtins_CryptokiVersion = {
+        NSS_BUILTINS_CRYPTOKI_VERSION_MAJOR,
+        NSS_BUILTINS_CRYPTOKI_VERSION_MINOR
+    };
 
 const CK_VERSION
-nss_builtins_LibraryVersion = {
-	NSS_BUILTINS_LIBRARY_VERSION_MAJOR,
-	NSS_BUILTINS_LIBRARY_VERSION_MINOR};
+    nss_builtins_LibraryVersion = {
+        NSS_BUILTINS_LIBRARY_VERSION_MAJOR,
+        NSS_BUILTINS_LIBRARY_VERSION_MINOR
+    };
 
 const CK_VERSION
-nss_builtins_HardwareVersion = { 
-	NSS_BUILTINS_HARDWARE_VERSION_MAJOR,
-	NSS_BUILTINS_HARDWARE_VERSION_MINOR };
+    nss_builtins_HardwareVersion = {
+        NSS_BUILTINS_HARDWARE_VERSION_MAJOR,
+        NSS_BUILTINS_HARDWARE_VERSION_MINOR
+    };
 
 const CK_VERSION
-nss_builtins_FirmwareVersion = { 
-	NSS_BUILTINS_FIRMWARE_VERSION_MAJOR,
-	NSS_BUILTINS_FIRMWARE_VERSION_MINOR };
+    nss_builtins_FirmwareVersion = {
+        NSS_BUILTINS_FIRMWARE_VERSION_MAJOR,
+        NSS_BUILTINS_FIRMWARE_VERSION_MINOR
+    };
 
-const NSSUTF8 
-nss_builtins_ManufacturerID[] = { "Mozilla Foundation" };
+const NSSUTF8
+    nss_builtins_ManufacturerID[] = { "Mozilla Foundation" };
 
-const NSSUTF8 
-nss_builtins_LibraryDescription[] = { "NSS Builtin Object Cryptoki Module" };
+const NSSUTF8
+    nss_builtins_LibraryDescription[] = { "NSS Builtin Object Cryptoki Module" };
 
-const NSSUTF8 
-nss_builtins_SlotDescription[] = { "NSS Builtin Objects" };
+const NSSUTF8
+    nss_builtins_SlotDescription[] = { "NSS Builtin Objects" };
 
-const NSSUTF8 
-nss_builtins_TokenLabel[] = { "Builtin Object Token" };
+const NSSUTF8
+    nss_builtins_TokenLabel[] = { "Builtin Object Token" };
 
-const NSSUTF8 
-nss_builtins_TokenModel[] = { "1" };
+const NSSUTF8
+    nss_builtins_TokenModel[] = { "1" };
 
 /* should this be e.g. the certdata.txt RCS revision number? */
-const NSSUTF8 
-nss_builtins_TokenSerialNumber[] = { "1" };
-
+const NSSUTF8
+    nss_builtins_TokenSerialNumber[] = { "1" };