Merge pull request #1341 from michael-hart/ec_vectors

Test Vector changes

2 files changed, 34 insertions, 5 deletions

diff --git a/docs/development/test-vectors.rst b/docs/development/test-vectors.rst
index 2682d37e..e9ab6123 100644
--- a/docs/development/test-vectors.rst
+++ b/docs/development/test-vectors.rst
@@ -29,7 +29,7 @@ Asymmetric ciphers
 * OpenSSL PEM DSA serialization vectors from the `GnuTLS example keys`_.
 * PKCS #8 PEM serialization vectors from
 
-  * GnuTLS: `encpkcs8.pem`_, `enc2pkcs8.pem`_, `unencpkcs8.pem`_,
+  * GnuTLS: `enc-rsa-pkcs8.pem`_, `enc2-rsa-pkcs8.pem`_, `unenc-rsa-pkcs8.pem`_,
     `pkcs12_s2k_pem.c`_.
   * `Botan's ECC private keys`_.
 
@@ -99,7 +99,29 @@ Creating test vectors
 ---------------------
 
 When official vectors are unavailable ``cryptography`` may choose to build
-its own using existing vectors as source material. Current custom vectors:
+its own using existing vectors as source material. 
+
+Current custom vectors
+~~~~~~~~~~~~~~~~~~~~~~
+
+* ec_private_key.pem - Contains an Elliptic Curve key generated by OpenSSL 
+  from the curve secp256r1.
+* ec_private_key_encrypted.pem - Contains the same Elliptic Curve key as 
+  ec_private_key.pem, except that it is encrypted with AES-256 with the 
+  password "123456".
+* ec_public_key.pem - Contains the public key corresponding to 
+  ec_private_key.pem, generated using OpenSSL.
+* rsa_private_key.pem - Contains an RSA 2048 bit key generated using 
+  OpenSSL, protected by the secret "123456" with DES3 encryption.
+* rsa_public_key.pem - Contains an RSA 2048 bit public generated using 
+  OpenSSL from rsa_private_key.pem.
+* dsaparam.pem - Contains 2048-bit DSA parameters generated using OpenSSL; 
+  contains no keys.
+* dsa_private_key.pem - Contains a DSA 2048 bit key generated using 
+  OpenSSL from the parameters in dsaparam.pem, protected by the secret
+  "123456" with DES3 encryption.
+* dsa_public_key.pem - Contains a DSA 2048 bit key generated using OpenSSL 
+  from dsa_private_key.pem.
 
 .. toctree::
     :maxdepth: 1
@@ -135,9 +157,9 @@ header format (substituting the correct information):
 .. _`errata`: http://www.rfc-editor.org/errata_search.php?rfc=6238
 .. _`OpenSSL example key`: http://git.openssl.org/gitweb/?p=openssl.git;a=blob;f=test/testrsa.pem;h=aad21067a8f7cb93a52a511eb9162fd83be39135;hb=66e8211c0b1347970096e04b18aa52567c325200
 .. _`GnuTLS key parsing tests`: https://gitorious.org/gnutls/gnutls/commit/f16ef39ef0303b02d7fa590a37820440c466ce8d
-.. _`encpkcs8.pem`: https://gitorious.org/gnutls/gnutls/source/f8d943b38bf74eaaa11d396112daf43cb8aa82ae:tests/pkcs8-decode/encpkcs8.pem
-.. _`enc2pkcs8.pem`: https://gitorious.org/gnutls/gnutls/source/f8d943b38bf74eaaa11d396112daf43cb8aa82ae:tests/pkcs8-decode/enc2pkcs8.pem
-.. _`unencpkcs8.pem`: https://gitorious.org/gnutls/gnutls/source/f8d943b38bf74eaaa11d396112daf43cb8aa82ae:tests/pkcs8-decode/unencpkcs8.pem
+.. _`enc-rsa-pkcs8.pem`: https://gitorious.org/gnutls/gnutls/source/f8d943b38bf74eaaa11d396112daf43cb8aa82ae:tests/pkcs8-decode/encpkcs8.pem
+.. _`enc2-rsa-pkcs8.pem`: https://gitorious.org/gnutls/gnutls/source/f8d943b38bf74eaaa11d396112daf43cb8aa82ae:tests/pkcs8-decode/enc2pkcs8.pem
+.. _`unenc-rsa-pkcs8.pem`: https://gitorious.org/gnutls/gnutls/source/f8d943b38bf74eaaa11d396112daf43cb8aa82ae:tests/pkcs8-decode/unencpkcs8.pem
 .. _`pkcs12_s2k_pem.c`: https://gitorious.org/gnutls/gnutls/source/f8d943b38bf74eaaa11d396112daf43cb8aa82ae:tests/pkcs12_s2k_pem.c
 .. _`Botan's ECC private keys`: https://github.com/randombit/botan/tree/4917f26a2b154e841cd27c1bcecdd41d2bdeb6ce/src/tests/data/ecc
 .. _`GnuTLS example keys`: https://gitorious.org/gnutls/gnutls/commit/ad2061deafdd7db78fd405f9d143b0a7c579da7b
diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt
index b16026f6..47be985f 100644
--- a/docs/spelling_wordlist.txt
+++ b/docs/spelling_wordlist.txt
@@ -20,6 +20,9 @@ decrypting
 deserialize
 deserialized
 Docstrings
+dsa
+dsaparam
+ec
 fernet
 Fernet
 hazmat
@@ -33,12 +36,16 @@ Lange
 metadata
 namespace
 namespaces
+pem
 pickleable
 plaintext
 preprocessor
 preprocessors
 pseudorandom
 pyOpenSSL
+rsa
+secp
+secp256r1
 Schneier
 scrypt
 Solaris