Add OCSPVerifyResult for tracking stapled OCSP responses cross-platform.

net/tools/testserver/testserver.py

 #!/usr/bin/env python
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """This is a simple HTTP/FTP/TCP/UDP/BASIC_AUTH_PROXY/WEBSOCKET server used for
 testing Chrome.
 
 It supports several test URLs, as specified by the handlers in TestPageHandler.
 By default, it listens on an ephemeral port and sends the port number back to
@@ skipping 1894 matching lines @@
           elif self.options.ocsp == 'invalid':
             ocsp_state = minica.OCSP_STATE_INVALID
           elif self.options.ocsp == 'unauthorized':
             ocsp_state = minica.OCSP_STATE_UNAUTHORIZED
           elif self.options.ocsp == 'unknown':
             ocsp_state = minica.OCSP_STATE_UNKNOWN
           else:
             raise testserver_base.OptionError('unknown OCSP status: ' +
                 self.options.ocsp_status)
 
+          ocsp_date = None
+          if self.options.ocsp_date == 'valid':
+            ocsp_date = minica.OCSP_DATE_VALID
+          elif self.options.ocsp_date == 'old':
+            ocsp_date = minica.OCSP_DATE_OLD
+          elif self.options.ocsp_date == 'early':
+            ocsp_date = minica.OCSP_DATE_EARLY
+          elif self.options.ocsp_date == 'long':
+            ocsp_date = minica.OCSP_DATE_LONG
+          else:
+            raise testserver_base.OptionError('unknown OCSP date: ' +
+                self.options.ocsp_date)
+
           (pem_cert_and_key, ocsp_der) = minica.GenerateCertKeyAndOCSP(
               subject = "127.0.0.1",
               ocsp_url = ("http://%s:%d/ocsp" %
                   (host, self.__ocsp_server.server_port)),
               ocsp_state = ocsp_state,
+              ocsp_date = ocsp_date,
               serial = self.options.cert_serial)
 
           if self.options.ocsp_server_unavailable:
             # SEQUENCE containing ENUMERATED with value 3 (tryLater).
             self.__ocsp_server.ocsp_response = '30030a0103'.decode('hex')
           else:
             self.__ocsp_server.ocsp_response = ocsp_der
 
         for ca_cert in self.options.ssl_client_ca:
           if not os.path.isfile(ca_cert):
@@ skipping 151 matching lines @@
                                   'should be used.')
     self.option_parser.add_option('--cert-and-key-file',
                                   dest='cert_and_key_file', help='specify the '
                                   'path to the file containing the certificate '
                                   'and private key for the server in PEM '
                                   'format')
     self.option_parser.add_option('--ocsp', dest='ocsp', default='ok',
                                   help='The type of OCSP response generated '
                                   'for the automatically generated '
                                   'certificate. One of [ok,revoked,invalid]')
+    self.option_parser.add_option('--ocsp-date', dest='ocsp_date',
+                                  default='valid', help='The validity of the '
+                                  'range between thisUpdate and nextUpdate')
     self.option_parser.add_option('--cert-serial', dest='cert_serial',
                                   default=0, type=int,
                                   help='If non-zero then the generated '
                                   'certificate will have this serial number')
     self.option_parser.add_option('--tls-intolerant', dest='tls_intolerant',
                                   default='0', type='int',
                                   help='If nonzero, certain TLS connections '
                                   'will be aborted in order to test version '
                                   'fallback. 1 means all TLS versions will be '
                                   'aborted. 2 means TLS 1.1 or higher will be '
@@ skipping 97 matching lines @@
                                   'an anonymous user.')
     self.option_parser.add_option('--disable-channel-id', action='store_true')
     self.option_parser.add_option('--disable-extended-master-secret',
                                   action='store_true')
     self.option_parser.add_option('--token-binding-params', action='append',
                                   default=[], type='int')
 
 
 if __name__ == '__main__':
   sys.exit(ServerRunner().main())