minica.py: don't encode default critical=False values

net/data/ssl/scripts/crlsetutil.py

 #!/usr/bin/env python
 # Copyright (c) 2014 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 utility takes a JSON input that describes a CRLSet and produces a
 CRLSet from it.
 
 The input is taken on stdin and is a dict with the following keys:
@@ skipping 120 matching lines @@
   iterator.step_into()  # enter TBSCertificate
   iterator.step_over()  # over version
   iterator.step_over()  # over serial
   iterator.step_over()  # over signature algorithm
   iterator.step_over()  # over issuer name
   iterator.step_over()  # over validity
   iterator.step_over()  # over subject name
   return iterator.contents()
 
 
+def der_cert_to_spki_hash(der_cert):
+  """Gets the SHA-256 hash of the subjectPublicKeyInfo of a DER encoded cert
+
+  Args:
+    der_cert: A string containing the DER-encoded certificate
+
+  Returns:
+    The SHA-256 hash of the certificate, as a byte sequence
+  """
+  return hashlib.sha256(_der_cert_to_spki(der_cert)).digest()
+
+
 def pem_cert_file_to_spki_hash(pem_filename):
   """Gets the SHA-256 hash of the subjectPublicKeyInfo of a cert in a file
 
   Args:
     pem_filename: A file containing a PEM-encoded certificate.
 
   Returns:
     The SHA-256 hash of the first certificate in the file, as a byte sequence
   """
-  return hashlib.sha256(
-    _der_cert_to_spki(_pem_cert_to_binary(pem_filename))).digest()
+  return der_cert_to_spki_hash(_pem_cert_to_binary(pem_filename))
 
 
 def main():
   parser = optparse.OptionParser(description=sys.modules[__name__].__doc__)
   parser.add_option('-o', '--output',
                     help='Specifies the output file. The default is stdout.')
   options, _ = parser.parse_args()
   outfile = sys.stdout
   if options.output and options.output != '-':
     outfile = open(options.output, 'wb')
@@ skipping 29 matching lines @@
           raw_serial.insert(0, chr(serial & 0xff))
           serial >>= 8
 
     outfile.write(struct.pack('<B', len(raw_serial)))
     outfile.write(''.join(raw_serial))
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())