Update NSPR to 4.12 and NSS to 3.23 on iOS

nss/lib/ckfw/nssckfw.h

Index: nss/lib/ckfw/nssckfw.h
diff --git a/nss/lib/ckfw/nssckfw.h b/nss/lib/ckfw/nssckfw.h
index 4343eab6ae0eb73d78ec7da6bafb1006a32f7f41..8807ac85d73a58740cb62ec97424ed086e19e6df 100644
--- a/nss/lib/ckfw/nssckfw.h
+++ b/nss/lib/ckfw/nssckfw.h
@@ -8,7 +8,7 @@
 /*
  * nssckfw.h
  *
- * This file prototypes the publicly available calls of the 
+ * This file prototypes the publicly available calls of the
  * NSS Cryptoki Framework.
  */
 
@@ -40,10 +40,8 @@
  */
 
 NSS_EXTERN NSSCKMDInstance *
-NSSCKFWInstance_GetMDInstance
-(
-  NSSCKFWInstance *fwInstance
-);
+NSSCKFWInstance_GetMDInstance(
+    NSSCKFWInstance *fwInstance);
 
 /*
  * NSSCKFWInstance_GetArena
@@ -51,11 +49,9 @@ NSSCKFWInstance_GetMDInstance
  */
 
 NSS_EXTERN NSSArena *
-NSSCKFWInstance_GetArena
-(
-  NSSCKFWInstance *fwInstance,
-  CK_RV *pError
-);
+NSSCKFWInstance_GetArena(
+    NSSCKFWInstance *fwInstance,
+    CK_RV *pError);
 
 /*
  * NSSCKFWInstance_MayCreatePthreads
@@ -63,10 +59,8 @@ NSSCKFWInstance_GetArena
  */
 
 NSS_EXTERN CK_BBOOL
-NSSCKFWInstance_MayCreatePthreads
-(
-  NSSCKFWInstance *fwInstance
-);
+NSSCKFWInstance_MayCreatePthreads(
+    NSSCKFWInstance *fwInstance);
 
 /*
  * NSSCKFWInstance_CreateMutex
@@ -74,12 +68,10 @@ NSSCKFWInstance_MayCreatePthreads
  */
 
 NSS_EXTERN NSSCKFWMutex *
-NSSCKFWInstance_CreateMutex
-(
-  NSSCKFWInstance *fwInstance,
-  NSSArena *arena,
-  CK_RV *pError
-);
+NSSCKFWInstance_CreateMutex(
+    NSSCKFWInstance *fwInstance,
+    NSSArena *arena,
+    CK_RV *pError);
 
 /*
  * NSSCKFWInstance_GetConfigurationData
@@ -87,10 +79,8 @@ NSSCKFWInstance_CreateMutex
  */
 
 NSS_EXTERN NSSUTF8 *
-NSSCKFWInstance_GetConfigurationData
-(
-  NSSCKFWInstance *fwInstance
-);
+NSSCKFWInstance_GetConfigurationData(
+    NSSCKFWInstance *fwInstance);
 
 /*
  * NSSCKFWInstance_GetInitArgs
@@ -98,10 +88,8 @@ NSSCKFWInstance_GetConfigurationData
  */
 
 NSS_EXTERN CK_C_INITIALIZE_ARGS_PTR
-NSSCKFWInstance_GetInitArgs
-(
-  NSSCKFWInstance *fwInstance
-);
+NSSCKFWInstance_GetInitArgs(
+    NSSCKFWInstance *fwInstance);
 
 /*
  * NSSCKFWSlot
@@ -118,10 +106,8 @@ NSSCKFWInstance_GetInitArgs
  */
 
 NSS_EXTERN NSSCKMDSlot *
-NSSCKFWSlot_GetMDSlot
-(
-  NSSCKFWSlot *fwSlot
-);
+NSSCKFWSlot_GetMDSlot(
+    NSSCKFWSlot *fwSlot);
 
 /*
  * NSSCKFWSlot_GetFWInstance
@@ -129,10 +115,8 @@ NSSCKFWSlot_GetMDSlot
  */
 
 NSS_EXTERN NSSCKFWInstance *
-NSSCKFWSlot_GetFWInstance
-(
-  NSSCKFWSlot *fwSlot
-);
+NSSCKFWSlot_GetFWInstance(
+    NSSCKFWSlot *fwSlot);
 
 /*
  * NSSCKFWSlot_GetMDInstance
@@ -140,10 +124,8 @@ NSSCKFWSlot_GetFWInstance
  */
 
 NSS_EXTERN NSSCKMDInstance *
-NSSCKFWSlot_GetMDInstance
-(
-  NSSCKFWSlot *fwSlot
-);
+NSSCKFWSlot_GetMDInstance(
+    NSSCKFWSlot *fwSlot);
 
 /*
  * NSSCKFWToken
@@ -161,10 +143,8 @@ NSSCKFWSlot_GetMDInstance
  */
 
 NSS_EXTERN NSSCKMDToken *
-NSSCKFWToken_GetMDToken
-(
-  NSSCKFWToken *fwToken
-);
+NSSCKFWToken_GetMDToken(
+    NSSCKFWToken *fwToken);
 
 /*
  * NSSCKFWToken_GetArena
@@ -172,11 +152,9 @@ NSSCKFWToken_GetMDToken
  */
 
 NSS_EXTERN NSSArena *
-NSSCKFWToken_GetArena
-(
-  NSSCKFWToken *fwToken,
-  CK_RV *pError
-);
+NSSCKFWToken_GetArena(
+    NSSCKFWToken *fwToken,
+    CK_RV *pError);
 
 /*
  * NSSCKFWToken_GetFWSlot
@@ -184,10 +162,8 @@ NSSCKFWToken_GetArena
  */
 
 NSS_EXTERN NSSCKFWSlot *
-NSSCKFWToken_GetFWSlot
-(
-  NSSCKFWToken *fwToken
-);
+NSSCKFWToken_GetFWSlot(
+    NSSCKFWToken *fwToken);
 
 /*
  * NSSCKFWToken_GetMDSlot
@@ -195,10 +171,8 @@ NSSCKFWToken_GetFWSlot
  */
 
 NSS_EXTERN NSSCKMDSlot *
-NSSCKFWToken_GetMDSlot
-(
-  NSSCKFWToken *fwToken
-);
+NSSCKFWToken_GetMDSlot(
+    NSSCKFWToken *fwToken);
 
 /*
  * NSSCKFWToken_GetSessionState
@@ -206,10 +180,8 @@ NSSCKFWToken_GetMDSlot
  */
 
 NSS_EXTERN CK_STATE
-NSSCKFWToken_GetSessionState
-(
-  NSSCKFWToken *fwToken
-);
+NSSCKFWToken_GetSessionState(
+    NSSCKFWToken *fwToken);
 
 /*
  * NSSCKFWMechanism
@@ -225,10 +197,8 @@ NSSCKFWToken_GetSessionState
  */
 
 NSS_EXTERN NSSCKMDMechanism *
-NSSCKFWMechanism_GetMDMechanism
-(
-  NSSCKFWMechanism *fwMechanism
-);
+NSSCKFWMechanism_GetMDMechanism(
+    NSSCKFWMechanism *fwMechanism);
 
 /*
  * NSSCKFWMechanism_GetParameter
@@ -236,10 +206,8 @@ NSSCKFWMechanism_GetMDMechanism
  */
 
 NSS_EXTERN NSSItem *
-NSSCKFWMechanism_GetParameter
-(
-  NSSCKFWMechanism *fwMechanism
-);
+NSSCKFWMechanism_GetParameter(
+    NSSCKFWMechanism *fwMechanism);
 
 /*
  * NSSCKFWSession
@@ -259,10 +227,8 @@ NSSCKFWMechanism_GetParameter
  */
 
 NSS_EXTERN NSSCKMDSession *
-NSSCKFWSession_GetMDSession
-(
-  NSSCKFWSession *fwSession
-);
+NSSCKFWSession_GetMDSession(
+    NSSCKFWSession *fwSession);
 
 /*
  * NSSCKFWSession_GetArena
@@ -270,11 +236,9 @@ NSSCKFWSession_GetMDSession
  */
 
 NSS_EXTERN NSSArena *
-NSSCKFWSession_GetArena
-(
-  NSSCKFWSession *fwSession,
-  CK_RV *pError
-);
+NSSCKFWSession_GetArena(
+    NSSCKFWSession *fwSession,
+    CK_RV *pError);
 
 /*
  * NSSCKFWSession_CallNotification
@@ -282,11 +246,9 @@ NSSCKFWSession_GetArena
  */
 
 NSS_EXTERN CK_RV
-NSSCKFWSession_CallNotification
-(
-  NSSCKFWSession *fwSession,
-  CK_NOTIFICATION event
-);
+NSSCKFWSession_CallNotification(
+    NSSCKFWSession *fwSession,
+    CK_NOTIFICATION event);
 
 /*
  * NSSCKFWSession_IsRWSession
@@ -294,10 +256,8 @@ NSSCKFWSession_CallNotification
  */
 
 NSS_EXTERN CK_BBOOL
-NSSCKFWSession_IsRWSession
-(
-  NSSCKFWSession *fwSession
-);
+NSSCKFWSession_IsRWSession(
+    NSSCKFWSession *fwSession);
 
 /*
  * NSSCKFWSession_IsSO
@@ -305,10 +265,8 @@ NSSCKFWSession_IsRWSession
  */
 
 NSS_EXTERN CK_BBOOL
-NSSCKFWSession_IsSO
-(
-  NSSCKFWSession *fwSession
-);
+NSSCKFWSession_IsSO(
+    NSSCKFWSession *fwSession);
 
 /*
  * NSSCKFWSession_GetCurrentCryptoOperation
@@ -316,11 +274,9 @@ NSSCKFWSession_IsSO
  */
 
 NSS_EXTERN NSSCKFWCryptoOperation *
-NSSCKFWSession_GetCurrentCryptoOperation
-(
-  NSSCKFWSession *fwSession,
-  NSSCKFWCryptoOperationState state
-);
+NSSCKFWSession_GetCurrentCryptoOperation(
+    NSSCKFWSession *fwSession,
+    NSSCKFWCryptoOperationState state);
 
 /*
  * NSSCKFWObject
@@ -340,91 +296,75 @@ NSSCKFWSession_GetCurrentCryptoOperation
  *
  */
 NSS_EXTERN NSSCKMDObject *
-NSSCKFWObject_GetMDObject
-(
-  NSSCKFWObject *fwObject
-);
+NSSCKFWObject_GetMDObject(
+    NSSCKFWObject *fwObject);
 
 /*
  * NSSCKFWObject_GetArena
  *
  */
 NSS_EXTERN NSSArena *
-NSSCKFWObject_GetArena
-(
-  NSSCKFWObject *fwObject,
-  CK_RV *pError
-);
+NSSCKFWObject_GetArena(
+    NSSCKFWObject *fwObject,
+    CK_RV *pError);
 
 /*
  * NSSCKFWObject_IsTokenObject
  *
  */
 NSS_EXTERN CK_BBOOL
-NSSCKFWObject_IsTokenObject
-(
-  NSSCKFWObject *fwObject
-);
+NSSCKFWObject_IsTokenObject(
+    NSSCKFWObject *fwObject);
 
 /*
  * NSSCKFWObject_GetAttributeCount
  *
  */
 NSS_EXTERN CK_ULONG
-NSSCKFWObject_GetAttributeCount
-(
-  NSSCKFWObject *fwObject,
-  CK_RV *pError
-);
+NSSCKFWObject_GetAttributeCount(
+    NSSCKFWObject *fwObject,
+    CK_RV *pError);
 
 /*
  * NSSCKFWObject_GetAttributeTypes
  *
  */
 NSS_EXTERN CK_RV
-NSSCKFWObject_GetAttributeTypes
-(
-  NSSCKFWObject *fwObject,
-  CK_ATTRIBUTE_TYPE_PTR typeArray,
-  CK_ULONG ulCount
-);
+NSSCKFWObject_GetAttributeTypes(
+    NSSCKFWObject *fwObject,
+    CK_ATTRIBUTE_TYPE_PTR typeArray,
+    CK_ULONG ulCount);
 
 /*
  * NSSCKFWObject_GetAttributeSize
  *
  */
 NSS_EXTERN CK_ULONG
-NSSCKFWObject_GetAttributeSize
-(
-  NSSCKFWObject *fwObject,
-  CK_ATTRIBUTE_TYPE attribute,
-  CK_RV *pError
-);
+NSSCKFWObject_GetAttributeSize(
+    NSSCKFWObject *fwObject,
+    CK_ATTRIBUTE_TYPE attribute,
+    CK_RV *pError);
 
 /*
  * NSSCKFWObject_GetAttribute
  *
  */
 NSS_EXTERN NSSItem *
-NSSCKFWObject_GetAttribute
-(
-  NSSCKFWObject *fwObject,
-  CK_ATTRIBUTE_TYPE attribute,
-  NSSItem *itemOpt,
-  NSSArena *arenaOpt,
-  CK_RV *pError
-);
+NSSCKFWObject_GetAttribute(
+    NSSCKFWObject *fwObject,
+    CK_ATTRIBUTE_TYPE attribute,
+    NSSItem *itemOpt,
+    NSSArena *arenaOpt,
+    CK_RV *pError);
 
 /*
  * NSSCKFWObject_GetObjectSize
  *
  */
 NSS_EXTERN CK_ULONG
-NSSCKFWObject_GetObjectSize
-(
-  NSSCKFWObject *fwObject,
-  CK_RV *pError
-);
+NSSCKFWObject_GetObjectSize(
+    NSSCKFWObject *fwObject,
+    CK_RV *pError);
 
 /*
  * NSSCKFWFindObjects
@@ -439,10 +379,8 @@ NSSCKFWObject_GetObjectSize
  */
 
 NSS_EXTERN NSSCKMDFindObjects *
-NSSCKFWFindObjects_GetMDFindObjects
-(
-  NSSCKFWFindObjects *
-);
+NSSCKFWFindObjects_GetMDFindObjects(
+    NSSCKFWFindObjects *);
 
 /*
  * NSSCKFWMutex
@@ -459,10 +397,8 @@ NSSCKFWFindObjects_GetMDFindObjects
  */
 
 NSS_EXTERN CK_RV
-NSSCKFWMutex_Destroy
-(
-  NSSCKFWMutex *mutex
-);
+NSSCKFWMutex_Destroy(
+    NSSCKFWMutex *mutex);
 
 /*
  * NSSCKFWMutex_Lock
@@ -470,10 +406,8 @@ NSSCKFWMutex_Destroy
  */
 
 NSS_EXTERN CK_RV
-NSSCKFWMutex_Lock
-(
-  NSSCKFWMutex *mutex
-);
+NSSCKFWMutex_Lock(
+    NSSCKFWMutex *mutex);
 
 /*
  * NSSCKFWMutex_Unlock
@@ -481,10 +415,7 @@ NSSCKFWMutex_Lock
  */
 
 NSS_EXTERN CK_RV
-NSSCKFWMutex_Unlock
-(
-  NSSCKFWMutex *mutex
-);
+NSSCKFWMutex_Unlock(
+    NSSCKFWMutex *mutex);
 
 #endif /* NSSCKFW_H */
-