From 253929a85c45c1313fd68d10ec7a7a45e380d5c0 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Wed, 5 Aug 2015 17:30:39 +0100 Subject: add AuthorityKeyIdentifier from_issuer_public_key Refactored SKI's creation code into a separate function, added doctest examples --- docs/x509/reference.rst | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'docs/x509') diff --git a/docs/x509/reference.rst b/docs/x509/reference.rst index dfa91fac..a05be164 100644 --- a/docs/x509/reference.rst +++ b/docs/x509/reference.rst @@ -1160,6 +1160,28 @@ X.509 Extensions The serial number of the issuer's issuer. + .. classmethod:: from_issuer_public_key(public_key) + + .. versionadded:: 1.0 + + Creates a new AuthorityKeyIdentifier instance using the public key + provided to generate the appropriate digest. This should be the + **issuer public key**. The resulting object will contain a + :attr:`~cryptography.x509.AuthorityKeyIdentifier.key_identifier`. + The generated digest is the SHA1 hash of the ``subjectPublicKey`` A + SN.1 bit string. This is the first recommendation in :rfc:`5280` + section 4.2.1.2. + + :param certificate: The issuing :class:`~cryptography.x509.Certificate`. + + .. doctest:: + + >>> from cryptography import x509 + >>> from cryptography.hazmat.backends import default_backend + >>> cert = x509.load_pem_x509_certificate(pem_data, default_backend()) + >>> x509.AuthorityKeyIdentifier.from_issuer_public_key(cert.public_key()) + + .. class:: SubjectKeyIdentifier .. versionadded:: 0.9 @@ -1198,6 +1220,14 @@ X.509 Extensions , or :class:`~cryptography.hazmat.primitives.asymmetric.ec.EllipticCurvePublicKey`. + .. doctest:: + + >>> from cryptography import x509 + >>> from cryptography.hazmat.backends import default_backend + >>> cert = x509.load_pem_x509_certificate(pem_data, default_backend()) + >>> x509.SubjectKeyIdentifier.from_public_key(cert.public_key()) + + .. class:: SubjectAlternativeName .. versionadded:: 0.9 -- cgit v1.2.3 From 26ac47f1326fb4b8909d40ea0683eafcb9bd858e Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sat, 8 Aug 2015 15:20:52 -0500 Subject: update prose for from_issuer_public_key --- docs/x509/reference.rst | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'docs/x509') diff --git a/docs/x509/reference.rst b/docs/x509/reference.rst index a05be164..930c7f9f 100644 --- a/docs/x509/reference.rst +++ b/docs/x509/reference.rst @@ -1166,10 +1166,14 @@ X.509 Extensions Creates a new AuthorityKeyIdentifier instance using the public key provided to generate the appropriate digest. This should be the - **issuer public key**. The resulting object will contain a - :attr:`~cryptography.x509.AuthorityKeyIdentifier.key_identifier`. - The generated digest is the SHA1 hash of the ``subjectPublicKey`` A - SN.1 bit string. This is the first recommendation in :rfc:`5280` + **issuer's public key**. The resulting object will contain + :attr:`~cryptography.x509.AuthorityKeyIdentifier.key_identifier`, but + :attr:`~cryptography.x509.AuthorityKeyIdentifier.authority_cert_issuer` + and + :attr:`~cryptography.x509.AuthorityKeyIdentifier.authority_cert_serial_number` + will be None. + The generated ``key_identifier`` is the SHA1 hash of the ``subjectPublicKey`` + ASN.1 bit string. This is the first recommendation in :rfc:`5280` section 4.2.1.2. :param certificate: The issuing :class:`~cryptography.x509.Certificate`. -- cgit v1.2.3 From cc671824ad133df93bbf903ef2d363b54b5835a9 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Sat, 8 Aug 2015 15:41:54 -0500 Subject: address review comments --- docs/x509/reference.rst | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'docs/x509') diff --git a/docs/x509/reference.rst b/docs/x509/reference.rst index 930c7f9f..d86ebbe8 100644 --- a/docs/x509/reference.rst +++ b/docs/x509/reference.rst @@ -1176,14 +1176,19 @@ X.509 Extensions ASN.1 bit string. This is the first recommendation in :rfc:`5280` section 4.2.1.2. - :param certificate: The issuing :class:`~cryptography.x509.Certificate`. + :param public_key: One of + :class:`~cryptography.hazmat.primitives.asymmetric.rsa.RSAPublicKey` + , + :class:`~cryptography.hazmat.primitives.asymmetric.dsa.DSAPublicKey` + , or + :class:`~cryptography.hazmat.primitives.asymmetric.ec.EllipticCurvePublicKey`. .. doctest:: >>> from cryptography import x509 >>> from cryptography.hazmat.backends import default_backend - >>> cert = x509.load_pem_x509_certificate(pem_data, default_backend()) - >>> x509.AuthorityKeyIdentifier.from_issuer_public_key(cert.public_key()) + >>> issuer_cert = x509.load_pem_x509_certificate(pem_data, default_backend()) + >>> x509.AuthorityKeyIdentifier.from_issuer_public_key(issuer_cert.public_key()) .. class:: SubjectKeyIdentifier @@ -1228,9 +1233,9 @@ X.509 Extensions >>> from cryptography import x509 >>> from cryptography.hazmat.backends import default_backend - >>> cert = x509.load_pem_x509_certificate(pem_data, default_backend()) - >>> x509.SubjectKeyIdentifier.from_public_key(cert.public_key()) - + >>> csr = x509.load_pem_x509_csr(pem_req_data, default_backend()) + >>> x509.SubjectKeyIdentifier.from_public_key(csr.public_key()) + .. class:: SubjectAlternativeName -- cgit v1.2.3