Update NSPR to 4.12 and NSS to 3.23 on iOS

nss/lib/dev/devt.h

Index: nss/lib/dev/devt.h
diff --git a/nss/lib/dev/devt.h b/nss/lib/dev/devt.h
index c678114189f7a8df0117de24397acd37d09502ef..db93deb1264edebeb4a0c4b2cad1a05b2cba7278 100644
--- a/nss/lib/dev/devt.h
+++ b/nss/lib/dev/devt.h
@@ -34,22 +34,20 @@ PR_BEGIN_EXTERN_C
 typedef struct nssSessionStr nssSession;
 
 /* XXX until NSSTokenStr is moved */
-struct nssDeviceBaseStr
-{
-  NSSArena *arena;
-  PZLock *lock;
-  PRInt32 refCount;
-  NSSUTF8 *name;
-  PRUint32 flags;
+struct nssDeviceBaseStr {
+    NSSArena *arena;
+    PZLock *lock;
+    PRInt32 refCount;
+    NSSUTF8 *name;
+    PRUint32 flags;
 };
 
 typedef struct nssTokenObjectCacheStr nssTokenObjectCache;
 
 /* XXX until devobject.c goes away */
-struct NSSTokenStr
-{
+struct NSSTokenStr {
     struct nssDeviceBaseStr base;
-    NSSSlot *slot;  /* Parent (or peer, if you will) */
+    NSSSlot *slot;    /* Parent (or peer, if you will) */
     CK_FLAGS ckFlags; /* from CK_TOKEN_INFO.flags */
     PRUint32 flags;
     void *epv;
@@ -61,40 +59,36 @@ struct NSSTokenStr
 };
 
 typedef enum {
-  nssSlotAskPasswordTimes_FirstTime = 0,
-  nssSlotAskPasswordTimes_EveryTime = 1,
-  nssSlotAskPasswordTimes_Timeout = 2
-} 
-nssSlotAskPasswordTimes;
-
-struct nssSlotAuthInfoStr
-{
-  PRTime lastLogin;
-  nssSlotAskPasswordTimes askTimes;
-  PRIntervalTime askPasswordTimeout;
+    nssSlotAskPasswordTimes_FirstTime = 0,
+    nssSlotAskPasswordTimes_EveryTime = 1,
+    nssSlotAskPasswordTimes_Timeout = 2
+} nssSlotAskPasswordTimes;
+
+struct nssSlotAuthInfoStr {
+    PRTime lastLogin;
+    nssSlotAskPasswordTimes askTimes;
+    PRIntervalTime askPasswordTimeout;
 };
 
-struct NSSSlotStr
-{
-  struct nssDeviceBaseStr base;
-  NSSModule *module; /* Parent */
-  NSSToken *token;  /* Peer */
-  CK_SLOT_ID slotID;
-  CK_FLAGS ckFlags; /* from CK_SLOT_INFO.flags */
-  struct nssSlotAuthInfoStr authInfo;
-  PRIntervalTime lastTokenPing;
-  PZLock *lock;
-  void *epv;
-  PK11SlotInfo *pk11slot;
+struct NSSSlotStr {
+    struct nssDeviceBaseStr base;
+    NSSModule *module; /* Parent */
+    NSSToken *token;   /* Peer */
+    CK_SLOT_ID slotID;
+    CK_FLAGS ckFlags; /* from CK_SLOT_INFO.flags */
+    struct nssSlotAuthInfoStr authInfo;
+    PRIntervalTime lastTokenPing;
+    PZLock *lock;
+    void *epv;
+    PK11SlotInfo *pk11slot;
 };
 
-struct nssSessionStr
-{
-  PZLock *lock;
-  CK_SESSION_HANDLE handle;
-  NSSSlot *slot;
-  PRBool isRW;
-  PRBool ownLock;
+struct nssSessionStr {
+    PZLock *lock;
+    CK_SESSION_HANDLE handle;
+    NSSSlot *slot;
+    PRBool isRW;
+    PRBool ownLock;
 };
 
 typedef enum {
@@ -113,8 +107,7 @@ typedef enum {
 
 typedef struct nssCryptokiInstanceStr nssCryptokiInstance;
 
-struct nssCryptokiInstanceStr
-{
+struct nssCryptokiInstanceStr {
     CK_OBJECT_HANDLE handle;
     NSSToken *token;
     PRBool isTokenObject;
@@ -132,22 +125,20 @@ typedef enum {
     nssTokenSearchType_TokenForced = 3
 } nssTokenSearchType;
 
-struct nssTokenCertSearchStr
-{
+struct nssTokenCertSearchStr {
     nssTokenSearchType searchType;
-    PRStatus (* callback)(NSSCertificate *c, void *arg);
+    PRStatus (*callback)(NSSCertificate *c, void *arg);
     void *cbarg;
     nssList *cached;
-    /* TODO: add a cache query callback if the list would be large 
-     *       (traversal) 
+    /* TODO: add a cache query callback if the list would be large
+     *       (traversal)
      */
 };
 
 struct nssSlotListStr;
 typedef struct nssSlotListStr nssSlotList;
 
-struct NSSAlgorithmAndParametersStr
-{
+struct NSSAlgorithmAndParametersStr {
     CK_MECHANISM mechanism;
 };