Merge NSS_3_14_2_RTM.

mozilla/security/nss/lib/certhigh/ocsp.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
  * Implementation of OCSP services, for both client and server.
  * (XXX, really, mostly just for client right now, but intended to do both.)
  *
- * $Id: ocsp.c,v 1.74.2.1 2012/12/12 16:38:39 wtc%google.com Exp $
+ * $Id: ocsp.c,v 1.77 2013/01/23 23:05:50 kaie%kuix.de Exp $
  */
 
 #include "prerror.h"
 #include "prprf.h"
 #include "plarena.h"
 #include "prnetdb.h"
 
 #include "seccomon.h"
 #include "secitem.h"
 #include "secoidt.h"
@@ skipping 129 matching lines @@
 #define OCSP_TRACE(msg) ocsp_Trace msg
 #define OCSP_TRACE_TIME(msg, time) ocsp_dumpStringWithTime(msg, time)
 #define OCSP_TRACE_CERT(cert) dumpCertificate(cert)
 #define OCSP_TRACE_CERTID(certid) dumpCertID(certid)
 
 #if defined(XP_UNIX) || defined(XP_WIN32) || defined(XP_BEOS) \
      || defined(XP_MACOSX)
 #define NSS_HAVE_GETENV 1
 #endif
 
-static PRBool wantOcspTrace()
+static PRBool wantOcspTrace(void)
 {
     static PRBool firstTime = PR_TRUE;
     static PRBool wantTrace = PR_FALSE;
 
 #ifdef NSS_HAVE_GETENV
     if (firstTime) {
         char *ev = getenv("NSS_TRACE_OCSP");
         if (ev && ev[0]) {
             wantTrace = PR_TRUE;
         }
@@ skipping 327 matching lines @@
         PR_ExitMonitor(OCSP_Global.monitor);
         return;
     }
     OCSP_TRACE(("OCSP ocsp_MakeCacheEntryMostRecent NEW entry\n"));
     ocsp_RemoveCacheItemFromLinkedList(cache, new_most_recent);
     ocsp_AddCacheItemToLinkedList(cache, new_most_recent);
     PR_ExitMonitor(OCSP_Global.monitor);
 }
 
 static PRBool
-ocsp_IsCacheDisabled()
+ocsp_IsCacheDisabled(void)
 {
     /* 
      * maxCacheEntries == 0 means unlimited cache entries
      * maxCacheEntries  < 0 means cache is disabled
      */
     PRBool retval;
     PR_EnterMonitor(OCSP_Global.monitor);
     retval = (OCSP_Global.maxCacheEntries < 0);
     PR_ExitMonitor(OCSP_Global.monitor);
     return retval;
@@ skipping 67 matching lines @@
          */
         while (cache->numberOfEntries > 
                      (PRUint32)OCSP_Global.maxCacheEntries) {
             ocsp_RemoveCacheItem(cache, cache->LRUitem);
         }
     }
     PR_ExitMonitor(OCSP_Global.monitor);
 }
 
 SECStatus
-CERT_ClearOCSPCache()
+CERT_ClearOCSPCache(void)
 {
     OCSP_TRACE(("OCSP CERT_ClearOCSPCache\n"));
     PR_EnterMonitor(OCSP_Global.monitor);
     while (OCSP_Global.cache.numberOfEntries > 0) {
         ocsp_RemoveCacheItem(&OCSP_Global.cache, 
                              OCSP_Global.cache.LRUitem);
     }
     PR_ExitMonitor(OCSP_Global.monitor);
     return SECSuccess;
 }
@@ skipping 340 matching lines @@
 
     PR_DestroyMonitor(OCSP_Global.monitor);
     OCSP_Global.monitor = NULL;
     return SECSuccess;
 }
 
 /*
  * A return value of NULL means: 
  *   The application did not register it's own HTTP client.
  */
-const SEC_HttpClientFcn *SEC_GetRegisteredHttpClient()
+const SEC_HttpClientFcn *SEC_GetRegisteredHttpClient(void)
 {
     const SEC_HttpClientFcn *retval;
 
     if (!OCSP_Global.monitor) {
       PORT_SetError(SEC_ERROR_NOT_INITIALIZED);
       return NULL;
     }
 
     PR_EnterMonitor(OCSP_Global.monitor);
     retval = OCSP_Global.defaultHttpClientFcn;
@@ skipping 966 matching lines @@
     PORT_ArenaUnmark(arena, mark);
     requestList[1] = NULL;
     return requestList;
 
 loser:
     PORT_ArenaRelease(arena, mark);
     return NULL;
 }
 
 static CERTOCSPRequest *
-ocsp_prepareEmptyOCSPRequest()
+ocsp_prepareEmptyOCSPRequest(void)
 {
     PRArenaPool *arena = NULL;
     CERTOCSPRequest *request = NULL;
     ocspTBSRequest *tbsRequest = NULL;
 
     arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
     if (arena == NULL) {
         goto loser;
     }
     request = PORT_ArenaZNew(arena, CERTOCSPRequest);
@@ skipping 2725 matching lines @@
                 *rvOcsp = SECSuccess;
             }
             *missingResponseError = cacheItem->missingResponseError;
         }
     }
     PR_ExitMonitor(OCSP_Global.monitor);
     return rv;
 }
 
 PRBool
-ocsp_FetchingFailureIsVerificationFailure()
+ocsp_FetchingFailureIsVerificationFailure(void)
 {
     PRBool isFailure;
 
     PR_EnterMonitor(OCSP_Global.monitor);
     isFailure =
         OCSP_Global.ocspFailureMode == ocspMode_FailureIsVerificationFailure;
     PR_ExitMonitor(OCSP_Global.monitor);
     return isFailure;
 }
 
@@ skipping 984 matching lines @@
       case ocspResponse_tryLater:
         PORT_SetError(SEC_ERROR_OCSP_TRY_SERVER_LATER);
         break;
       case ocspResponse_sigRequired:
         /* XXX We *should* retry with a signature, if possible. */
         PORT_SetError(SEC_ERROR_OCSP_REQUEST_NEEDS_SIG);
         break;
       case ocspResponse_unauthorized:
         PORT_SetError(SEC_ERROR_OCSP_UNAUTHORIZED_REQUEST);
         break;
-      case ocspResponse_other:
       case ocspResponse_unused:
       default:
         PORT_SetError(SEC_ERROR_OCSP_UNKNOWN_RESPONSE_STATUS);
         break;
     }
     return SECFailure;
 }