aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-05-19 07:23:25 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-05-19 07:23:25 -0400
commit8b8df2337049abfcfc3991be8331e31b6d116d84 (patch)
tree8aaaf0d1501766252980f24a691d8ce0170d6b6f /docs
parent2a21843a729257617579d686df30fb391143d3ca (diff)
parent71a16210c39c59bcf205da5a447777c55649ecf8 (diff)
downloadcryptography-8b8df2337049abfcfc3991be8331e31b6d116d84.tar.gz
cryptography-8b8df2337049abfcfc3991be8331e31b6d116d84.tar.bz2
cryptography-8b8df2337049abfcfc3991be8331e31b6d116d84.zip
Merge pull request #1959 from reaperhulk/idna2003-test
IDNA 2003 test
Diffstat (limited to 'docs')
-rw-r--r--docs/development/test-vectors.rst3
-rw-r--r--docs/x509.rst3
2 files changed, 6 insertions, 0 deletions
diff --git a/docs/development/test-vectors.rst b/docs/development/test-vectors.rst
index 4c0063b5..b4f23eda 100644
--- a/docs/development/test-vectors.rst
+++ b/docs/development/test-vectors.rst
@@ -151,6 +151,9 @@ Custom X.509 Vectors
* ``san_idna_names.pem`` - An RSA 2048 bit self-signed certificate containing
a subject alternative name extension with ``rfc822Name``, ``dNSName``, and
``uniformResourceIdentifier`` general names with IDNA (:rfc:`5895`) encoding.
+* ``san_idna2003_dnsname.pem`` - An RSA 2048 bit self-signed certificate
+ containing a subject alternative name extension with an IDNA 2003
+ (:rfc:`3490`) ``dNSName``.
* ``san_rfc822_names.pem`` - An RSA 2048 bit self-signed certificate containing
a subject alternative name extension with various ``rfc822Name`` values.
* ``san_rfc822_idna.pem`` - An RSA 2048 bit self-signed certificate containing
diff --git a/docs/x509.rst b/docs/x509.rst
index c8505a87..c570f196 100644
--- a/docs/x509.rst
+++ b/docs/x509.rst
@@ -313,6 +313,9 @@ X.509 Certificate Object
:raises cryptography.x509.UnsupportedGeneralNameType: If an extension
contains a general name that is not supported.
+ :raises UnicodeError: If an extension contains IDNA encoding that is
+ invalid or not compliant with IDNA 2008.
+
.. doctest::
>>> for ext in cert.extensions: