Changeset - c033bb4b0a05
[Not reviewed]
0 3 0
Branko Majic (branko) - 8 years ago 2018-03-01 15:42:57
branko@majic.rs
GC-3: Updated naming convention for CAs (append CA at end for usability purposes).
3 files changed with 12 insertions and 12 deletions:
0 comments (0 inline, 0 general)
functional_tests/test_init.py
Show inline comments
 
@@ -93,5 +93,5 @@ def test_initialisation_on_fresh_directory(tmpdir):
 
    # DN has just the CN with working directory's name in it.
 
    assert issuer_dn == subject_dn
 
    assert subject_dn.rstrip() == 'CN = %s Level 1' % tmpdir.basename
 
    assert subject_dn.rstrip() == 'CN = %s Level 1 CA' % tmpdir.basename
 

	
 
    # John has a quick look at generated certificate and chain, only
 
@@ -164,5 +164,5 @@ def test_initialisation_with_custom_base_name(tmpdir):
 
    # and now they are based on his custom-provided name instead of
 
    # project name.
 
    assert issuer_dn.rstrip() == subject_dn.rstrip() == "CN = My Project Level 1"
 
    assert issuer_dn.rstrip() == subject_dn.rstrip() == "CN = My Project Level 1 CA"
 
    assert tmpdir.basename not in issuer_dn
 

	
 
@@ -253,7 +253,7 @@ def test_initialisation_with_custom_hierarchy_depth(tmpdir):
 
    assert issuer_dn2 == subject_dn1
 
    assert issuer_dn3 == subject_dn2
 
    assert subject_dn1 == 'CN = %s Level 1' % tmpdir.basename
 
    assert subject_dn2 == 'CN = %s Level 2' % tmpdir.basename
 
    assert subject_dn3 == 'CN = %s Level 3' % tmpdir.basename
 
    assert subject_dn1 == 'CN = %s Level 1 CA' % tmpdir.basename
 
    assert subject_dn2 == 'CN = %s Level 2 CA' % tmpdir.basename
 
    assert subject_dn3 == 'CN = %s Level 3 CA' % tmpdir.basename
 

	
 
    # John opens-up the chain file, and observes that all certificates
gimmecert/crypto.py
Show inline comments
 
@@ -163,5 +163,5 @@ def generate_ca_hierarchy(base_name, depth):
 
    for level in range(1, depth+1):
 
        # Generate info for the new CA.
 
        dn = get_dn("%s Level %d" % (base_name, level))
 
        dn = get_dn("%s Level %d CA" % (base_name, level))
 
        private_key = generate_private_key()
 

	
tests/test_crypto.py
Show inline comments
 
@@ -141,7 +141,7 @@ def test_generate_ca_hierarchy_subject_dns_have_correct_value():
 
    level1, level2, level3 = [certificate for _, certificate in gimmecert.crypto.generate_ca_hierarchy(base_name, depth)]
 

	
 
    assert level1.subject == cryptography.x509.Name(gimmecert.crypto.get_dn('My Project Level 1'))
 
    assert level2.subject == cryptography.x509.Name(gimmecert.crypto.get_dn('My Project Level 2'))
 
    assert level3.subject == cryptography.x509.Name(gimmecert.crypto.get_dn('My Project Level 3'))
 
    assert level1.subject == cryptography.x509.Name(gimmecert.crypto.get_dn('My Project Level 1 CA'))
 
    assert level2.subject == cryptography.x509.Name(gimmecert.crypto.get_dn('My Project Level 2 CA'))
 
    assert level3.subject == cryptography.x509.Name(gimmecert.crypto.get_dn('My Project Level 3 CA'))
 

	
 

	
 
@@ -156,7 +156,7 @@ def test_generate_ca_hierarchy_issuer_dns_have_correct_value():
 
    level3_key, level3_certificate = hierarchy[2]
 

	
 
    assert level1_certificate.issuer == cryptography.x509.Name(gimmecert.crypto.get_dn('My Project Level 1'))
 
    assert level2_certificate.issuer == cryptography.x509.Name(gimmecert.crypto.get_dn('My Project Level 1'))
 
    assert level3_certificate.issuer == cryptography.x509.Name(gimmecert.crypto.get_dn('My Project Level 2'))
 
    assert level1_certificate.issuer == cryptography.x509.Name(gimmecert.crypto.get_dn('My Project Level 1 CA'))
 
    assert level2_certificate.issuer == cryptography.x509.Name(gimmecert.crypto.get_dn('My Project Level 1 CA'))
 
    assert level3_certificate.issuer == cryptography.x509.Name(gimmecert.crypto.get_dn('My Project Level 2 CA'))
 

	
 

	
0 comments (0 inline, 0 general)