Update NSPR to 4.12 and NSS to 3.23 on iOS

nss/lib/certhigh/ocspt.h

Index: nss/lib/certhigh/ocspt.h
diff --git a/nss/lib/certhigh/ocspt.h b/nss/lib/certhigh/ocspt.h
index 888fd32c7e7defa01bcd54750869f05a3a850843..db429ff0582333a8bf5b966214475cadb5946224 100644
--- a/nss/lib/certhigh/ocspt.h
+++ b/nss/lib/certhigh/ocspt.h
@@ -46,8 +46,8 @@ typedef struct CERTOCSPSingleResponseStr CERTOCSPSingleResponse;
  * dependent, and should be opaque to the user.
  */
 
-typedef void * SEC_HTTP_SERVER_SESSION;
-typedef void * SEC_HTTP_REQUEST_SESSION;
+typedef void *SEC_HTTP_SERVER_SESSION;
+typedef void *SEC_HTTP_REQUEST_SESSION;
 
 /*
  * This function creates a SEC_HTTP_SERVER_SESSION object. The implementer of a
@@ -61,9 +61,9 @@ typedef void * SEC_HTTP_REQUEST_SESSION;
  * after processing is finished.
  */
 typedef SECStatus (*SEC_HttpServer_CreateSessionFcn)(
-   const char *host,
-   PRUint16 portnum,
-   SEC_HTTP_SERVER_SESSION *pSession);
+    const char *host,
+    PRUint16 portnum,
+    SEC_HTTP_SERVER_SESSION *pSession);
 
 /*
  * This function is called to allow the implementation to attempt to keep
@@ -77,10 +77,10 @@ typedef SECStatus (*SEC_HttpServer_CreateSessionFcn)(
  * SECWouldBlock and store a nonzero value at "pPollDesc". In that case
  * the caller may wait on the poll descriptor, and should call this function
  * again until SECSuccess (and a zero value at "pPollDesc") is obtained.
- */ 
+ */
 typedef SECStatus (*SEC_HttpServer_KeepAliveSessionFcn)(
-   SEC_HTTP_SERVER_SESSION session,
-   PRPollDesc **pPollDesc);
+    SEC_HTTP_SERVER_SESSION session,
+    PRPollDesc **pPollDesc);
 
 /*
  * This function frees the client SEC_HTTP_SERVER_SESSION object, closes all
@@ -88,9 +88,9 @@ typedef SECStatus (*SEC_HttpServer_KeepAliveSessionFcn)(
  * frees any memory that was allocated by the client, and invalidates any
  * response pointers that might have been returned by prior server or request
  * functions.
- */ 
+ */
 typedef SECStatus (*SEC_HttpServer_FreeSessionFcn)(
-   SEC_HTTP_SERVER_SESSION session);
+    SEC_HTTP_SERVER_SESSION session);
 
 /*
  * This function creates a SEC_HTTP_REQUEST_SESSION object. The implementer of a
@@ -111,30 +111,30 @@ typedef SECStatus (*SEC_HttpServer_FreeSessionFcn)(
  * after processing is finished.
  */
 typedef SECStatus (*SEC_HttpRequest_CreateFcn)(
-   SEC_HTTP_SERVER_SESSION session,
-   const char *http_protocol_variant, /* usually "http" */
-   const char *path_and_query_string,
-   const char *http_request_method, 
-   const PRIntervalTime timeout, 
-   SEC_HTTP_REQUEST_SESSION *pRequest);
+    SEC_HTTP_SERVER_SESSION session,
+    const char *http_protocol_variant, /* usually "http" */
+    const char *path_and_query_string,
+    const char *http_request_method,
+    const PRIntervalTime timeout,
+    SEC_HTTP_REQUEST_SESSION *pRequest);
 
 /*
  * This function sets data to be sent to the server for an HTTP request
- * of http_request_method == POST. If a particular implementation 
- * supports it, the details for the POST request can be set by calling 
+ * of http_request_method == POST. If a particular implementation
+ * supports it, the details for the POST request can be set by calling
  * this function, prior to activating the request with TrySendAndReceiveFcn.
  *
- * An implementation that does not support the POST method should 
+ * An implementation that does not support the POST method should
  * implement a SetPostDataFcn function that returns immediately.
  *
  * Setting http_content_type is optional, the parameter may
  * by NULL or the empty string.
- */ 
+ */
 typedef SECStatus (*SEC_HttpRequest_SetPostDataFcn)(
-   SEC_HTTP_REQUEST_SESSION request,
-   const char *http_data, 
-   const PRUint32 http_data_len,
-   const char *http_content_type);
+    SEC_HTTP_REQUEST_SESSION request,
+    const char *http_data,
+    const PRUint32 http_data_len,
+    const char *http_content_type);
 
 /*
  * This function sets an additional HTTP protocol request header.
@@ -144,11 +144,11 @@ typedef SECStatus (*SEC_HttpRequest_SetPostDataFcn)(
  *
  * An implementation that does not support setting additional headers
  * should implement an AddRequestHeaderFcn function that returns immediately.
- */ 
+ */
 typedef SECStatus (*SEC_HttpRequest_AddHeaderFcn)(
-   SEC_HTTP_REQUEST_SESSION request,
-   const char *http_header_name, 
-   const char *http_header_value);
+    SEC_HTTP_REQUEST_SESSION request,
+    const char *http_header_name,
+    const char *http_header_value);
 
 /*
  * This function initiates or continues an HTTP request. After
@@ -180,10 +180,10 @@ typedef SECStatus (*SEC_HttpRequest_AddHeaderFcn)(
  * size, the function will return SECFailure.
  * http_response_data_len will be set to a value different from zero to
  * indicate the reason of the failure.
- * An out value of "0" means, the failure was unrelated to the 
+ * An out value of "0" means, the failure was unrelated to the
  * acceptable size.
  * An out value of "1" means, the result data is larger than the
- * accpeptable size, but the real size is not yet known to the http client 
+ * accpeptable size, but the real size is not yet known to the http client
  * implementation and it stopped retrieving it,
  * Any other out value combined with a return value of SECFailure
  * will indicate the actual size of the server data.
@@ -195,64 +195,64 @@ typedef SECStatus (*SEC_HttpRequest_AddHeaderFcn)(
  * the completion of the operation.
  *
  * All returned pointers will be owned by the the HttpClient
- * implementation and will remain valid until the call to 
+ * implementation and will remain valid until the call to
  * SEC_HttpRequest_FreeFcn.
- */ 
+ */
 typedef SECStatus (*SEC_HttpRequest_TrySendAndReceiveFcn)(
-   SEC_HTTP_REQUEST_SESSION request,
-   PRPollDesc **pPollDesc,
-   PRUint16 *http_response_code, 
-   const char **http_response_content_type, 
-   const char **http_response_headers, 
-   const char **http_response_data, 
-   PRUint32 *http_response_data_len); 
+    SEC_HTTP_REQUEST_SESSION request,
+    PRPollDesc **pPollDesc,
+    PRUint16 *http_response_code,
+    const char **http_response_content_type,
+    const char **http_response_headers,
+    const char **http_response_data,
+    PRUint32 *http_response_data_len);
 
 /*
  * Calling CancelFcn asks for premature termination of the request.
  *
  * Future calls to SEC_HttpRequest_TrySendAndReceive should
- * by avoided, but in this case the HttpClient implementation 
+ * by avoided, but in this case the HttpClient implementation
  * is expected to return immediately with SECFailure.
  *
- * After calling CancelFcn, a separate call to SEC_HttpRequest_FreeFcn 
+ * After calling CancelFcn, a separate call to SEC_HttpRequest_FreeFcn
  * is still necessary to free resources.
- */ 
+ */
 typedef SECStatus (*SEC_HttpRequest_CancelFcn)(
-   SEC_HTTP_REQUEST_SESSION request);
+    SEC_HTTP_REQUEST_SESSION request);
 
 /*
  * Before calling this function, it must be assured the request
  * has been completed, i.e. either SEC_HttpRequest_TrySendAndReceiveFcn has
  * returned SECSuccess, or the request has been canceled with
  * a call to SEC_HttpRequest_CancelFcn.
- * 
- * This function frees the client state object, closes all sockets, 
- * discards all partial results, frees any memory that was allocated 
+ *
+ * This function frees the client state object, closes all sockets,
+ * discards all partial results, frees any memory that was allocated
  * by the client, and invalidates all response pointers that might
  * have been returned by SEC_HttpRequest_TrySendAndReceiveFcn
- */ 
+ */
 typedef SECStatus (*SEC_HttpRequest_FreeFcn)(
-   SEC_HTTP_REQUEST_SESSION request);
+    SEC_HTTP_REQUEST_SESSION request);
 
 typedef struct SEC_HttpClientFcnV1Struct {
-   SEC_HttpServer_CreateSessionFcn createSessionFcn;
-   SEC_HttpServer_KeepAliveSessionFcn keepAliveSessionFcn;
-   SEC_HttpServer_FreeSessionFcn freeSessionFcn;
-   SEC_HttpRequest_CreateFcn createFcn;
-   SEC_HttpRequest_SetPostDataFcn setPostDataFcn;
-   SEC_HttpRequest_AddHeaderFcn addHeaderFcn;
-   SEC_HttpRequest_TrySendAndReceiveFcn trySendAndReceiveFcn;
-   SEC_HttpRequest_CancelFcn cancelFcn;
-   SEC_HttpRequest_FreeFcn freeFcn;
+    SEC_HttpServer_CreateSessionFcn createSessionFcn;
+    SEC_HttpServer_KeepAliveSessionFcn keepAliveSessionFcn;
+    SEC_HttpServer_FreeSessionFcn freeSessionFcn;
+    SEC_HttpRequest_CreateFcn createFcn;
+    SEC_HttpRequest_SetPostDataFcn setPostDataFcn;
+    SEC_HttpRequest_AddHeaderFcn addHeaderFcn;
+    SEC_HttpRequest_TrySendAndReceiveFcn trySendAndReceiveFcn;
+    SEC_HttpRequest_CancelFcn cancelFcn;
+    SEC_HttpRequest_FreeFcn freeFcn;
 } SEC_HttpClientFcnV1;
 
 typedef struct SEC_HttpClientFcnStruct {
-   PRInt16 version;
-   union {
-      SEC_HttpClientFcnV1 ftable1;
-      /* SEC_HttpClientFcnV2 ftable2; */
-      /* ...                      */
-   } fcnTable;
+    PRInt16 version;
+    union {
+        SEC_HttpClientFcnV1 ftable1;
+        /* SEC_HttpClientFcnV2 ftable2; */
+        /* ...                      */
+    } fcnTable;
 } SEC_HttpClientFcn;
 
 /*
@@ -293,7 +293,7 @@ typedef enum {
  */
 
 typedef enum {
-    ocspResponderID_other = -1,		/* unknown kind of responderID */
+    ocspResponderID_other = -1, /* unknown kind of responderID */
     ocspResponderID_byName = 1,
     ocspResponderID_byKey = 2
 } CERTOCSPResponderIDType;