diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-10-02 19:39:00 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-10-02 19:39:00 -0700 |
| commit | e8d8ec4416358c4862ad8dde042a948f0bdc3e03 (patch) | |
| tree | 84ae1100e21ca3a0b5d40c134cb2fd27e86f7766 /docs | |
| parent | 685eea4cf826135a635a1bd547e2a04f9fee4bcf (diff) | |
| parent | 2c145ccad2a2d71ad09fd7c5b0f02fabf0d150b5 (diff) | |
| download | cryptography-e8d8ec4416358c4862ad8dde042a948f0bdc3e03.tar.gz cryptography-e8d8ec4416358c4862ad8dde042a948f0bdc3e03.tar.bz2 cryptography-e8d8ec4416358c4862ad8dde042a948f0bdc3e03.zip | |
Merge pull request #2390 from reaperhulk/x509-docs-fix
document the extension type requirement a bit better
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/x509/reference.rst | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/docs/x509/reference.rst b/docs/x509/reference.rst index 62bdb3a9..87383db1 100644 --- a/docs/x509/reference.rst +++ b/docs/x509/reference.rst @@ -496,9 +496,8 @@ X.509 Certificate Builder Adds an X.509 extension to the certificate. - :param extension: The extension to add to the certificate. Can be one - of :class:`~cryptography.x509.BasicConstraints` or - :class:`~cryptography.x509.SubjectAlternativeName`. + :param extension: An extension conforming to the + :class:`~cryptography.x509.ExtensionType` interface. :param critical: Set to ``True`` if the extension must be understood and handled by whoever reads the certificate. @@ -663,8 +662,8 @@ X.509 CSR (Certificate Signing Request) Builder Object .. method:: add_extension(extension, critical) - :param extension: The :class:`~cryptography.x509.Extension` to add to - the request. + :param extension: An extension conforming to the + :class:`~cryptography.x509.ExtensionType` interface. :param critical: Set to `True` if the extension must be understood and handled by whoever reads the certificate. :returns: A new |