Update NSPR to 4.12 and NSS to 3.23 on iOS

nss/lib/certdb/xauthkid.c

Index: nss/lib/certdb/xauthkid.c
diff --git a/nss/lib/certdb/xauthkid.c b/nss/lib/certdb/xauthkid.c
index 4faf017a194e96b953ef2a3aac3f60912ff2ebf0..c7ef046db0cf0bda9963c82366b5d1967e27a8c8 100644
--- a/nss/lib/certdb/xauthkid.c
+++ b/nss/lib/certdb/xauthkid.c
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
- * X.509 v3 Subject Key Usage Extension 
+ * X.509 v3 Subject Key Usage Extension
  *
  */
 
@@ -14,7 +14,7 @@
 #include "secasn1t.h"
 #include "secasn1.h"
 #include "secport.h"
-#include "certt.h"  
+#include "certt.h"
 #include "genname.h"
 #include "secerr.h"
 
@@ -24,105 +24,105 @@ SEC_ASN1_MKSUB(SEC_OctetStringTemplate)
 const SEC_ASN1Template CERTAuthKeyIDTemplate[] = {
     { SEC_ASN1_SEQUENCE, 0, NULL, sizeof(CERTAuthKeyID) },
     { SEC_ASN1_OPTIONAL | SEC_ASN1_CONTEXT_SPECIFIC | SEC_ASN1_XTRN | 0,
-	  offsetof(CERTAuthKeyID,keyID), SEC_ASN1_SUB(SEC_OctetStringTemplate)},
-    { SEC_ASN1_OPTIONAL | SEC_ASN1_CONSTRUCTED | SEC_ASN1_CONTEXT_SPECIFIC  | 1,
-          offsetof(CERTAuthKeyID, DERAuthCertIssuer), CERT_GeneralNamesTemplate},
+      offsetof(CERTAuthKeyID, keyID), SEC_ASN1_SUB(SEC_OctetStringTemplate) },
+    { SEC_ASN1_OPTIONAL | SEC_ASN1_CONSTRUCTED | SEC_ASN1_CONTEXT_SPECIFIC | 1,
+      offsetof(CERTAuthKeyID, DERAuthCertIssuer), CERT_GeneralNamesTemplate },
     { SEC_ASN1_OPTIONAL | SEC_ASN1_CONTEXT_SPECIFIC | SEC_ASN1_XTRN | 2,
-	  offsetof(CERTAuthKeyID,authCertSerialNumber),
-          SEC_ASN1_SUB(SEC_IntegerTemplate) },
+      offsetof(CERTAuthKeyID, authCertSerialNumber),
+      SEC_ASN1_SUB(SEC_IntegerTemplate) },
     { 0 }
 };
 
-
-
-SECStatus CERT_EncodeAuthKeyID (PLArenaPool *arena, CERTAuthKeyID *value, SECItem *encodedValue)
+SECStatus
+CERT_EncodeAuthKeyID(PLArenaPool *arena, CERTAuthKeyID *value,
+                     SECItem *encodedValue)
 {
     SECStatus rv = SECFailure;
- 
-    PORT_Assert (value);
-    PORT_Assert (arena);
-    PORT_Assert (value->DERAuthCertIssuer == NULL);
-    PORT_Assert (encodedValue);
+
+    PORT_Assert(value);
+    PORT_Assert(arena);
+    PORT_Assert(value->DERAuthCertIssuer == NULL);
+    PORT_Assert(encodedValue);
 
     do {
-	
-	/* If both of the authCertIssuer and the serial number exist, encode
-	   the name first.  Otherwise, it is an error if one exist and the other
-	   is not.
-	 */
-	if (value->authCertIssuer) {
-	    if (!value->authCertSerialNumber.data) {
-		PORT_SetError (SEC_ERROR_EXTENSION_VALUE_INVALID);
-		break;
-	    }
-
-	    value->DERAuthCertIssuer = cert_EncodeGeneralNames
-		(arena, value->authCertIssuer);
-	    if (!value->DERAuthCertIssuer) {
-		PORT_SetError (SEC_ERROR_EXTENSION_VALUE_INVALID);
-		break;
-	    }
-	}
-	else if (value->authCertSerialNumber.data) {
-		PORT_SetError (SEC_ERROR_EXTENSION_VALUE_INVALID);
-		break;
-	}
-
-	if (SEC_ASN1EncodeItem (arena, encodedValue, value,
-				CERTAuthKeyIDTemplate) == NULL)
-	    break;
-	rv = SECSuccess;
+
+        /* If both of the authCertIssuer and the serial number exist, encode
+           the name first.  Otherwise, it is an error if one exist and the other
+           is not.
+         */
+        if (value->authCertIssuer) {
+            if (!value->authCertSerialNumber.data) {
+                PORT_SetError(SEC_ERROR_EXTENSION_VALUE_INVALID);
+                break;
+            }
+
+            value->DERAuthCertIssuer =
+                cert_EncodeGeneralNames(arena, value->authCertIssuer);
+            if (!value->DERAuthCertIssuer) {
+                PORT_SetError(SEC_ERROR_EXTENSION_VALUE_INVALID);
+                break;
+            }
+        } else if (value->authCertSerialNumber.data) {
+            PORT_SetError(SEC_ERROR_EXTENSION_VALUE_INVALID);
+            break;
+        }
+
+        if (SEC_ASN1EncodeItem(arena, encodedValue, value,
+                               CERTAuthKeyIDTemplate) == NULL)
+            break;
+        rv = SECSuccess;
 
     } while (0);
-     return(rv);
+    return (rv);
 }
 
 CERTAuthKeyID *
-CERT_DecodeAuthKeyID (PLArenaPool *arena, const SECItem *encodedValue)
+CERT_DecodeAuthKeyID(PLArenaPool *arena, const SECItem *encodedValue)
 {
-    CERTAuthKeyID * value = NULL;
-    SECStatus       rv    = SECFailure;
-    void *          mark;
-    SECItem         newEncodedValue;
+    CERTAuthKeyID *value = NULL;
+    SECStatus rv = SECFailure;
+    void *mark;
+    SECItem newEncodedValue;
+
+    PORT_Assert(arena);
 
-    PORT_Assert (arena);
-   
     do {
-	mark = PORT_ArenaMark (arena);
-	value = (CERTAuthKeyID*)PORT_ArenaZAlloc (arena, sizeof (*value));
-	if (value == NULL)
-	    break;
-	value->DERAuthCertIssuer = NULL;
+        mark = PORT_ArenaMark(arena);
+        value = (CERTAuthKeyID *)PORT_ArenaZAlloc(arena, sizeof(*value));
+        if (value == NULL)
+            break;
+        value->DERAuthCertIssuer = NULL;
         /* copy the DER into the arena, since Quick DER returns data that points
            into the DER input, which may get freed by the caller */
         rv = SECITEM_CopyItem(arena, &newEncodedValue, encodedValue);
-        if ( rv != SECSuccess ) {
-	    break;
+        if (rv != SECSuccess) {
+            break;
         }
 
-        rv = SEC_QuickDERDecodeItem
-	     (arena, value, CERTAuthKeyIDTemplate, &newEncodedValue);
-	if (rv != SECSuccess)
-	    break;
-
-        value->authCertIssuer = cert_DecodeGeneralNames (arena, value->DERAuthCertIssuer);
-	if (value->authCertIssuer == NULL)
-	    break;
-	
-	/* what if the general name contains other format but not URI ?
-	   hl
-	 */
-	if ((value->authCertSerialNumber.data && !value->authCertIssuer) ||
-	    (!value->authCertSerialNumber.data && value->authCertIssuer)){
-	    PORT_SetError (SEC_ERROR_EXTENSION_VALUE_INVALID);
-	    break;
-	}
+        rv = SEC_QuickDERDecodeItem(arena, value, CERTAuthKeyIDTemplate,
+                                    &newEncodedValue);
+        if (rv != SECSuccess)
+            break;
+
+        value->authCertIssuer =
+            cert_DecodeGeneralNames(arena, value->DERAuthCertIssuer);
+        if (value->authCertIssuer == NULL)
+            break;
+
+        /* what if the general name contains other format but not URI ?
+           hl
+         */
+        if ((value->authCertSerialNumber.data && !value->authCertIssuer) ||
+            (!value->authCertSerialNumber.data && value->authCertIssuer)) {
+            PORT_SetError(SEC_ERROR_EXTENSION_VALUE_INVALID);
+            break;
+        }
     } while (0);
 
     if (rv != SECSuccess) {
-	PORT_ArenaRelease (arena, mark);
-	return ((CERTAuthKeyID *)NULL);	    
-    } 
+        PORT_ArenaRelease(arena, mark);
+        return ((CERTAuthKeyID *)NULL);
+    }
     PORT_ArenaUnmark(arena, mark);
     return (value);
 }