Merge NSS_3_14_2_RTM.

mozilla/security/nss/lib/certhigh/ocspti.h

 /* 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/. */
 
 /*
  * Private header defining OCSP types.
  *
- * $Id: ocspti.h,v 1.8.2.1 2012/12/12 16:38:39 wtc%google.com Exp $
+ * $Id: ocspti.h,v 1.11 2013/01/23 23:05:51 kaie%kuix.de Exp $
  */
 
 #ifndef _OCSPTI_H_
 #define _OCSPTI_H_
 
 #include "ocspt.h"
 
 #include "certt.h"
 #include "plarena.h"
 #include "seccomon.h"
@@ skipping 163 matching lines @@
  *      successful              (0),    --Response has valid confirmations
  *      malformedRequest        (1),    --Illegal confirmation request
  *      internalError           (2),    --Internal error in issuer
  *      tryLater                (3),    --Try again later
  *                                      --(4) is not used
  *      sigRequired             (5),    --Must sign the request
  *      unauthorized            (6),    --Request unauthorized
  * }
  */
 typedef enum {
-    ocspResponse_other = -1,            /* unknown/unrecognized value */
+    ocspResponse_min = 0,
     ocspResponse_successful = 0,
     ocspResponse_malformedRequest = 1,
     ocspResponse_internalError = 2,
     ocspResponse_tryLater = 3,
     ocspResponse_unused = 4,
     ocspResponse_sigRequired = 5,
-    ocspResponse_unauthorized = 6
+    ocspResponse_unauthorized = 6,
+    ocspResponse_max = 6 /* Please update max when adding values.
+                          * Remember to also update arrays, e.g.
+                          * "responseStatusNames" in ocspclnt.c
+                          * and potentially other places. */
 } ocspResponseStatus;
 
 /*
  * An OCSPResponse is what is sent (encoded) by an OCSP responder.
  *
  * The field "responseStatus" is the ASN.1 encoded value; the field
  * "statusValue" is simply that same value translated into our local
  * type ocspResponseStatus.
  */
 struct CERTOCSPResponseStr {
@@ skipping 138 matching lines @@
  * When added, it specifies the (name of the) issuer of the cert being
  * checked, and optionally the value of the AuthorityInfoAccess extension
  * if the cert has one.
  */
 struct ocspServiceLocatorStr {
     CERTName *issuer;
     SECItem locator;    /* DER encoded authInfoAccess extension from cert */
 };
 
 #endif /* _OCSPTI_H_ */