Update NSPR to 4.12 and NSS to 3.23 on iOS

nss/lib/certhigh/crlv2.c

Index: nss/lib/certhigh/crlv2.c
diff --git a/nss/lib/certhigh/crlv2.c b/nss/lib/certhigh/crlv2.c
index 7d8dbb9fa6b941c56ae61208ba53083580593e9c..d58d4e083b17368151bb7565b5ddd7c786084ae5 100644
--- a/nss/lib/certhigh/crlv2.c
+++ b/nss/lib/certhigh/crlv2.c
@@ -17,17 +17,15 @@
 SECStatus
 CERT_FindCRLExtensionByOID(CERTCrl *crl, SECItem *oid, SECItem *value)
 {
-    return (cert_FindExtensionByOID (crl->extensions, oid, value));
+    return (cert_FindExtensionByOID(crl->extensions, oid, value));
 }
-    
 
 SECStatus
 CERT_FindCRLExtension(CERTCrl *crl, int tag, SECItem *value)
 {
-    return (cert_FindExtension (crl->extensions, tag, value));
+    return (cert_FindExtension(crl->extensions, tag, value));
 }
 
-
 /* Callback to set extensions and adjust verison */
 static void
 SetCrlExts(void *object, CERTCertExtension **exts)
@@ -35,13 +33,13 @@ SetCrlExts(void *object, CERTCertExtension **exts)
     CERTCrl *crl = (CERTCrl *)object;
 
     crl->extensions = exts;
-    DER_SetUInteger (crl->arena, &crl->version, SEC_CRL_VERSION_2);
+    DER_SetUInteger(crl->arena, &crl->version, SEC_CRL_VERSION_2);
 }
 
 void *
 CERT_StartCRLExtensions(CERTCrl *crl)
 {
-    return (cert_StartExtensions ((void *)crl, crl->arena, SetCrlExts));
+    return (cert_StartExtensions((void *)crl, crl->arena, SetCrlExts));
 }
 
 static void
@@ -55,11 +53,12 @@ SetCrlEntryExts(void *object, CERTCertExtension **exts)
 void *
 CERT_StartCRLEntryExtensions(CERTCrl *crl, CERTCrlEntry *entry)
 {
-    return (cert_StartExtensions (entry, crl->arena, SetCrlEntryExts));
+    return (cert_StartExtensions(entry, crl->arena, SetCrlEntryExts));
 }
 
-SECStatus CERT_FindCRLNumberExten (PLArenaPool *arena, CERTCrl *crl,
-                                   SECItem *value)
+SECStatus
+CERT_FindCRLNumberExten(PLArenaPool *arena, CERTCrl *crl,
+                        SECItem *value)
 {
     SECItem encodedExtenValue;
     SECItem *tmpItem = NULL;
@@ -70,22 +69,22 @@ SECStatus CERT_FindCRLNumberExten (PLArenaPool *arena, CERTCrl *crl,
     encodedExtenValue.len = 0;
 
     rv = cert_FindExtension(crl->extensions, SEC_OID_X509_CRL_NUMBER,
-			  &encodedExtenValue);
-    if ( rv != SECSuccess )
-	return (rv);
+                            &encodedExtenValue);
+    if (rv != SECSuccess)
+        return (rv);
 
     mark = PORT_ArenaMark(arena);
 
     tmpItem = SECITEM_ArenaDupItem(arena, &encodedExtenValue);
     if (tmpItem) {
-        rv = SEC_QuickDERDecodeItem (arena, value,
-                                     SEC_ASN1_GET(SEC_IntegerTemplate),
-                                     tmpItem);
+        rv = SEC_QuickDERDecodeItem(arena, value,
+                                    SEC_ASN1_GET(SEC_IntegerTemplate),
+                                    tmpItem);
     } else {
         rv = SECFailure;
     }
 
-    PORT_Free (encodedExtenValue.data);
+    PORT_Free(encodedExtenValue.data);
     if (rv == SECFailure) {
         PORT_ArenaRelease(arena, mark);
     } else {
@@ -94,67 +93,68 @@ SECStatus CERT_FindCRLNumberExten (PLArenaPool *arena, CERTCrl *crl,
     return (rv);
 }
 
-SECStatus CERT_FindCRLEntryReasonExten (CERTCrlEntry *crlEntry,
-                                        CERTCRLEntryReasonCode *value)
+SECStatus
+CERT_FindCRLEntryReasonExten(CERTCrlEntry *crlEntry,
+                             CERTCRLEntryReasonCode *value)
 {
-    SECItem wrapperItem = {siBuffer,0};
-    SECItem tmpItem = {siBuffer,0};
+    SECItem wrapperItem = { siBuffer, 0 };
+    SECItem tmpItem = { siBuffer, 0 };
     SECStatus rv;
     PLArenaPool *arena = NULL;
 
-    arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);   
-    if ( ! arena ) {
-	return(SECFailure);
+    arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
+    if (!arena) {
+        return (SECFailure);
     }
-    
-    rv = cert_FindExtension(crlEntry->extensions, SEC_OID_X509_REASON_CODE, 
+
+    rv = cert_FindExtension(crlEntry->extensions, SEC_OID_X509_REASON_CODE,
                             &wrapperItem);
-    if ( rv != SECSuccess ) {
-	goto loser;
+    if (rv != SECSuccess) {
+        goto loser;
     }
 
     rv = SEC_QuickDERDecodeItem(arena, &tmpItem,
                                 SEC_ASN1_GET(SEC_EnumeratedTemplate),
                                 &wrapperItem);
 
-    if ( rv != SECSuccess ) {
-	goto loser;
+    if (rv != SECSuccess) {
+        goto loser;
     }
 
-    *value = (CERTCRLEntryReasonCode) DER_GetInteger(&tmpItem);
+    *value = (CERTCRLEntryReasonCode)DER_GetInteger(&tmpItem);
 
 loser:
-    if ( arena ) {
-	PORT_FreeArena(arena, PR_FALSE);
+    if (arena) {
+        PORT_FreeArena(arena, PR_FALSE);
     }
-    
-    if ( wrapperItem.data ) {
-	PORT_Free(wrapperItem.data);
+
+    if (wrapperItem.data) {
+        PORT_Free(wrapperItem.data);
     }
 
     return (rv);
 }
 
-SECStatus CERT_FindInvalidDateExten (CERTCrl *crl, PRTime *value)
+SECStatus
+CERT_FindInvalidDateExten(CERTCrl *crl, PRTime *value)
 {
     SECItem encodedExtenValue;
-    SECItem decodedExtenValue = {siBuffer,0};
+    SECItem decodedExtenValue = { siBuffer, 0 };
     SECStatus rv;
 
     encodedExtenValue.data = decodedExtenValue.data = NULL;
     encodedExtenValue.len = decodedExtenValue.len = 0;
 
-    rv = cert_FindExtension
-	 (crl->extensions, SEC_OID_X509_INVALID_DATE, &encodedExtenValue);
-    if ( rv != SECSuccess )
-	return (rv);
+    rv = cert_FindExtension(crl->extensions, SEC_OID_X509_INVALID_DATE, &encodedExtenValue);
+    if (rv != SECSuccess)
+        return (rv);
 
-    rv = SEC_ASN1DecodeItem (NULL, &decodedExtenValue,
-			     SEC_ASN1_GET(SEC_GeneralizedTimeTemplate),
-                             &encodedExtenValue);
+    rv = SEC_ASN1DecodeItem(NULL, &decodedExtenValue,
+                            SEC_ASN1_GET(SEC_GeneralizedTimeTemplate),
+                            &encodedExtenValue);
     if (rv == SECSuccess)
-	rv = DER_GeneralizedTimeToTime(value, &encodedExtenValue);
-    PORT_Free (decodedExtenValue.data);
-    PORT_Free (encodedExtenValue.data);
+        rv = DER_GeneralizedTimeToTime(value, &encodedExtenValue);
+    PORT_Free(decodedExtenValue.data);
+    PORT_Free(encodedExtenValue.data);
     return (rv);
 }