aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-06-28 22:26:16 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-06-28 22:26:16 -0400
commitf5a4519f7ead73cbca826f3d7c815dd8963efb0a (patch)
tree5b8ebcea8eb14f0d058ad85153cdde3a8e7b5953 /docs
parentac7f70a1dc284339238fcfbdfba4f76476ab3d29 (diff)
parenta0a22d66f2e7433411f9dbd5c70a9f8409c4c377 (diff)
downloadcryptography-f5a4519f7ead73cbca826f3d7c815dd8963efb0a.tar.gz
cryptography-f5a4519f7ead73cbca826f3d7c815dd8963efb0a.tar.bz2
cryptography-f5a4519f7ead73cbca826f3d7c815dd8963efb0a.zip
resolved merge conflict
Diffstat (limited to 'docs')
-rw-r--r--docs/development/test-vectors.rst3
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/development/test-vectors.rst b/docs/development/test-vectors.rst
index bc171b21..ac667bb7 100644
--- a/docs/development/test-vectors.rst
+++ b/docs/development/test-vectors.rst
@@ -204,6 +204,9 @@ Custom X.509 Vectors
name constraints extension with permitted elements.
* ``nc_excluded.pem`` - An RSA 2048 bit self-signed certificate containing a
name constraints extension with excluded elements.
+* ``nc_invalid_ip_netmask.pem`` - An RSA 2048 bit self-signed certificate
+ containing a name constraints extension with a permitted element that has an
+ ``IPv6`` IP and an invalid network mask.
* ``cp_user_notice_with_notice_reference.pem`` - An RSA 2048 bit self-signed
certificate containing a certificate policies extension with a
notice reference in the user notice.