Merge NSS_3_14_2_RTM.

mozilla/security/nss/lib/certhigh/ocspt.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/. */
 
 /*
  * Public header for exported OCSP types.
  *
- * $Id: ocspt.h,v 1.11.2.1 2012/12/12 16:38:39 wtc%google.com Exp $
+ * $Id: ocspt.h,v 1.12 2012/12/12 16:03:44 wtc%google.com Exp $
  */
 
 #ifndef _OCSPT_H_
 #define _OCSPT_H_
 
 /*
  * The following are all opaque types.  If someone needs to get at
  * a field within, then we need to fix the API.  Try very hard not
  * make the type available to them.
  */
@@ skipping 275 matching lines @@
  * save it, along with the value, into a data structure.
  */
 
 typedef enum {
     ocspResponderID_other = -1,         /* unknown kind of responderID */
     ocspResponderID_byName = 1,
     ocspResponderID_byKey = 2
 } CERTOCSPResponderIDType;
 
 #endif /* _OCSPT_H_ */