Cleanup: Rename "intermediary" --> "intermediate"

net/data/verify_certificate_chain_unittest/generate-key-rollover.py

 #!/usr/bin/python
 # Copyright (c) 2016 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.
 
 """A certificate tree with two self-signed root certificates(oldroot, newroot),
 and a third root certificate (newrootrollover) which has the same key as newroot
 but is signed by oldroot, all with the same subject and issuer.
 There are two intermediates with the same key, subject and issuer
 (oldintermediate signed by oldroot, and newintermediate signed by newroot).
@@ skipping 31 matching lines @@
 # The new certs should have a newer notbefore date than "old" certs. This should
 # affect path builder sorting, but otherwise won't matter.
 JANUARY_2_2015_UTC = '150102120000Z'
 
 # Self-signed root certificates. Same name, different keys.
 oldroot = common.create_self_signed_root_certificate('Root')
 oldroot.set_validity_range(common.JANUARY_1_2015_UTC, common.JANUARY_1_2016_UTC)
 newroot = common.create_self_signed_root_certificate('Root')
 newroot.set_validity_range(JANUARY_2_2015_UTC, common.JANUARY_1_2016_UTC)
 # Root with the new key signed by the old key.
-newrootrollover = common.create_intermediary_certificate('Root', oldroot)
+newrootrollover = common.create_intermediate_certificate('Root', oldroot)
 newrootrollover.set_key_path(newroot.get_key_path())
 newrootrollover.set_validity_range(JANUARY_2_2015_UTC,
                                    common.JANUARY_1_2016_UTC)
 
 # Intermediate signed by oldroot.
-oldintermediate = common.create_intermediary_certificate('Intermediate',
+oldintermediate = common.create_intermediate_certificate('Intermediate',
                                                          oldroot)
 oldintermediate.set_validity_range(common.JANUARY_1_2015_UTC,
                                    common.JANUARY_1_2016_UTC)
 # Intermediate signed by newroot. Same key as oldintermediate.
-newintermediate = common.create_intermediary_certificate('Intermediate',
+newintermediate = common.create_intermediate_certificate('Intermediate',
                                                          newroot)
 newintermediate.set_key_path(oldintermediate.get_key_path())
 newintermediate.set_validity_range(JANUARY_2_2015_UTC,
                                    common.JANUARY_1_2016_UTC)
 
 # Target certificate.
 target = common.create_end_entity_certificate('Target', oldintermediate)
 
 oldchain = [target, oldintermediate]
 rolloverchain = [target, newintermediate, newrootrollover]
 longrolloverchain = [target, newintermediate, newroot, newrootrollover]
 oldtrusted = [oldroot]
 
 newchain = [target, newintermediate]
 newtrusted = [newroot]
 
 time = common.DEFAULT_TIME
 verify_result = True
 
 common.write_test_file(__doc__, oldchain, oldtrusted, time, verify_result,
                        out_pem="key-rollover-oldchain.pem")
 common.write_test_file(__doc__, rolloverchain, oldtrusted, time, verify_result,
                        out_pem="key-rollover-rolloverchain.pem")
 common.write_test_file(__doc__, longrolloverchain, oldtrusted, time,
                        verify_result,
                        out_pem="key-rollover-longrolloverchain.pem")
 common.write_test_file(__doc__, newchain, newtrusted, time, verify_result,
                        out_pem="key-rollover-newchain.pem")