diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-11-18 18:06:25 -1000 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-11-18 18:06:25 -1000 |
| commit | c98545a2b9d2cd3cd0a694ee334244ac0b53dbc4 (patch) | |
| tree | 5f1e5df2e9197a9274746a16f3133685a676b419 /docs/development/test-vectors.rst | |
| parent | 29d74f8302294da53cbab801aedd1c0adc8f9885 (diff) | |
| parent | 899c3ac3a2fc6f14e5bb65a21f5ef78ec43744e2 (diff) | |
| download | cryptography-c98545a2b9d2cd3cd0a694ee334244ac0b53dbc4.tar.gz cryptography-c98545a2b9d2cd3cd0a694ee334244ac0b53dbc4.tar.bz2 cryptography-c98545a2b9d2cd3cd0a694ee334244ac0b53dbc4.zip | |
Merge pull request #1484 from alex/re-encode-thing
Upgrade the encryption algorithm on another thing. This uses the same PBES2 parameters as the previous one.
Diffstat (limited to 'docs/development/test-vectors.rst')
| -rw-r--r-- | docs/development/test-vectors.rst | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/development/test-vectors.rst b/docs/development/test-vectors.rst index 8d046dad..6f6d9e62 100644 --- a/docs/development/test-vectors.rst +++ b/docs/development/test-vectors.rst @@ -30,7 +30,8 @@ Asymmetric ciphers * PKCS #8 PEM serialization vectors from * GnuTLS: `enc-rsa-pkcs8.pem`_, `enc2-rsa-pkcs8.pem`_, - `unenc-rsa-pkcs8.pem`_, `pkcs12_s2k_pem.c`_. + `unenc-rsa-pkcs8.pem`_, `pkcs12_s2k_pem.c`_. The contents of + `enc2-rsa-pkcs8.pem`_ was re-encrypted using a stronger PKCS#8 cipher. * `Botan's ECC private keys`_. Hashes @@ -107,7 +108,7 @@ 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 + ``ec_private_key.pem``, except that it is encrypted with AES-128 with the password "123456". * ``ec_public_key.pem`` - Contains the public key corresponding to ``ec_private_key.pem``, generated using OpenSSL. |