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.
diff --git a/docs/development/test-vectors.rst b/docs/development/test-vectors.rst
index 8d046da..6f6d9e6 100644
--- a/docs/development/test-vectors.rst
+++ b/docs/development/test-vectors.rst
@@ -30,7 +30,8 @@
* 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 @@
* ``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.
diff --git a/vectors/cryptography_vectors/asymmetric/PKCS8/enc2-rsa-pkcs8.pem b/vectors/cryptography_vectors/asymmetric/PKCS8/enc2-rsa-pkcs8.pem
index 4ec8ddc..b20176e 100644
--- a/vectors/cryptography_vectors/asymmetric/PKCS8/enc2-rsa-pkcs8.pem
+++ b/vectors/cryptography_vectors/asymmetric/PKCS8/enc2-rsa-pkcs8.pem
@@ -1,40 +1,18 @@
- 0 674: SEQUENCE {
- 4 28: SEQUENCE {
- 6 10: OBJECT IDENTIFIER
- : pbeWithSHAAnd40BitRC2-CBC (1 2 840 113549 1 12 1 6)
- 18 14: SEQUENCE {
- 20 8: OCTET STRING 1F 40 71 AC 00 42 69 77
- 30 2: INTEGER 484
- : }
- : }
- 34 640: OCTET STRING
- : FB 8A B3 5D 5F 16 A4 51 52 F4 E6 2E FB CF 19 1C
- : A1 14 97 4E 16 1F 33 05 A1 A7 6D 2F 88 78 3E 8C
- : E9 FA B4 B4 01 F9 93 83 4A F1 AE 47 6D 62 0C 07
- : 0A DE 53 DB C5 80 6B 0F 3D E1 BE 00 1C 2C 93 E6
- : 6D 34 0F AA 67 2F 90 D5 ED 70 DD 9B F3 A3 4C 6A
- : 53 A6 DB 84 89 CE 32 91 BF 5F FC 81 10 B8 C3 65
- : BD 05 8F 4E 39 A8 2E 81 3C EC 95 77 D7 34 47 F6
- : 79 3C 74 3A 24 D5 D0 DB A0 86 DE 23 E9 5B 78 A4
- : [ Another 512 bytes skipped ]
- : }
-
-0 warnings, 0 errors.
-
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIICojAcBgoqhkiG9w0BDAEGMA4ECB9AcawAQml3AgIB5ASCAoD7irNdXxakUVL0
-5i77zxkcoRSXThYfMwWhp20viHg+jOn6tLQB+ZODSvGuR21iDAcK3lPbxYBrDz3h
-vgAcLJPmbTQPqmcvkNXtcN2b86NMalOm24SJzjKRv1/8gRC4w2W9BY9OOagugTzs
-lXfXNEf2eTx0OiTV0Nught4j6Vt4pEA4ZvLBer6a3k4/BTjm9uvwq4oRGsfeixkn
-VJ27dz5ZyUmwVyzfCQww1gAAMQIX/LAPQKfkAiBuYfHHP3H/tiOIGj7Xmt3Ktknu
-j1uAoNUX6/IYQwrS87HQ1txTl19p6HMqnIBncalVRk1VfkckNCILw3c9P8xzxSB0
-sRep7f0sh/JAai2CF+nSLlLsfRoPNwBO0kvJZDeXRxKCOwmjK3DdwWuKHpar3ccF
-4cgS7dVK0tYur6XoqR/AqfqG8PuP6bbwZWB+i+irmPI24v+177AOYVkrUngeYWOP
-VKkX8Yupl9f3jTBVP1/YSlOaXZ3zXn6BV52mPjJHGY1GkTuWJ7ZCLzSruhBVsauG
-mhoVAp8AaYoIHfJHGvcZHCZvMMjINVjkkpQBq4sl/OQ+K1E30Q4Amfc8s12T+yWJ
-ypn8BhmxeAy4NbAYp4gc/u61rh22nSz8nswPNyR/mMpK60Wp61oFWr7QL9ABAoQJ
-09jPzumO/B9WQ6CQvZ0fNNvBfVSg3/OzhY0quznHGalJqahORtP1lcV1m5mrCd1Z
-8NWf7hIA/paMntlrkgRXAB36K/AqvS563TMDPWn71Jj7bErPw+8WlIeuEs6I8265
-sQpvNvpamuxunxRTnjeXyC1x4ZU+LDZT2ZG1y1G/mGYm9nRVPkvdgn0OHzQEgD9Q
-R1QRZL+9
+MIICzzBJBgkqhkiG9w0BBQ0wPDAbBgkqhkiG9w0BBQwwDgQIzREWMrgTFhACAggA
+MB0GCWCGSAFlAwQBAgQQMviW+mesguQLBlrtpFQePwSCAoDRkK53Am4vn1P8RgJ3
+cZd0GYMSCSA5bai+0+O2H8t4lTYt/zKwXAugXJ4k59ALvqJJSlciRKY+kKlqK50q
+e4Zeum59VDj4EhLMw/Of08W+omM7qAIOdujnBwn0rxTZNeq6cKj1iCLshP293AQB
+fpQBZlq0F2LMro+n4b+r0eiZvE6Osyr/Da3EcG74d4CWTAwt7eaZ/MZWfekeRoEE
+wPm2ne3hTPfppSx4fPQ5wnMOWk9grc70D/sHZx7AvYiWmN1xJf9w8e+1Tv+MdQJG
+6fd1qyMi15dib77vE5PB3+LVdZqDu/VYaxqaxhzVnmiqUUDWuNFQEeMOuOUULXRW
+Qe93ZKDq2g8cpj+tv62+qfTU+9UUN4EUlGjFKTAK6OioA3gbtWLNhy9Gv6DqSAHx
+k0SsxuMswBrwRYYTJWZVHrcWmGaMk1F3KinYSjpr9cy/2vtTp0/afMp/+2054gu8
+xt7ruppF+znEWVF5AO9mv29Vz3Nxc8MRf44Ml5Z7v/B9bwqRFW5EtJkFKfllQtS5
+hbqUy+JT+91h/ZAQmiuHrEtJ4biiBSAgHMGqBoElcl118lPubS1bYb9KDJgiKT6q
+IzKEKKWlJTgcVyXTA1EsMDmEKMmH5X8R1alqm4vdrsTyHYOsXDCI8OvNA65pDt55
+t3FU8hQfVTeW+TpHlmXI1BGWHh/k9AVGprLC4ZNm9rssKK6z3baQofIrC4yERg7t
+5gJeT2tHe0UXMwOl2HtVIp7xTuKmeKaJPIMcp6bIBSg/Z+8JRcoPChE/dFTRowmO
+6pUJDwI3seNp8WN+L2rmW6fTcQpstWzh/ewVxBtq+IzXu8+/570eIeaTu+nEZ2pf
+81eu
-----END ENCRYPTED PRIVATE KEY-----