diff options
author | Russ Housley <housley@vigilsec.com> | 2019-10-13 15:54:21 -0400 |
---|---|---|
committer | Ilya Etingof <etingof@gmail.com> | 2019-10-13 21:54:21 +0200 |
commit | 8f74c07702b0941d70335c517aa2ac88c0b9c95e (patch) | |
tree | 20c897ffdc5b1bbdced5e9883becc3daa5eee0c0 | |
parent | 86fafcc8923b1094197f20ccf794a9c66731fa34 (diff) | |
download | pyasn1-modules-8f74c07702b0941d70335c517aa2ac88c0b9c95e.tar.gz |
Add support for RFC 7229 (#81)
-rw-r--r-- | CHANGES.txt | 1 | ||||
-rw-r--r-- | pyasn1_modules/rfc7229.py | 29 | ||||
-rw-r--r-- | tests/__main__.py | 1 | ||||
-rw-r--r-- | tests/test_rfc7229.py | 97 |
4 files changed, 128 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index d542559..311d43c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -4,6 +4,7 @@ Revision 0.2.8, released XX-XX-2019 - Improve test routines for modules that use certificate extensions - Added RFC7633 providing TLS Features Certificate Extension +- Added RFC7229 providing OIDs for Test Certificate Policies Revision 0.2.7, released 09-10-2019 ----------------------------------- diff --git a/pyasn1_modules/rfc7229.py b/pyasn1_modules/rfc7229.py new file mode 100644 index 0000000..e9bce2d --- /dev/null +++ b/pyasn1_modules/rfc7229.py @@ -0,0 +1,29 @@ +# +# This file is part of pyasn1-modules software. +# +# Created by Russ Housley. +# +# Copyright (c) 2019, Vigil Security, LLC +# License: http://snmplabs.com/pyasn1/license.html +# +# Object Identifiers for Test Certificate Policies +# +# ASN.1 source from: +# https://www.rfc-editor.org/rfc/rfc7229.txt +# + +from pyasn1.type import univ + + +id_pkix = univ.ObjectIdentifier('1.3.6.1.5.5.7') + +id_TEST = id_pkix + (13, ) + +id_TEST_certPolicyOne = id_TEST + (1, ) +id_TEST_certPolicyTwo = id_TEST + (2, ) +id_TEST_certPolicyThree = id_TEST + (3, ) +id_TEST_certPolicyFour = id_TEST + (4, ) +id_TEST_certPolicyFive = id_TEST + (5, ) +id_TEST_certPolicySix = id_TEST + (6, ) +id_TEST_certPolicySeven = id_TEST + (7, ) +id_TEST_certPolicyEight = id_TEST + (8, ) diff --git a/tests/__main__.py b/tests/__main__.py index 4e9bee7..08c2635 100644 --- a/tests/__main__.py +++ b/tests/__main__.py @@ -56,6 +56,7 @@ suite = unittest.TestLoader().loadTestsFromNames( 'tests.test_rfc6211.suite', 'tests.test_rfc7030.suite', 'tests.test_rfc7191.suite', + 'tests.test_rfc7229.suite', 'tests.test_rfc7292.suite', 'tests.test_rfc7296.suite', 'tests.test_rfc7633.suite', diff --git a/tests/test_rfc7229.py b/tests/test_rfc7229.py new file mode 100644 index 0000000..6d1c578 --- /dev/null +++ b/tests/test_rfc7229.py @@ -0,0 +1,97 @@ +# +# This file is part of pyasn1-modules software. +# +# Created by Russ Housley +# Copyright (c) 2019, Vigil Security, LLC +# License: http://snmplabs.com/pyasn1/license.html +# + +import sys + +from pyasn1.codec.der.decoder import decode as der_decode +from pyasn1.codec.der.encoder import encode as der_encode + +from pyasn1_modules import pem +from pyasn1_modules import rfc5280 +from pyasn1_modules import rfc7229 + +try: + import unittest2 as unittest + +except ImportError: + import unittest + + +class CertificatePolicyTestCase(unittest.TestCase): + pem_text = """\ +MIIDJDCCAqqgAwIBAgIJAKWzVCgbsG5AMAoGCCqGSM49BAMDMD8xCzAJBgNVBAYT +AlVTMQswCQYDVQQIDAJWQTEQMA4GA1UEBwwHSGVybmRvbjERMA8GA1UECgwIQm9n +dXMgQ0EwHhcNMTkxMDEzMTkwNTUzWhcNMjAxMDEyMTkwNTUzWjBTMQswCQYDVQQG +EwJVUzELMAkGA1UECBMCVkExEDAOBgNVBAcTB0hlcm5kb24xJTAjBgNVBAoTHFRF +U1QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNi +AATwUXZUseiOaqWdrClDCMbp9YFAM87LTmFirygpzKDU9cfqSCg7zBDIphXCwMcS +9zVWDoStCbcvN0jw5CljHcffzpHYX91P88SZRJ1w4hawHjOsWxvM3AkYgZ5nfdlL +7EajggFcMIIBWDAdBgNVHQ4EFgQU8jXbNATapVXyvWkDmbBi7OIVCMEwbwYDVR0j +BGgwZoAU8jXbNATapVXyvWkDmbBi7OIVCMGhQ6RBMD8xCzAJBgNVBAYTAlVTMQsw +CQYDVQQIDAJWQTEQMA4GA1UEBwwHSGVybmRvbjERMA8GA1UECgwIQm9ndXMgQ0GC +CQDokdYGkU/O8jAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBhjBCBglghkgB +hvhCAQ0ENRYzVGhpcyBjZXJ0aWZpY2F0ZSBjYW5ub3QgYmUgdHJ1c3RlZCBmb3Ig +YW55IHB1cnBvc2UuMCEGA1UdIAQaMBgwCgYIKwYBBQUHDQEwCgYIKwYBBQUHDQIw +CgYDVR02BAMCAQIwNQYDVR0hBC4wLDAUBggrBgEFBQcNAQYIKwYBBQUHDQcwFAYI +KwYBBQUHDQIGCCsGAQUFBw0IMAoGCCqGSM49BAMDA2gAMGUCMHaWskjS7MKQCMcn +zEKFOV3LWK8pL57vrECJd8ywKdwBJUNw9HhvSKkfUwL6rjlLpQIxAL2QO3CNoZRP +PZs8K3IjUA5+U73pA8lpaTOPscLY22WL9pAGmyVUyEJ8lM7E+r4iDg== +""" + + def setUp(self): + self.asn1Spec = rfc5280.Certificate() + + def testDerCodec(self): + test_oids = [ + rfc7229.id_TEST_certPolicyOne, + rfc7229.id_TEST_certPolicyTwo, + rfc7229.id_TEST_certPolicyThree, + rfc7229.id_TEST_certPolicyFour, + rfc7229.id_TEST_certPolicyFive, + rfc7229.id_TEST_certPolicySix, + rfc7229.id_TEST_certPolicySeven, + rfc7229.id_TEST_certPolicyEight, + ] + + substrate = pem.readBase64fromText(self.pem_text) + asn1Object, rest = der_decode(substrate, asn1Spec=self.asn1Spec) + assert not rest + assert asn1Object.prettyPrint() + assert der_encode(asn1Object) == substrate + + count = 0 + for extn in asn1Object['tbsCertificate']['extensions']: + if extn['extnID'] in rfc5280.certificateExtensionsMap.keys(): + s = extn['extnValue'] + ev, rest = der_decode(s, rfc5280.certificateExtensionsMap[extn['extnID']]) + assert not rest + assert ev.prettyPrint() + assert s == der_encode(ev) + + if extn['extnID'] == rfc5280.id_ce_certificatePolicies: + for pol in ev: + if pol['policyIdentifier'] in test_oids: + count += 1 + + if extn['extnID'] == rfc5280.id_ce_policyMappings: + for pmap in ev: + if pmap['issuerDomainPolicy'] in test_oids: + count += 1 + if pmap['subjectDomainPolicy'] in test_oids: + count += 1 + + assert count == 6 + + +suite = unittest.TestLoader().loadTestsFromModule(sys.modules[__name__]) + +if __name__ == '__main__': + import sys + + result = unittest.TextTestRunner(verbosity=2).run(suite) + sys.exit(not result.wasSuccessful()) |