Update NSPR to 4.12 and NSS to 3.23 on iOS

nss/lib/certdb/certdb.h

Index: nss/lib/certdb/certdb.h
diff --git a/nss/lib/certdb/certdb.h b/nss/lib/certdb/certdb.h
index d358dfd822fe3cfc49a6539548f9f345a6c867e3..cb39b9800f1bf0103dd240599f73026deba54cf9 100644
--- a/nss/lib/certdb/certdb.h
+++ b/nss/lib/certdb/certdb.h
@@ -5,18 +5,17 @@
 #ifndef _CERTDB_H_
 #define _CERTDB_H_
 
-
 /* common flags for all types of certificates */
-#define CERTDB_TERMINAL_RECORD	(1u<<0)
-#define CERTDB_TRUSTED		(1u<<1)
-#define CERTDB_SEND_WARN	(1u<<2)
-#define CERTDB_VALID_CA		(1u<<3)
-#define CERTDB_TRUSTED_CA	(1u<<4) /* trusted for issuing server certs */
-#define CERTDB_NS_TRUSTED_CA	(1u<<5)
-#define CERTDB_USER		(1u<<6)
-#define CERTDB_TRUSTED_CLIENT_CA (1u<<7) /* trusted for issuing client certs */
-#define CERTDB_INVISIBLE_CA	(1u<<8) /* don't show in UI */
-#define CERTDB_GOVT_APPROVED_CA	(1u<<9) /* can do strong crypto in export ver */
+#define CERTDB_TERMINAL_RECORD (1u << 0)
+#define CERTDB_TRUSTED (1u << 1)
+#define CERTDB_SEND_WARN (1u << 2)
+#define CERTDB_VALID_CA (1u << 3)
+#define CERTDB_TRUSTED_CA (1u << 4) /* trusted for issuing server certs */
+#define CERTDB_NS_TRUSTED_CA (1u << 5)
+#define CERTDB_USER (1u << 6)
+#define CERTDB_TRUSTED_CLIENT_CA (1u << 7) /* trusted for issuing client certs */
+#define CERTDB_INVISIBLE_CA (1u << 8) /* don't show in UI */
+#define CERTDB_GOVT_APPROVED_CA (1u << 9) /* can do strong crypto in export ver */
 
 /* old usage, to keep old programs compiling */
 /* On Windows, Mac, and Linux (and other gcc platforms), we can give compile
@@ -26,54 +25,48 @@
 #if (__GNUC__ == 4) && (__GNUC_MINOR__ < 5)
 typedef unsigned int __CERTDB_VALID_PEER __attribute__((deprecated));
 #else
-typedef unsigned int __CERTDB_VALID_PEER __attribute__((deprecated
-    ("CERTDB_VALID_PEER is now CERTDB_TERMINAL_RECORD")));
+typedef unsigned int __CERTDB_VALID_PEER __attribute__((
+    deprecated("CERTDB_VALID_PEER is now CERTDB_TERMINAL_RECORD")));
 #endif
-#define CERTDB_VALID_PEER  ((__CERTDB_VALID_PEER) CERTDB_TERMINAL_RECORD)
+#define CERTDB_VALID_PEER ((__CERTDB_VALID_PEER)CERTDB_TERMINAL_RECORD)
 #else
 #ifdef _WIN32
 #pragma deprecated(CERTDB_VALID_PEER)
 #endif
-#define CERTDB_VALID_PEER  CERTDB_TERMINAL_RECORD 
+#define CERTDB_VALID_PEER CERTDB_TERMINAL_RECORD
 #endif
 
 SEC_BEGIN_PROTOS
 
-CERTSignedCrl *
-SEC_FindCrlByKey(CERTCertDBHandle *handle, SECItem *crlKey, int type);
-
-CERTSignedCrl *
-SEC_FindCrlByName(CERTCertDBHandle *handle, SECItem *crlKey, int type);
+CERTSignedCrl *SEC_FindCrlByKey(CERTCertDBHandle *handle, SECItem *crlKey,
+                                int type);
 
-CERTSignedCrl *
-SEC_FindCrlByDERCert(CERTCertDBHandle *handle, SECItem *derCrl, int type);
+CERTSignedCrl *SEC_FindCrlByName(CERTCertDBHandle *handle, SECItem *crlKey,
+                                 int type);
 
-PRBool
-SEC_CertNicknameConflict(const char *nickname, const SECItem *derSubject,
-			 CERTCertDBHandle *handle);
-CERTSignedCrl *
-SEC_NewCrl(CERTCertDBHandle *handle, char *url, SECItem *derCrl, int type);
+CERTSignedCrl *SEC_FindCrlByDERCert(CERTCertDBHandle *handle, SECItem *derCrl,
+                                    int type);
 
-SECStatus
-SEC_DeletePermCRL(CERTSignedCrl *crl);
+PRBool SEC_CertNicknameConflict(const char *nickname, const SECItem *derSubject,
+                                CERTCertDBHandle *handle);
+CERTSignedCrl *SEC_NewCrl(CERTCertDBHandle *handle, char *url, SECItem *derCrl,
+                          int type);
 
+SECStatus SEC_DeletePermCRL(CERTSignedCrl *crl);
 
-SECStatus
-SEC_LookupCrls(CERTCertDBHandle *handle, CERTCrlHeadNode **nodes, int type);
+SECStatus SEC_LookupCrls(CERTCertDBHandle *handle, CERTCrlHeadNode **nodes,
+                         int type);
 
-SECStatus 
-SEC_DestroyCrl(CERTSignedCrl *crl);
+SECStatus SEC_DestroyCrl(CERTSignedCrl *crl);
 
-CERTSignedCrl* SEC_DupCrl(CERTSignedCrl* acrl);
+CERTSignedCrl *SEC_DupCrl(CERTSignedCrl *acrl);
 
-SECStatus
-CERT_AddTempCertToPerm(CERTCertificate *cert, char *nickname,
-		       CERTCertTrust *trust);
+SECStatus CERT_AddTempCertToPerm(CERTCertificate *cert, char *nickname,
+                                 CERTCertTrust *trust);
 
 SECStatus SEC_DeletePermCertificate(CERTCertificate *cert);
 
-PRBool
-SEC_CrlIsNewer(CERTCrl *inNew, CERTCrl *old);
+PRBool SEC_CrlIsNewer(CERTCrl *inNew, CERTCrl *old);
 
 /*
 ** Extract the validity times from a CRL
@@ -81,8 +74,7 @@ SEC_CrlIsNewer(CERTCrl *inNew, CERTCrl *old);
 **	"notBefore" is the start of the validity period (last update)
 **	"notAfter" is the end of the validity period (next update)
 */
-SECStatus
-SEC_GetCrlTimes(CERTCrl *crl, PRTime *notBefore, PRTime *notAfter);
+SECStatus SEC_GetCrlTimes(CERTCrl *crl, PRTime *notBefore, PRTime *notAfter);
 
 /*
 ** Check the validity times of a crl vs. time 't', allowing
@@ -90,8 +82,7 @@ SEC_GetCrlTimes(CERTCrl *crl, PRTime *notBefore, PRTime *notAfter);
 **	"crl" is the certificate to be checked
 **	"t" is the time to check against
 */
-SECCertTimeValidity
-SEC_CheckCrlTimes(CERTCrl *crl, PRTime t);
+SECCertTimeValidity SEC_CheckCrlTimes(CERTCrl *crl, PRTime t);
 
 SEC_END_PROTOS