Update keyfiles

This commit replaces the previous keyfiles with those generated by the commands added in the previous commit.
diff --git a/tests/data_files/keyfile b/tests/data_files/keyfile
index f54d47a..771b10a 100644
--- a/tests/data_files/keyfile
+++ b/tests/data_files/keyfile
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDMYfnvWtC8Id5bPKae5yXSxQTt+Zpul6AnnZWfI2TtIarvjHBF
-UtXRo96y7hoL4VWOPKGCsRqMFDkrbeUjRrx8iL914/srnyf6sh9c8Zk04xEOpK1y
-pvBz+Ks4uZObtjnnitf0NBGdjMKxveTq+VE7BWUIyQjtQ8mbDOsiLLvh7wIDAQAB
-AoGAefPIT8MPpAJNjIE/JrfkAMTgsSLrvCurO5gzDBbxhPE+7tsMrsDDpuix3HBo
-iEg3ZbzV3obQwV7b0gcr34W4t0CMuJf5b5irHRG8JcZuncmofDy6z7S5Vs75O85z
-fVzTIuVUyuHy1rM6rSBYKfsMLVyImUb4wtIXEMHPzdCL9LECQQD3ZfgGqudMWq8v
-3BlKhsQ4fsR0vxzNlMZfoRrZzcvBT339Bp1UQ8aUo8xBtHiRwuW1NaPNgYKX6XQ6
-ppuWuTiJAkEA030i493KnFPLRwWypqF/s6ZNlVye+euFN5NF/IeJcvb/GUDRYv9O
-pRozRS1jNx4ZB1K2xT7N9MwsPHD6j6K4twJBALdfHTfT9RzjGnae7SAQQ+CcFYFz
-JiY6386B2yUVJLFj+j5RaMvMcKQ7xGnvGm7vxtNJrt/j3qg6oavXUfulzgECQQDP
-CEVLhCd/+ZeZoz5MWPTGTRrOCKmoRqNW0FlG6PfpD1qSwh04KG44uflO0yu5HUGr
-JZG+bcj4x5bWZFMkoUrpAkEAyEgQzesKFqcbt1cqv3pLXJYQBBw6leFXgHk11a7k
-+AkexhrPYyq/4tXFO2TLk2hs7tpYgNDOqZCvEu7jtN3RuA==
+MIICXwIBAAKBgQDvJKjZuDqQ2agQjrRv+p5X62dazZ6YVmDiwExrOOaK5Aw/FZ3Z
+Ap1TA757ztYlgZNH/lHg5JLM/dSdkG6Q1I6cTC6hW79LHORjUWjkIoCsw3lPd4Mc
+brIBdp3x0PwqgLGnEa/dwFX6hjakG4aorygTzI0OwKkBgKwJOivjRqLqMwIDAQAB
+AoGBALoGZmKWcNhkt9vJZosFBU+XCtsTwB74cn1w4QE3Tf8UzoH0Ksm4wvDkpLRi
+fSrH1O3X45FxvNBBU7cNtzRqZFOn7VMsZZGqBPQW0StBjsJH5dOIRGkAWXxOFZM+
+2nrQi9TANPA9bkYSziV3GFQJdGyDqa7OO5FEXY3g6ixCrNwBAkEA94vFPuqEWKyy
+rW/jDqBF/1wTORJnsUjh7uhMjjMkeURVCZUifkvQdaX3t7s3LC/yxL/nx7fCEnLb
+JzT0i1U/swJBAPdPbQGw2g0oafAX7T0frJKe+cSOjEMc2id3c6AeHvDgfSL90zWD
+aGMZQkmnRbbo/oBtv/2HvKYhJT5pN726a4ECQQCmQsES9c44BJ3pcRmObEU3Mq9S
+iLMOVoYwwOMSKvVXYXa//eNx8hervPH4/AwdaILkdIQHFruJSo048w9AOdyTAkEA
+mVBPz2CHjOik5AaxN9dO8IZFaKjGI0TbqOPQdk6197XzXaHlMaOJLwYVpftgqIfA
+XnWrM8zWElcx84Le32uWAQJBAN0X2SkMv/MWch+AA2EsY0ALljCmMCTNp6LaZr5h
+kudMwxesdaCurkUPFIBm9PCsaXHTWWFD8pCCWUz0FPpg488=
 -----END RSA PRIVATE KEY-----
diff --git a/tests/data_files/keyfile.3des b/tests/data_files/keyfile.3des
index 638c19a..b2a99e2 100644
--- a/tests/data_files/keyfile.3des
+++ b/tests/data_files/keyfile.3des
@@ -1,18 +1,18 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,BE8274D6692AF2A7
+DEK-Info: DES-EDE3-CBC,AB136F328DDD2C0F
 
-9ZXjoF55A9XgJpdaWmF/ZL1sJfbnE1M42N7HHRDwpq1/K+afC9poM0/AdCUbRL7w
-uvQERievbAYpNeLdah1EftM6033e1oTxUMivdL4orDKcbb3qDpSQ0o0UbjavbT+d
-aruilW8zVP4dz3mYMvGbkgoujgzdT+4wM0T1mTTuYcRKQsHlg7QDy2QrBILNuXA4
-Hmye4GlSXVUSON8vPXT12V4oeubEIZVlnkLTRFGRVA4qz5tby9GBymkeNCBu+LCw
-JwJLTbQwMFqozHvioq/2YBaHDcySpTD4X5AwrCjifUNO9BnLWLAmt8dOWr0z+48E
-P/yWr5xZl3DrKh9r9EGb9xbTxhum3yHV7bvXLoUH+t9gowmd4Lq3Qjjf8jQXle0P
-zoCOVxwN1E1IMhleEUPV7L8mbt26b0JyvrSS5ByrXahGu9vGQyy7qqx9ZANkzgXF
-3hPMDuzQXMJiUeG92VsMEdGdA1/8V5ro+ceB5c7Zca5MjMzvx2tihda7BUjj6dSE
-cA8Vvksy/NX/nqHSt0aSgphvBmZP8dN6GMcZ+hT7p0fhCq4mSFEykQqueKXiFUfz
-0xCUVZC6WzOoEkc8k7xiLWQDlsZZ13Z4yxU1IxJp7llZXpZ8GkwS+678/Nx8h54A
-mv5ZlSFWWQrvN5JPQJka7aU2ITu1LUK6mXBu+DoSDOfQuqR4vQytkjOqHK185iHs
-JQtBGkFFdElkWgubPX/S8/xxoT8MoQY/c+dr6iwcswyUnSJXh32KLPGNBoqWCCbY
-jp/VYmeb117gNpEJKJhcNbrP7DoQrC3/D7JFXnOvTA/z6FOtUmz0rQ==
+3GKW34v4i1BywDddKPMXBIfeM85tay5D8+LrADXsquyBUVqioeqG/Ygz4ZYkNZ9K
+5aJUwCa0TOdn0eJkOLzZOUL87hECX15vrPGfUNeVBsh9ReFhCwqCpCc8dWLlnlBb
+WyFd5HTqikL5D2/e/MYgyMhOaBkl4ESTEZ1o3G2h1bF24MDbTEVjwK0oZCyoMbKe
+GeC/GN/D2lizQ3Yh/hYb0N+d1f0BUtZsUZsx8ml7JCm2zdJnMPviQaboeb++zbfO
+nI70ZJ0yuiUcYd0u6uFAWMX+Gnf7tZlk6k/gS3Jjyuf9YyWq2YnFfxZiA3FsglqB
+qygFM4IOGe6PF/pGuJe1daF6/AAR5Dn6S0T0sscgK+5GhOUwF2PhsDcbeVT66HSI
+BGbuEg79ujmgursuPGUAxsvi6r3yC1D1z+OL1+xlh0sWmFNjmfop0MSkM2fRvNRt
+89yVwDHKCxM/cz8dztQFuInszGOhDyJ2HATpmdEiT1h6Q8azP7NjnUCXV0OA3+Uv
+idxumV9JpG7JtAqiXcptgHkADYMgxqYoww7mwoo+2lyjbASn79BYZmI+3tB9BuVk
++oczQchP3OouMBI7Y96s1xlsKlDSXZfRCUuGBx4aXinu6OUf72+t7ipM+1x2ynxn
+2JYg15XoRV+kEpHvnLR9/cDTuhdlg2rzo5zWRDqabxDm77ALd5SXp6tEkSlIm10r
+VsahTDGDVkbaqN5VUzLd30YNVa/G+s1HSuSGPNyIlSaG8+ckf8gyfdhDR8QpCWvM
+1682JZ+jwoHWDWXIF0XBV9BMO014qR7VA9iPIzEF/K7dfKiTzxyyZA==
 -----END RSA PRIVATE KEY-----
diff --git a/tests/data_files/keyfile.aes128 b/tests/data_files/keyfile.aes128
index dd7443f..9f516e9 100644
--- a/tests/data_files/keyfile.aes128
+++ b/tests/data_files/keyfile.aes128
@@ -1,18 +1,18 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-128-CBC,B5FA3F70C2AF79EB9D3DD2C40E7AE61A
+DEK-Info: AES-128-CBC,F7A9614C20516E29ADB2DC9D079E3018
 
-iyfOvvyTPPR7on4XPFxu6CoCgTqh88ROlslM+RLJhwM/qGexbgDOzeI2CPf4XfzI
-tyevKD/pqCaCMesYJh/HDQCILdW2tGbwzPajg72xkfCD6+1NHOGoDbdQN8ahGVmg
-flAYU0iXDMvqs/jnucM7nlTGp8Istn7+zd9ARyrkQy+I8nvMh3chGKWzx/XtJR+z
-Iv8p+n/o+fCHzGvtj+LWYeUc4d0OTIjnF6QPTtPOexX28z0gXRODT/indgifNXv3
-j45KO2NYOaVTaCuiWIHj7wWBokoL4bCMFcFTJbdJx5BgfLmDkTEmB/6DEXu6UOsQ
-3lPzyJhIRxn7hNq2I47TzSAFvmcXwm84txpxtSwHTcl9LgsyIiEMmHv3lPPE1G94
-F5VrCzzFHyU7nFRdUC0mqLrCHcjDn5O4SQWfH7J/7G4OArU6lA4Z2NC03IPxEmsQ
-66Fu8GdMbmtFORdlZQtOjLi3zZwN9+NwhiUrNNdVvGNJIjIcZ4FZRZysbt7++hfQ
-/JOAKhVNC8dNROJUleEYIiqx23e5lze6wqcIosziq3tb6/SQ6fH533D8+PpcZKsC
-IlWKAQzsNV+nJvt7CI1ppWc6CtV7TKn0scZm2oOC4339gdR5xzxXe9EJDsMBpcg9
-drIdBr+3UxeC6Lc/rWM7IjSQ2YULBra3toEF6UYevngXdUD2YafrpoY5rK9IH90G
-Hjbf65IaHLTS0jA7lAvJsQEBuULQQoWENOjhp8v+UfkNM2ccyOuUk3xZJNeX19YP
-1Z09UMEKbf6ucoRCc01SBl206OAsq1NZEaodszT+mDg990I/9ACVi3LEU6XB5ZVs
+j5v8fB9pDuTc8t0D2iQpndreTtTNCS28H8NK6Pc3ad4I5ERNT8V93QTq5NGf7lHJ
+PCjcO8GMPzKodDb70GEB81ObBcHygZutW3Byn9ENZoIQUXxaW3JVI7d8Yg07c5Aa
+cKmrhUk8ncv2utbitfzEzTQsargP8Nbm4I8iroFGoOY5GKTBdMaImcmqyL8c64Cf
+vU4boaK1+OWBjE6R2POFpZVQCeNZpcsWTO6vEX0Z2+PCnlctgmnO2DAUxSeRr8Ie
+J2TDFi1+8z8aY6SNFcsymn37SeNXfi2u97VEE8oWG3snG07iOxCCjQB+dZ8t7f0D
+qHcybxcuTffIeq4tPygwX4UgebqoVn/DIq4m2GV72CcNdgFE0mtsPlXXEMUFgIqy
+glrxVkMpJbpKFP1gsbWx+ID3gchowkYSxnpJFDk7fPR4H/vGFGIBOk+6ATwUSuy6
+eRqMRQExweGx5lWZbGtt8fbwoEEDhnlxyy0iDgAhiORi4tZmramx/M9N6SLMb9sB
+WmdzF3ln6VNw+mrjnpImJJZjQE7Nd+cdgkCzdFoTn7B+paOsrGeJx5RvfOdsL4Yl
+Ls9DWvDfOydk/zxr4Sm9xPYX6oqZnhUFrJqvT8ION3IZNpE88YZw/1UFCH88p4/0
+dwNsE5LDkXkBase+bek3bEN0mH0oTIY4PxMiil3tpofUZYE4T/pugMLLWgSEdhkT
+2V16w940MdQI8qrGaEzW09b73kqSLBGZOb5CEthftlCts1vAI9KA4CJ2cqcH7x2n
+9aYJi9aCNty2PLeuf+MIsksiAQNoj3vhoXVJiBWQSCcAv6TS5b1FjbEWqxHbz6+w
 -----END RSA PRIVATE KEY-----
diff --git a/tests/data_files/keyfile.aes192 b/tests/data_files/keyfile.aes192
index 96702d8..265570b 100644
--- a/tests/data_files/keyfile.aes192
+++ b/tests/data_files/keyfile.aes192
@@ -1,18 +1,18 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-192-CBC,72F869F41B989D71730B2983448251B8
+DEK-Info: AES-192-CBC,9831127EF949CE8891358563737C8475
 
-R6ST6H9oUyFWBavUO++azbn9ga87lgeuqNMVVScOcXjguqQZdnuZq9AzwQQETEv+
-ZbVPL9w2isuXKoavaPxYyCXbZ+l6JRfWiXi6CmnfNhx4MgYpbH9BEqGbIVxA3fvu
-zFutqi+Ru6QeERshDNke6HfFjJ91WkBjNjrXcfDmt0uRGqFSWd5DSEniyaPmxCYs
-mpRwr9XESFiBkCHL+/iSkW0EZBjwHW0//RNsZKtuqVJGW/dZhDxerOGRl0a1oWkb
-IvfED7afrXMlpHokMwtUduk2TBE1AoczZ6Dv7RZGipaBR4yb9kYgIkiqFk53lg5h
-7b3WQt6TYECI7X3Q2rDgPQtUChVud0uUQYmQ5328HRE8zhlWxHGmTQMWVBW6X+FM
-ikFLRUeYBeq0UJu20DmvklZV6iDxsULLu+Rb0b8NkT+V2feSXbrP976oCSUznvT6
-3e2EOH+KAqMy5JZhTsjM7HtkleMwYQ9v+Wnbnn1OsB9drYWUJuhQeXt6v8dkm/eD
-9m6dZzivc/h1UThIuuZPo+6S7FoluIlt5uv2UcnYYdYOgKSd1Vm0wztGaJn3CSGw
-JEbebucr+5ptOHxflV5Txgnfj63sJyVd/wy0T8sMRO2znk5uVLWxf855fNXev9M3
-gA3+MXC2eGaR9DYOxfakFRwL+Z30RlIktaqDK76BZRD4sWB6dIVw5JdCXpNMCuDH
-dxlTKcP59uPAEB2VyhDvm5CN3T+bM2K6WDZFO95hKKfEk5ea/UB7DA2ucfovdayE
-Hd46EUKC4/cdUFiSycgD01ztdda7hU7hFvOkHTK7O3G1yvEwH0+jxKNsudNfbbxc
+A3uLv2ThHEmFGS7TOmSGiLonOVoA+XNEBTlWBQP+I5OnqwrHsMkTkapzbXRD7eSE
+QYB86HPYN+WbJO4TWVnOoDcZtlcUCTfFtjvLst8QkhPbmx/xfmwErvlED2o14fej
+BawhMCLeczK14m/Nbe46tTGTqasyjTl7eFvyQ4TokadkyFK3kDX2DvtrU5pHIRbm
+flmJAjMC0kfioXzx7TrmrOOvY8pu8qCTkuiO6EeB6HMboy/W3amnsP9KmmBv1NHL
+velzzuA37tICJdq+alspf6porlN19qH2DQL5h1lArP0qO5JNMcHQGp2r4b9KRGdo
+3wMMbmKztoEUrvAfZcuJQgQ80aYWxpsYb91WT0hqRoX9q6HmyuELq+/dnfpwKZmo
+YlZ3aKeUvGFOxdahvNr7ywJ+lMesCxiW0E44t+prM4pJvrQ56JbmXG21q8BDLOBr
+nOt22DAOLXTOctBgVSDDPKuo1X+cp5F9epH7PPbE0u0XFXA+8VgeDUGXolXtwfGf
+UjtvfPQdrbM8CduT/7TT1umamqYkmI1FkCQ/HMb3LeLXoZBqEBkj8EuVOZPLOIeW
+/rVOk9TKxOSdF+bQ5aF6VXbJ+KcrbofCA6PgJMlsIkz3WMwQ9JHgTlyYC+7m+FfA
+pXg4/GB6G9Nl/WDJD/xVapOQ3B8a6N0KYHW/yBbEA9jjlUTMBmFM4+ZZagITJnNP
+6/yHsF1ut2E5Gv76/35zs+Gcgs+vk4rNRVTX54lPSFwHi99450R7Oj6hi4398lq7
+dKRDezJJt/ROSlzCjVzU53aBnR1rIELa1L9F+M15nhqSb/ynUzB8c9k7UGRUBDp0
 -----END RSA PRIVATE KEY-----
diff --git a/tests/data_files/keyfile.aes256 b/tests/data_files/keyfile.aes256
index 5df09cf..6ec7f94 100644
--- a/tests/data_files/keyfile.aes256
+++ b/tests/data_files/keyfile.aes256
@@ -1,18 +1,18 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-256-CBC,53572EEEE794948AC48CB0E077CE075A
+DEK-Info: AES-256-CBC,858F24A86BA1DC0D1FB4EAFCD5DD9609
 
-p0YobpQmzHb3NgGlojpYoH+G5f1XX9snYv2GQe2tGTBQpoHh+ivHcOt85EZu9pC1
-1KRdALEwp7Cb4RYeQncV9Bfp5rItupS1TwfgKAlp7Plmb4vDcDVw+KL3PaYn52Bd
-qq5USLxCvKcl91hZXzitttH072lEj2MzW2QpX2/1hCRPgMDu9PJlBX2S+GOaYP+9
-sTWTCc1yvHMW4XGEM4P4yfRg9EOTxU5gIYWUE2JqmEGd+9I0hK2YevAPLNKHxzpy
-klCCBYqDplcVT5zEyCmdiBHIjzodlFuocZC8ncinVnsuJvpTeMQ+zOZ5rao8xm2j
-uCnnVRh7yZktfsf5B/ZKBMGyPYRyKN4CCYhF0GzbehTvBirgDELq4LHyDdnnOTwU
-YJiqo17x6S4FVNq6AubADVAbCOMFyfr+TFshI8spOwqfGFFDs8/WWL5OnBS85Pd1
-dgoqwzJAt55GyDUbGnp6hUFl9g96nvV3sE6Xe4xVE2Cpf1BtUl9Dt3UrrDrbS0dk
-pKxl2FA2H0BVKtfNBHXvWkORi+v+XZl34rZZ37B8snYIN2aOqLuvyM4fd1EabkyG
-ymMEUHJcrc5zl/7IECaHrCahqZIsLpLhGTd0MMGrkGSvRLiY5nQ4MN5tKI0fUw0S
-5KIjOA6ZX5nvh4rYgQcgN7K6dXNA2hOj5256Vv0HVwXsVhQFmCGnuo+h8XxudRVH
-RuIUaTUtl29a/2nPTzXB6MNZe7Wol8EkzuYEgyaizKr7nO0J1umg+lj7ipX/80Ji
-3ADi0yL4F831LsdAiTY60Lu2e3WABleZsvuLMWSodb9WzJXknsnFEDLGOM+HGj8Q
+7kccrTo2XAy79ZZsAhvkOfav9jShAUXiw4BpsII7s+wqvfsLPzJHfAJcKZSO4Rp6
+Wja5xdqAPhGO/kAMkfggB2g0mXnvDxc65Zz/NOcSNQhoJ65uGMmrzdMM1zY1NR7d
+bufwqH3jDM669W/LhbKJ5csJIekKwmMjqBX36K+qCrTI6oooZ8ko0BuyW16vVxfK
+pxG//gyfMgoiEvyW5k3Z+pgC4zeG579bi7ki8O2U4dtNJQ7i+6boWEfUmtNoRZij
+6GFdqoW+vfXRHMcr0uHDoCzTp3MCuon/lI7uzeb3rH/tgMp52JomyLFJ+wG2ichA
+ERGFNPzjX9UNEUP/R3Mn40cG3L0f9n5XJmp8N3xp07BWuOcUQMTkZrI4R8s6ZQaj
+p6GFIOJ3XKrJg1uw+onV5mwwmaGJ7EVMPsaCsQ+weYyefYyymSqA/lHVg1pMFoWN
+k1sSfmioROdyu/s/Ezw/yfwv0+2zNkpg5b4H6r4/gdm6LWIxF1wnMixENkhzPfLz
+kwhS/53mVrReLgObYx/+w3VPC7PHGNG1TMVmTY5+5o7Dd979v/nWSUCeG4jttuit
+6KjB77SQcBWvF7vVBZUmcS0Z0mkJ+F8OR4VSlALfUmKxfD35Q0oChZlyyDxt3xDk
+sbJSlaiYOJyt+gBmIAzywug+1+nBcfD2CVw6Jh0Kp+6m4Ut+p8/8GBjWXn0w4nNF
++rH1Y19HVdWrPMdOrUhVpYdiyebVIRW9w5ml+USAOeFfIfZMha3wtGWVXEmH7NOp
+wZGlTdZXZ5j7VXIBYtGDfTkuITtZFCFXIS4sdYaXNUw0golWc/BAVsOkz2cVEI+W
 -----END RSA PRIVATE KEY-----
diff --git a/tests/data_files/keyfile.des b/tests/data_files/keyfile.des
index f232305..ecd5f0b 100644
--- a/tests/data_files/keyfile.des
+++ b/tests/data_files/keyfile.des
@@ -1,18 +1,18 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-CBC,F87FE1C0FB9B3E77
+DEK-Info: DES-CBC,A32BD7692C82A0E9
 
-1NbOyRx5kBWeXy93eCXyidDpR3pbfgGWIIgXVCVE4/ZXgEt14A23YndZeI5OSxvG
-JWhqZ+VuiRsxeKAjo+xf4bnKLArvbshhzUKCEVsCP1d2d1xfgjsnyr8tqNiJE0F6
-7Nimjcrpw/udCk2RBVyshN9kiPBbnA+XUdOHfEnbdkqDsS5DGjq7H1kBZuHhTQa8
-Xv6ta3kbI1BGiqKDhH2H9iJlZMwpVQuJs+HqcqNEhsPm0V4kp0S3PZMbYVKpEtDO
-vh9CHprQy/nlHfq7ZAs9/2HN4/OT/5kw4JM9qQy7eo/6FX2yh39Lyz8u7PXLaVgM
-pwOiFb+zvegYts5aCXyM1nBUu9NFPDQNDytjXOhbWL0hEr1RzgK67f5QYIxWgGCK
-St4moIn7J5BifViNdp7j/RXCoCmda3Zv5PiRw83yScSlzgDdTNpm/70jp8pGSxEn
-Ib768zYEcYeeKyPar210Nh9abySPpkFFaujN4do5wujboC0VPz73M6eTeZ6iOUgR
-cX9WwkfRj6G6VQfM6xAZdOkQ2cj6M4YRze1RKLhqo0+gre76FLn8Kzf/Hjrp/0iy
-0flr/6BwLxGV49vMUCesJ9oqE/frru9Y89cOwbgcHxKJ24Oz+64OUPyeSxDMElZ8
-lXiNk3aBEuLdBOKJ8B9kyKuxNqwDoqhCsrc77Gjio+q24w+G2+KAzBEup4S9cYgp
-FiSvK8sizKINfE14f9HA60MJJzyEjTUuL7+ioL7xHGtIkdWbs/Qp7KxliH6qoIUv
-VUsT6VS1nWLDyTyMbcjMx1odRsWrLwLqIsvNIcGGwe+P4sm4LivNnQ==
+sOwd5YFqP90s5t2qqblAwEbDQNmC0HWsNgbV2Fd1gunftZarO/L32SIYEkdEUNk9
+uJuyoImiyiJN769s1pXUIW8QyPzl2Pk+lykB1XvaVvOzcEhqRAKeXmPBvAT5GXJf
+kqARjcqVnZZv7pc6pWwQkrGigXFDx3Wy3U02rrBFWiZTqgraiA0EOMZ/CU9bDZBm
+nx2inK2rw8G57JxEzn9uDyxVNJdf1xL0Ge1vNOJcnQWu0cNnIgMZCYPx6L7MubcL
+BN6wnJkZgHCHfM2tfJTXVaRGGy/0VSICwgUm7UyU6MNa9KeuLDuiD8Cy9t68he+e
+9XVfoz41D81+2Q6YKOsc+xws4WXnvMsXLzDr1lCxK0B6VP/G30Mav+DZ9HQQOE4a
+CcPCM9ep2Fx77ihkXhbuurbUsqZq0b2httFJUJ7KXzwHKi8fzN86VlEnx/yMtVKD
+Y7zEMo+HsOQGHSN35kJvZyrrve3kW8IZVJhr2si52KLKCwUdObHNsMbKbRsiHGy7
+ukwEnObbrgAzI1rme0Xkkz5ayRZT/fH5BVIYEBvlRGBPE2mreoMU0BP0cUXjZPio
+KcYla15Ay2pa3RoaoVSicuxe4TmW9rY2oqMEkGqLwuGmWl6H/qnpakR5MX/edpky
+qIo51fHolYpPqGlo0Q+3uomI/l+rILu+nl++9v63uENeP8YYPFfYFOww75i4Zi4T
+P5ABY/dWZkEPU5Yah3pcOznbDZzkDhorWZtXTMNvolb88D3zUY6W0TDfA91w3tze
+jz977r1ERLuXD7cHjtNK/6QsdnZGZx5pAIx7mIGBJN+5v/HV5tS8YA==
 -----END RSA PRIVATE KEY-----
diff --git a/tests/data_files/keyfile_2048 b/tests/data_files/keyfile_2048
index 35f6ee8..7babef4 100644
--- a/tests/data_files/keyfile_2048
+++ b/tests/data_files/keyfile_2048
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tests/data_files/keyfile_2048.3des b/tests/data_files/keyfile_2048.3des
index 1ac99fc..8b44ef6 100644
--- a/tests/data_files/keyfile_2048.3des
+++ b/tests/data_files/keyfile_2048.3des
@@ -1,30 +1,30 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,769BBE561AFA55C5
+DEK-Info: DES-EDE3-CBC,1B629C0CEE2C13F3
 
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tests/data_files/keyfile_2048.aes128 b/tests/data_files/keyfile_2048.aes128
index 847cb7f..bc6c6d4 100644
--- a/tests/data_files/keyfile_2048.aes128
+++ b/tests/data_files/keyfile_2048.aes128
@@ -1,30 +1,30 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-128-CBC,3ACD4E1226A197871FFE1D9EEC0BE0C7
+DEK-Info: AES-128-CBC,09F6885B998C878DA5DB6A603F90CEBF
 
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tests/data_files/keyfile_2048.aes192 b/tests/data_files/keyfile_2048.aes192
index 7df17ef..cf38018 100644
--- a/tests/data_files/keyfile_2048.aes192
+++ b/tests/data_files/keyfile_2048.aes192
@@ -1,30 +1,30 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-192-CBC,0FA7D4B72A5225AAD0A49DC257E29504
+DEK-Info: AES-192-CBC,C3122B70EC372C6C99AFF447A1D84E0D
 
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tests/data_files/keyfile_2048.aes256 b/tests/data_files/keyfile_2048.aes256
index c4528af..3cadb3b 100644
--- a/tests/data_files/keyfile_2048.aes256
+++ b/tests/data_files/keyfile_2048.aes256
@@ -1,30 +1,30 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-256-CBC,511900B2A1B48AA3743724F105949A8C
+DEK-Info: AES-256-CBC,5C4224A75B008756921BA509FCC77A53
 
-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
+nw3Mep+219ueQNBL7RhkmesgREtMPl3yohuuqHupVs6uPaYWAheiV5rcm+EZiLlO
+ddAv1DSTCLjB8Xuo0Y5DjNTr33C+2WGrq3yrCKq0xSMkHMmA84fclskk/YYHkFKe
+oRNng+Zv+S87IflFUw4M8GRi2a6A9vUj9699rvXTlNkzj2iOPJqckBX/qRnSwa3F
+5lCe0A/PgZ4spbp+FgYnKv3VKFjkNR/eE34K/F+H02CVyzUKZsWnrmMIkoLn9Z9J
+Z9EagIWMNgGVWpMEbnnG0vgv361ZTGkAqW8o0WRY/Ptr5MWVdyaLogopGF8HPbMT
+CIztgQ+IpOwpTREeIK12UqEi7sPISsFHdeayTFwKZEjKPOXHe3tqze7riGAvNONI
+wUe1JNAjSH9wyRSvnOjafUG96KWOeNwHB3EpZeZ3Rf9KPsLklXo4Bdh2rqpsiIrD
+WpKjVtzdTh5Nd2ce2RYGjqmwKQLVpf91RHEyyHOBHCMsQ8NzaH1YA13RXQTg5sXQ
+PHn57cQv2Z2RgBCEFgNTvYu0F8HHq7b6phb4CBenBOGpGMFD5QzWO0yTLDsZI01h
+oVZbBALfhBboe0NauJyR86GRtZYdq66mfrp4En8ugzB4ifm5K0TLSmAox9pxKgKy
++93XfEMZ8Z8VpOprOIQEqMVRE901fVzrRrf2QjoGhdWoopAxofDIo/C5JvhkxSB/
+pfm3G0wqjsEZhA0sDbCuAGVpUQmrgEc0Wlm96fOtb3e7Ya0x0vdIHDvtxvrYrSjp
+iTdhYq0DRzMOBnppVqdQWZRSrNJh0rcRMO0VMYLc7FBUdW4siX7M8WpwPM9yNnET
+2hOOPv8eZdm9zq2A3rrrd0OU/BRtT7aFAW3ZdE4isKL/4Ky3KKYyOHnM4g+GeA/L
+RHWlvnLAIo3JoetFwB1VnH2y6PTBkND27vFn3YUrkYerIk9Bp5uNfhfhieDaXNy6
+hnUnit0Q4VrobXSLvNt6Hm+cAWlYa2d2EQ1pyUl1RMrvj8l2ad3NFVNdBEN680v2
+yvP+OBTkhDe5XvVskpUbXMyhWoY5lOJWMsDdXg48vffJmwM+eSsmEzocFPmjElYt
+39NRsBJ4p1AbdpqS6HiV6ErjUh6qKANnsNwZEF98pGTR3XfsoZWlgqlKTZH+5OuL
+N+o7218DxiTcFuy8/tx9zsoZHymQFxWLUVeWQNKoZEf12nVusvHlLKSppeHHG6ab
+3AxZ2NICNmELYnT0LxeeQL88b+IAMGEkp1gKY5UE7b71/hu4YaIKV9YUPe48fcnn
+tY8gioAQOfhX2yywBQrRopgkw/H7ehh+dC8J56gDQg74aY092dgTQbPcvG6RMZnh
+n5B9GpJSrr8xwRczfIvm/aLoL/fQAu1EmfW3IAcTZ9sfsMSg7OGNmgSp8OqvZIlI
+2qxn1Lgo7Px0bKsw6aBBbrB3J6Mi8NWumj6ToX9wNFr2i3qldKKOQ9pGiqgewqYi
+3lH5Cx7BDwLQOyTo+JMfi9pcUCfXDd8N6t6eD1sAU4FFo/9hVtX36MNKn/nC0Vzc
+GxufVFCtKOFvqwkegRDh0izD4VrXiE4+URxis+ux56x0G9l/3c4ACYxB9Wrwi3Vv
 -----END RSA PRIVATE KEY-----
diff --git a/tests/data_files/keyfile_2048.des b/tests/data_files/keyfile_2048.des
index 048fe79..98b3766 100644
--- a/tests/data_files/keyfile_2048.des
+++ b/tests/data_files/keyfile_2048.des
@@ -1,30 +1,30 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-CBC,4796A5CA4097FA2D
+DEK-Info: DES-CBC,21F054678F8CF188
 
-Od7a7T2LoN2Hf00FTfCe+ZMu28YxdKLYKE5WF8YFC9FxwcO3mYPo7ROHZNG3sxvC
-Er0NpOKSOg4Ni4QQKLCfiTljV07dK6Cy/fi20a74x73Vs/AC241uNlDBr6/R2Aht
-nQqQxi15mjvofHPFtfG2wxhAMVd1j+hYKjrV67+X7x2GHxthRZu0vy0wC4HJSZWT
-1SigoP6Lh6lbuaGdE2qvgqycD8NYLPEvYEyVr9FnnXg2W8wtSA2x8XqpHc1szwjO
-XCSS2NFkkwMU7sVEzhz8wufbiG7aTFgQ4BNY6CN2u4sbfpWVH06vITPjVXeSdqbh
-qD6jXSJbUyk7uBcRV8XUxuiOzzLQX7ijn9Hid2pX+TQhkKNYUZv1L8MrffYln2+L
-txRYlOn0zl9T84amHwbwvRDjbrO0Kby3kbquGsL6EpHcq5HSSrPzqGjJeYOF5Ym5
-/xO52cz1YGU340eEJ1K1liW17pym6hy8hiD3xO/H0d2CLktp1aPKMX/HBkn4i7dG
-8JmPySxMCBn3/vTps+4+tL8M63cNOOF0eb5RwhgX3hRk/bne1zvLLsZokGR4Z0Kj
-Ru14fX2OZSpzzSthrcFWVygo3jlDzNzQfmf7s8s9XXH3lKQp1yNIYORqIyyNWGab
-CRWoBNCpMcQqD3vCoi+NxbbA/tBc/TQTi5S3a1KNALqg+O+GoSM10qXFSyI55Nlx
-EOmsNpS2T18E5eFjiQwuj5j6/qzMUDqFrt8P+QKAFDedJK0VCohIbALF7tiN0QR0
-EUfx2D5emuO+oMF1pa0XXy1EiG137dscOYxkcLemAkb49kv7dH4rAmU/pBW8GpwN
-q3EVxN/0kCrS9UGU2w0FJxQy8nmkM2spnkUI0vMbDH1YWFi3hZE3oNs9VdIImXYo
-IZ4nvkFJ3DRZxtV69CJGPwvypKG7v/BoHJNsupGBnsDhIN7gePKz7LOV+ucCg+yL
-ZC+s6iN8CdvEBzmZvE0IdcGZEPKvTlbm94+uOVm7Vs5akbdbcHjUi7eeiOyYgC22
-0ACV2bKFcKbD6aDV+963luMfJxyLi/G8qUmjD4PRHxwg2C10NHmgD0fqA8V9urqZ
-OY7KY5UZ+PQKN5YyJUKWEFLT+uMoH/q7ChwwSZbxUhaN+QTskr4eVIP8n9XWGyNo
-VHlLx3tBjrFnkLwnlaTtXxcGGBQt7x+et8Imlgut9f7/w/2GKYSVtxuvLWNjfkWl
-0+QIntSyRDHI3eVss+KXSYLyp4UafktHdSi0mIx+Ia3dpPt1ZPLo1IB7xebGCBx+
-9pPVhzfAIVx4B8KME8hcsR+WDUB46KoBpzMQCrmDfU1jdr1YmEXUZFk6m5aiGXsA
-hm+VFGxx8m/eZUexvOo7JJ0A4zpQahUuaCpqmYQ9eulUCG59T6t/4mZoHrRfrVvs
-qDfHQOgCqHwACgPn4qcn8uLym3L5TqY0o7yjhRHsCPUg8nN3Kox7Wv6xEDfLLFuM
-vvNsqWvqyrPPUPV8FQKFZd4DquElvJg/YL0elZ4WvrxKs7qv7+iEGUNQQe+nRxJW
-O9hCWxvg0Sbq5+i4P8qmBS64auGeTqM2NouuXBBv82dPZgx9ZFzBDw==
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tests/data_files/keyfile_4096 b/tests/data_files/keyfile_4096
index 4999077..d9d3cf4 100644
--- a/tests/data_files/keyfile_4096
+++ b/tests/data_files/keyfile_4096
@@ -1,51 +1,51 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tests/data_files/keyfile_4096.3des b/tests/data_files/keyfile_4096.3des
index d608730..6097b42 100644
--- a/tests/data_files/keyfile_4096.3des
+++ b/tests/data_files/keyfile_4096.3des
@@ -1,54 +1,54 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,C49557C4D4A4968E
+DEK-Info: DES-EDE3-CBC,2204E2DEE853E8F8
 
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tests/data_files/keyfile_4096.aes128 b/tests/data_files/keyfile_4096.aes128
index 0953053..0a7be91 100644
--- a/tests/data_files/keyfile_4096.aes128
+++ b/tests/data_files/keyfile_4096.aes128
@@ -1,54 +1,54 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-128-CBC,6B62153E2407E123D027E7EA4D1DF26E
+DEK-Info: AES-128-CBC,04DD86A29AB89C3160EF3A295444C3C8
 
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tests/data_files/keyfile_4096.aes192 b/tests/data_files/keyfile_4096.aes192
index 203d57a..f57762f 100644
--- a/tests/data_files/keyfile_4096.aes192
+++ b/tests/data_files/keyfile_4096.aes192
@@ -1,54 +1,54 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-192-CBC,8AD7089E60B2EF8FE869EC60E0F3B161
+DEK-Info: AES-192-CBC,FD96F730C10A4F9DC895B3C06D91C5A2
 
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tests/data_files/keyfile_4096.aes256 b/tests/data_files/keyfile_4096.aes256
index 0629860..2659f17 100644
--- a/tests/data_files/keyfile_4096.aes256
+++ b/tests/data_files/keyfile_4096.aes256
@@ -1,54 +1,54 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-256-CBC,B3D9724EA29BBCF46A5040D3B872750B
+DEK-Info: AES-256-CBC,57D8E4C458F2FF1E5EED4FE0E81F987B
 
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tests/data_files/keyfile_4096.des b/tests/data_files/keyfile_4096.des
index 59d6771..fe98803 100644
--- a/tests/data_files/keyfile_4096.des
+++ b/tests/data_files/keyfile_4096.des
@@ -1,54 +1,54 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-CBC,2E1F86610218C7B3
+DEK-Info: DES-CBC,D6688446CC64F13B
 
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/tests/data_files/pkcs8_pbe_sha1_2des.der b/tests/data_files/pkcs8_pbe_sha1_2des.der
new file mode 100644
index 0000000..0fc0d2b
--- /dev/null
+++ b/tests/data_files/pkcs8_pbe_sha1_2des.der
Binary files differ
diff --git a/tests/data_files/pkcs8_pbe_sha1_2des.key b/tests/data_files/pkcs8_pbe_sha1_2des.key
index 4ae7aec..e048933 100644
--- a/tests/data_files/pkcs8_pbe_sha1_2des.key
+++ b/tests/data_files/pkcs8_pbe_sha1_2des.key
@@ -1,29 +1,17 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIE6jAcBgoqhkiG9w0BDAEEMA4ECJUO+jJnTjpKAgIIAASCBMi9QFFLgKGYOSDR
-0zyRMc87RkrvSlyRi8BibyKvTNEDq77jTr6ZEuOF1OeZ9fvdZwJeI4GkTeKkWqTw
-XDjWATXHbgTX82I3T8R2iBnv6Za9uaFDtDH5gbUYSrSNzMaoyS90hc9PTJ2+TG/Y
-xUe99kSvzbhAatVQE+0TWpgH+8oACRvGelnHWofw4/CKJXJctUO8l6LdhLht1kwd
-YXNX0xjxpY/eLGlsUaiDBdb0D9WFjdi4fcZ46IHspqTfBUhYbpDj8IQT1vjH6yjm
-cPNPstEeyfFnirvgFuHg9LXTH0cf0mJgLzgiclgRVEOel87Lei5icEFI4hDAzWna
-s3YiTijc926mD5AqQ55QXPN9v6b/uAV1QyKenoYzIWC3Y4phTTeApCyV44f9oMMD
-wzcYWMZoHzEIiZj/iiCF1uOSamIjunCmpiBXTI7OGXbxXvSSJ3aU9nJHqVT88/ke
-nj//EzWVYAjMdNYl0bOsWoIONl3eEEnLaUrOYOTVMxGac6yy/oIKR7GP0R26N4V2
-c434y0aQpn6opT+JYa83N1RwES2/NxwrHs4pcx2WShbTjg1Cw1XMHk8nQYNnM4oJ
-kXWyns/k1Bay/SXgpl2NRsoWzxCR7BavB2mRcyMz3djbOYscuT4QwpB/Wf6kr6pN
-gszegRtwLmVBehwvGJwL2SEx2CDHvJNhvoD7vbNiWeTFo1wW1wF4aE7p/Ee7gSRX
-z14OC8NSbuYV660ntNQ9LB+Z7NDT2d6JTjSnhQHxxLBwy3OnM2/vu0eCd/5+MGjN
-C4svgFsAH9qnT1VQTzmpwGBJAbD29CVvUUeBF3+up+Mr+IQU9OWWEtUZ2Fm29gs4
-j4azYJUI4+RLw75yNLVgxS5r4Cc4cKGB/P7qVqdH2CmjrEk0jxyTFT/PE3Df1cz9
-F8eEprdml2ktrlQ3gCD9fw0kXBsp5vwecpQDS3r2v980vnMxb5Cm7kMTMFb4/hMY
-z1yaDkarkSHQk3qFYtO5DkEUXhF6fwATyqOgJYwcy/9ynzItqgbsCIYMjpXF7Yww
-FNa/GQlqIbYRCd4KT64Ahus7I00vVS3b3glcC+KlDkwCJJ0M+glzHrJs3L+PiJMi
-gm+YT/5FuSqJZ/JI5QP7VMovqSLEw6y6QQHSBCOxh/CGhAL/BZ9A9afvPTRiI9OF
-fyxAaf8KH1YPI3uKIuDcms0d0gJqQoDmLafdfggd6dwuLF3iQpDORgx80oPbjfl1
-FEbU8M5DqiH+eOxgEvIL0AhMnPa4mv1brVdlxS3CyojnqxPfecXyEXrhEYJWJdsF
-aYKR5bU1bY990aN6T3EDRblmHs25Fc328xS2ZJkHNxcJDruwi4EFpQVT+fukOz00
-hOW2BEMFJLRflE+372LNIgSRVNI536YhF8r4r7O1jrw9McX3hzbJGAtcsXqyIO/k
-hxC3x5ViqgZbDYgHz/CJJfP2RC8spp2RbZ/uDJu2YI8z8s9OXvcYv0EQmBAJxdt/
-lyfkzEr/n8oRtDIkrq7lR3rjMUz7AbCfNJpqrEBFol9+qH8+jnmowL8LWBlh0v/A
-pc3qWIulXOR1pbwXyAELo8wGhnJWL4WmY252S3i0Jn8Gf2kXewMRJsixStairjWD
-1m0wWUVGSm5CO8Rfon8=
+MIICojAcBgoqhkiG9w0BDAEEMA4ECDJys7xIpJvWAgIIAASCAoBGe62XG03s7twB
+Y3Snr5eshEg5kWSshUlP0VRX8Aer46fHK8cZwWJeADjOHREFzN5zLoQGdQWWAyAU
+wuc1v8HNq7kv9/oAsq1dDCcZ0mCVNI4q1udtgItK42YD0SgxVcnGXdgldIcAgonG
+BRkimrdKnQjvIfYvI7Jx5E8s+5zo2UbjhXfsnzB1AFL4D4aCVotOz1GBhqFeP09W
+O5LCjUfQ4Tt/fk5oc34GZqUcguFnul2Ho1XzbY2DY+i24VG27sUf9A6OkLle5iIJ
+zfZfqonJxunLSukJSryw7+b+LXCKYnNVgCAkkLjKrLsQ0xQy2tyndpLGZ4n2q28D
+p6vXaVi2VJ5FusjzLDC5IIvWVB3f000E8YJDFf94OAKD0+zxhI1D/aU/K8lKbVjO
+yboZrc7KYBav0Qq4ROJOkbv6qJLIdvfMns1Mn0F214fp9DqylSLMgNcR173gYVuT
+bcd5Oi474xHHMX6zg8v33s3DEsQRzO6l8WwUKJswCdYMlOZBWHQ4TxRrHn5LglE6
+3xsdMf01FlKTPjGaoO3DZ6JivHnzqUuOLfHU4ioWC9cxCOySBh8cCk0tEPzgkzjs
+siwLcpb721jmGSEjD5A75sCN4yruplNLgNUkkrY9PjjJO7MyqENpGk1qbNUSEkZ6
+jUQdxeaS0CPCDMtCQ/mYZAZ1obkpMQy4BSiJlWdf8wqiVo9LGjU1E81wPYpjkJgK
+5i60QFSYJKMf/JzMDnz2IoyeUzre9vpRhah314PsnoEjPKUvpze6i9AoZjya0ONp
+QOAIH5Dyz+NAq06L/hBwN4SDH1d1Ik5PkTc8mMRb83rCzFPFBaYTMSaTFoxMsuXS
+SYtieZvn
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/data_files/pkcs8_pbe_sha1_2des_2048.der b/tests/data_files/pkcs8_pbe_sha1_2des_2048.der
index 935d9fa..cf13703 100644
--- a/tests/data_files/pkcs8_pbe_sha1_2des_2048.der
+++ b/tests/data_files/pkcs8_pbe_sha1_2des_2048.der
Binary files differ
diff --git a/tests/data_files/pkcs8_pbe_sha1_2des_2048.key b/tests/data_files/pkcs8_pbe_sha1_2des_2048.key
index e05f22c..49ab9d1 100644
--- a/tests/data_files/pkcs8_pbe_sha1_2des_2048.key
+++ b/tests/data_files/pkcs8_pbe_sha1_2des_2048.key
@@ -1,29 +1,29 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIE6jAcBgoqhkiG9w0BDAEEMA4ECC0AvA+c58vLAgIIAASCBMh9ku9CbE1W63cd
-HGEVS7iodjHFNt2Vsjh8B7GSQ5lyAy3wozXJYYvgtw/N4EZ8Jdmdklj+ck+s48Tr
-3giAn8huTBx4HAU70AR5T0Wjbgks+bTnRyHPxs0uZkwgQIlMFfFh/ZnhayXsyxRP
-03kTimiJ1m3Kwch495it9eBmZmEAiHRlBwspAfT3UXjpVd/8qECbuYNn/uyme2et
-BatTFTK3vKsV3msEl5/bmzc45Qga7n0bNqoNi22tI2jaqrH1ybxueoD0E+52RQXD
-ViZdEQXS7YhtLYj02Rlbmlp72Y9tww9MF+uXO1xWtSJsthNQFN9g46mLlXAOPUf2
-xWiDIrcCsh72d7sEhKRF4AXQEpDb34XziB0046yUSi1zilRswStINEIL2F/ssqme
-SMmEyphL2k8iwarQsYmUnoS4bDcWcKXkMmY2j2eZs0YMIgc4sRSnzKmwRGqvLXrF
-NQNcJqJCnJgrhTTxrKlrC3ptbjtQpazv4hblqjdOtUOc5yXgm4jPZVsf82NZlH1i
-HzUa4UT/Ne30diLxy8UAWZkPFup4Gn+bXFONEWywiYqvvpunkCXMCX9/6tpCn2s/
-K8m3+HE+eZW2RX239NYCwpFKazlQKySw4tc4CiN0LDO8rkxCyaSODej8hVqEj3TK
-YviNS847cULC0dz3UrWkBv/YBY1MzvEty9yx7TNRc9c/X/NwSUH3YFWIhATBdufp
-moTh8j0aRTC3jy2Steconay3qbdLP5zK2riGEqP9fbrNr9R1gfGNJQ9J+Yg5rYJF
-fuxJ8bmgh9mtmqgdYkhe9vaLgBmMcLjTFo9GNHLKrpHMHfboim7avQskg9leLX0k
-GAkY3vRvJqbC2M9rUVtSxNYbvbA4n1VJ9gSoLhVIXz0UpPi2YV6f3c0H7mpWQ1ZY
-fBxgUVy9hoV7q3FwbcgoUU/BGxQ19BTrSAinnRn2n4UkbnYeYnjv89SB0yBFZfQB
-u6VVXmHALMqCoc4H8EEfyk+5R4eLKm5Ww1rar6DmK3TIhANvcsrOpftZ8AoNj10h
-CzDvzhMODRwPNM994D6zo6GJh7UGF5ksZvtFreZSHCmW5YtGgiikvKWYYrwQTLyq
-HR+ytVmJhSoIpQsHMG961hZ/Qd8Tdg7/feDo+DaDidASbg3+4pZGOHCcmtrBSuup
-gRncAbxFy3C0684xbHYENbq75ikegx7VXrlYC4sDYKtw/Qu+z7cOsEKzJ4WbXqMn
-Bez5QaKKBBODEuCVOu5gfYoxcWNnUBBxmGF2LFlBU8SzHooZN/rBzIXv2I420dUo
-XxyB/7dyyZuN3+/FDDwDcWhnS6oKtuhBW2/AwlnLmexICSIkRLzko8HqvdTav8ow
-xShAP4plrwIPNlxirRtesWaDVIEcv1GxdKe+sOJOFEiAFGf+5xECeK79vq+A3Fuc
-/ih4wKFYAXK2T5dBTrg3aHs8I4qg7l2Le2i0/ODFUAjMD2/wbSBnPlJj8brdabQe
-lMmiz2iLK/HN0JGSq2CMBuF4zgPMbG2Tji1qSuKN4iSE3IJET+iGsH4zQ8SBETIK
-bbKUkNL0BhFL9R1uSOPRBnI8wu58aDLEJ+KphlHpIouBohz+b82SfFPbrUQ9zIkG
-PiknJ5EvALgdG+nOQqI=
+MIIE6jAcBgoqhkiG9w0BDAEEMA4ECA89psSqndTZAgIIAASCBMgl69v6yJiZx5nv
+sqKgaDdqe03S7YQK81v90fxRjkVE7Que6V2n3DpVDSB7xONi8prK/TlHC2gR/1Nr
+DA25wB7kNgpjT1D2S+o1j6Wwv1DMWWH+7+eAvJuTt9y2lmqSLKenW9hT500tYsom
+FzG9m+h14Aj5ELbilOJWci8ENLiS5y2cT7G6iin+udnN+9E/K1mIBfxmVTm96mma
+P+71CkGQU7vCwyK1loXh8ZaNNyuWaMG6qLkTFEGEWCfR737I02jFQzme7PLMi8s9
+bNWFTNSBMA9CL2II6tHVHsp3BLKd1s1F1gj1/D7zyV+MqyCzgnogweRFlCKqy2xL
+0fx/KzArjCIHNlgxm+6o4EJuMSBXQfDyqPgDNzpYg5t/Pob7PbnJ2AfJ4k8zk6ml
+QRe9OmWhrdCNJmBzz18SmDInlLq0/IGXQj+c+sIcghtZowu+t+VcxTvhE4FKsKpy
+lErsymCwSgpDMf+rp1U07HM48VaqiGthV3JsJpuXkA9CQAntbxviUTxXbiw4RyIp
+mGqWdL0956b5z2m7ypyIabBXjGrc3GVaBtD+9QWSl4eRNqt8rQRKBN1aWf+KflQn
+HRsnkynT3ZgQv2odn7RwGwm9iz4iNHcBlU1G+1OCPZJ6uTMi4DjVgI8MTxLD9JoO
+QbNy0ZTYhkgu9Bwr9effrr0Uu2GN9jgh/IvtCwH/iYJC3dg+f5V4MGqBQTScKvOj
+/H7gtpsdoSdlXAeUDRbMD1CHwK/xDSlO+xiLkfnW11WZhPyAcuZg0kFtkDdt3K9X
+lh5YSyL/cqGt0WbCDLNzvOuRlRD3N7aV6J8IktM6aZ3WO56YeWQzsCEh88xuXt+E
+TGJOO8SPFu1rITvbjIxJIwxjbwJY9cUXJXZrqjEzjq+tkcoF4/x8PNM/wJdxDz5u
+tbVg4lJ8BDYwfkxQL3LQbjDIwvyx5OH76gCzvILJBrO8FhcqbnHzlX41S29sWRmj
+JQ26H26SKmXks3Ty3XCla8khw8BYGXRvPnE37teffVsVZlAg9aYlXLKRadtp0duz
+WWQ7ZKT9YpXsvGmkESrWFyb8hFUqwRkiTT134fYy6ySAuYRoK3av2Y/WYJqj44j9
+eY0z0gY7uPOH0Kmb5gQYJz0hj5IOVeC2MVe3vlIuugaOFzaevQzKy6ypJcb++75V
+cHlZcVuVr2Cu/z0QuoloSoxI7K01sreTOHuN2UgN0MSQAr2O6qpT2lpWtiKjTKGY
+N/di4Fhe5Fg8axUM7R63Q058LfJw2kDfWUiL2zwWqB3NoBMCZWqX7NhofekL4a1e
+2ecGR1m/HS5+UFmC60MsNlr9Uv3SCd2MAgUAKzCZ8MkorjSNhOE32PX8+5+jtT8Q
+B6vcZbyO8IR20pxSFrJILSSR4jA1cfwKPstKnjR5LXq2U24gZ4gauR89oJetAzE6
+pcesXaxD5Q+p3FQIrUTlijDH+cTesamY8SVHATgJBJYIN3p7P5r/JoDBy2c53gfK
+7fNWEbj1hT8x4d1APvfTZI8qELtkd620CsURtsuzMO4jh4798zlvlkvIbJPWPHYo
+RNvdUxQXR5xMonks8VIznmPzcTLGxsFNNH16/ZiJeZqVFp7CqjNY2/nLszp4CzJd
+/hOagJdV7sfSJ4eosX4=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/data_files/pkcs8_pbe_sha1_2des_4096.der b/tests/data_files/pkcs8_pbe_sha1_2des_4096.der
index a73a212..38cecb0 100644
--- a/tests/data_files/pkcs8_pbe_sha1_2des_4096.der
+++ b/tests/data_files/pkcs8_pbe_sha1_2des_4096.der
Binary files differ
diff --git a/tests/data_files/pkcs8_pbe_sha1_2des_4096.key b/tests/data_files/pkcs8_pbe_sha1_2des_4096.key
index 2ca214a..f3f7fe3 100644
--- a/tests/data_files/pkcs8_pbe_sha1_2des_4096.key
+++ b/tests/data_files/pkcs8_pbe_sha1_2des_4096.key
@@ -1,53 +1,53 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-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
-LF6ihYqh9JYWVY1SHkFU1hxgKgz9Gg==
+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
+1Qs6LGLS17QGzDwCa3Q=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/data_files/pkcs8_pbe_sha1_3des.der b/tests/data_files/pkcs8_pbe_sha1_3des.der
index f2ce029..7b36c36 100644
--- a/tests/data_files/pkcs8_pbe_sha1_3des.der
+++ b/tests/data_files/pkcs8_pbe_sha1_3des.der
Binary files differ
diff --git a/tests/data_files/pkcs8_pbe_sha1_3des.key b/tests/data_files/pkcs8_pbe_sha1_3des.key
index f9c11ad..07b47f7 100644
--- a/tests/data_files/pkcs8_pbe_sha1_3des.key
+++ b/tests/data_files/pkcs8_pbe_sha1_3des.key
@@ -1,29 +1,17 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIE6jAcBgoqhkiG9w0BDAEDMA4ECGhNuQogiktrAgIIAASCBMhfcb+Jt0YOgGni
-IWnwmmtYT6Nvina/j3FCGzcHCDyUQDqh1rPUtZnmUdM3fyEGlUJdX9wmHh3gUkWx
-JE00QMzYDQsUbGrt8H3rCQ+aXegCicXAyBgDh0YUhO7bWmgJNSvZOduIeCJ81mnb
-xtl3CGgaYVOWspr458crtvn1Hlhq0EGs54EUHWBE89PHNxokGHqkFQcdp7QHO9Zm
-ZvjTn+kR0K5KQbeQwMf3LcboueDV71ueUZsHlTSZ5Qs7WZORRzMBoo2SWV+Mh7U/
-yAQv4i6CMauVifVqTMbLtfdTyZCts3N57sGstyqIruE1Jwg8m3i+cV/QIh9Fcgo8
-R+snSlbOZMzCpUIvcuVkEMBP8+89/BtIabXL8SoTsD6v/f/YJfcw9qpOH+AoA3JG
-UZT+0VxfIk0JUkX8QvM2qMQYY9efX+Dq+N0ODS1vsdP43pKxowOQlQUPKOsqoDch
-IXW9qDD3uV+clg5L6BqDbX1O98oegcg6L24ZK1yKVzotiTj/eaZVpzTtrNYzWB0+
-qO9FTwLqOmIRcduKKu5zctC7QlpFY3U2ikbkYpPsam/9GSXVe0LuMRLleiMPQUdU
-ZJlkZr221OGq5TVhyJ6zEwud26wExB16tLU26ZvEFwExoUPboH/UQwX8L9vd8BKp
-a32u35n5MOn+54Rfa4qfpU+uLB056CCKL8PwVLN9Xzeg+gJLfWqwEalPmSsylakO
-7+suOGaUKy1a/uszD97dKk3Abwfoyb0qvbdF131GR04NYIzkQl72CBlxuWqVUt9o
-pmwsUDAzwoJWi0sKy0dTm3KZHLJ+3OMIydod3beS9uS6Yro6NJBN5EPw3PoByBF5
-DUkOfW6tV0dlHyXOuwU+JzBd4iwJgO53GVPAap8a/eOGgNCiw72gYM4lcHnwShL0
-/v969VqntPXb7YF1hMs6ef3zTmLEB4xaXcARynnNkZnpQppxSPeHeXU+KxZCjkLE
-brzHFnUMr8UJOyra3C/iXfi/OKJcBIURc3oY29Q45GBcV0s/W3n8TVF4qEqtbv3c
-NbEmgcdzLGA28XiuyUH+pLxK3qP54jlqhd22q5qoN/gz4MKG+hJMMcO00Hj7+4Fb
-fnxxGE5far3zjHLaxfnRKIfseU9DrQVh6gTg8ibe0kdoUXrptIb51eRcukE7s/yc
-01Play8GYik4x+kcNAmQT29EslB/3RcrWH3tZExJjjDaC+Ty2atCMmlLGxt7VHOa
-C3k0QHYSE/TULBldB64S1vVFrZgzLFTlXKGm38mOGCG3t/lQQDTo3IAp0YE+atM3
-VG6ON3SSU0QRP1aEkZY8t9rf3+/J8Nl8oF4kF9ISzLNhlR/KJlNkmDvG/ic0skJK
-KYezuuYH8/eEr9ZFfBsb9mRsFCM9iBZl/XqebCCC5/kfXzL/Hpp4f0L7DH4C0f6L
-LbMCFhvsCNGh+1pdIjN9hbAkv/r2NN8+MaY2xFk0ukLfKgpLp0EfpkkcM0EZcvFn
-j1JpB7rshCLj4PzM77fLh99H4cffL2qyzXqFF2Y7iW28bW/RQFxYwpyEnowrcRH/
-11Qi525SdKWRkb9QlTJqFI6wsWe5kmYO/kDqGUpGPGK8+XTRTFjTci7NPLqN+s0w
-Z4/b5SMVucBKq9sUm6g=
+MIICojAcBgoqhkiG9w0BDAEDMA4ECNw/X4edWXVbAgIIAASCAoBDmCn+YmkXDXuo
+6tdZqaPmpj9cCeBl4FOaID62I/6Xfh5if2Vyb3NVqyK2c4pYVc1yQpFOKK5dJuN+
+EyKz1L3Ey+IwHfXGHz/VjWrxuZGvrxy1ssM72v3Ev9zQKO/+LT+hKfkAxrD6jjCA
+heiKJqFaDeV3vkBJIN/L+wyG2pfUzYu1ZJTa0s3BSquiS4MF7L33nuTQ6+VEvVBH
+OfufPVD2eqCAYtc4FJz5329kOf54ul7shdsIp0EII7bjmGSwbwG235Wk4jOkIkMg
+EKV1UgeMXQ2yMFwOH+02xVFj9iHlMq9gVkWVxzAEv92FNqysageyvwV+LiBQu3rz
+hahAqoI7uL1aIRmOyNs1xlSN46Ztr9/giE6NZ3lMoivnSncxXbyUsrwp2EepEjLq
+3szsV04DOBAF1CxBlg0AI/PXGDe5pyFrlWj0aaU5YgQR+v2DT8BPheZASbk8Mo3d
+WP+GKahSJRBUI2C28rV/aQWsforW7Ml6Sj/iqWBQbkNEow6FICeusFY7gxYjJdPq
+QsM5Ncu9kxXPJCwfwPuguh9BbIUJdFl6J1lW97RF5M+XvfXm3naBu2PVQbPDAwde
+G4DpEIP3ckOrnJrNL9Ewjk6upuaTO/SzL5EDrK8jygpmkPe5YpLRmwmpr3lLlanV
+Nmqv0HC/6Mxjh0E87/wyAD68/Sv4CYFvWBE9WD3mFc1ZHadJmu++W3q0X1SOJpOJ
+z+Tz20bYdbwo9glyeyh9rHqTukpAtyLpJ4RnWw0BqO4CTH33AJas82VxHKOWGuhy
+QXKiPBronsVP8omv0+HRPk/O8fkff90NZ7wivihuZYYqewBVzJOtSwDFBp+pTf/b
+kL4GqBE3
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/data_files/pkcs8_pbe_sha1_3des_2048.der b/tests/data_files/pkcs8_pbe_sha1_3des_2048.der
index 582bcf3..1cd196c 100644
--- a/tests/data_files/pkcs8_pbe_sha1_3des_2048.der
+++ b/tests/data_files/pkcs8_pbe_sha1_3des_2048.der
Binary files differ
diff --git a/tests/data_files/pkcs8_pbe_sha1_3des_2048.key b/tests/data_files/pkcs8_pbe_sha1_3des_2048.key
index 2874f50..cf4f4eb 100644
--- a/tests/data_files/pkcs8_pbe_sha1_3des_2048.key
+++ b/tests/data_files/pkcs8_pbe_sha1_3des_2048.key
@@ -1,29 +1,29 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIE6jAcBgoqhkiG9w0BDAEDMA4ECM3pCBusaVRoAgIIAASCBMgZZBwVJeBPrqxX
-hi7/gjk9K8Vx/YJa4nPH2oJdye5SiS0/q8ASZqRsn5jBdPAJBHDiFRWy/41FaTlx
-s7vsT7742TYD/e+ZVHA6UaPJdhzECX+GvjfIhBOd7y6Eiuxij/ZexslcrZRwbYVJ
-5+H28KdN3AWY7ACq21t/lwv05cOcy1NHs6oqQjm9JV+8qxh5HuGP9SYNpN5OD6Hr
-ai7I6q7v+U4qd8kvtLcoL3rkLTxQncH1f6hZeKlJMCJv43rtwJWE26VnKDyGrbdP
-a4vXwk5HwytHTcH9uvK5tjTmPRC52go82aviax6Fx/dvMhsTwyVqw8Ywap+wD4MS
-8BTpDUyO4v0VEWc2zNk3c93wkHUjXRoG5O6BHhJG1sVIPgzUeCZyjHB3gVHDmYTT
-ZQ3FLyqQsEVefeiUz+s6LbDwXVLZVhX5PSVnetIVxRkkeCada0fA/fjhFLKucK8k
-vsim891a0VdLll8lB92pvuQD3S0JpTW3EdeGUBxMNHgx3NkfZMEFObFgG0mAEy2U
-9ybc574YxfVDGMMCWrt83L0F3LOnLvqOjQSsasg1QjLAvqruyeWtmWFgiS7MJ9VI
-6oGG8ZnNvXIQ5AG4VdbrllV32oi4JugJ8LrTrjnh+r4pd8MrEB21wleWIPe+jeZa
-dmgQKJ0r+QvnejsytlXIFlQ6eBB+cw1qo4mKI2DnwUAfOBu7h/OSD1oRF/+Y01WP
-9ptC1CdTdK8mCD8QW0v5Z3FLLUIlONdig4Fq+se4Uwwq5JlFypWFE5Er9l8DTb2c
-ruZoEjhKnL8cW1I0VBr89fhCyutlyKPeWMNmzdBt+U5NsKB1arqDH8hssKQWCbme
-65gRebXN0fWMXFONintX7sVPu2oqI+x0UA0s399rqPXmAVBHWA45Z4i/Zuvreb38
-LoqfF09rvj5roqo2HTJt4pGjFBVngNXv+8lClUixm0bdGV2dr/o39c3LtiooxRzd
-Pd0iLNAWLiQmW0Mk24WfG6q59iVSc6W0EDizbAZWG0MsV0VmOon9HtxCMqNVG0CW
-DM1UDfAJ1D2nKXaAuj/JFsCvJ18M5M6fvETi7WOCSrYgIgmNP7kum04+fgAhbV8O
-ehwEBag9e1/L3NVkySrM0z1tRWa49dxtL549rKdNAfOrwHZWYr2WQJnpXwWpEOuJ
-Z6s10S2XiQhyl41iK9EA7Kouowed3dOzJavsm9Wpnbm5i/3CTKps5rT7bSMKN3hq
-n9xPQEJUdc0lvG50LJfIWB8aHQIpsAUUyMOKHesKRXV68RMfs5aVUMP6jIuzqrbC
-OLd5SDLUEu+LKVfaB71eCExVEuSVqOVum9CJipMjzXPZa1AOLvr30t/pZpRWutbs
-eYIBVfJDgLtvPGtnPGOQEFbZBqCNJLWIARYxZZhVnnNAfG79ZJ8BdI7tl3tkpDM1
-Fn6k67yHfjS7n/rCFBKo3KPZHnwSUpYtQkTuHoqLQT1yBKjTV1qHLJLvsx/QUhzg
-7r00IW0gtFgTE+dD8fYbN+pEku0KqnGUS9lCw9NJEr0iF8c79FpPhyT+4E4RZeNL
-OlU93qSoPoA7BBhEcsOkpiLiZHj/EVkLJKAvYCloNz8GUb1p1sEO7rrOpqtVD5tv
-GSw+8WKYTLWZE9MWxNA=
+MIIE6jAcBgoqhkiG9w0BDAEDMA4ECNiujRMQRcGoAgIIAASCBMhkPKqJt0WrzNqj
+6mmg3kODdGl5iNHU9FQOzGRLEYa6jgoRefeVVTG1Xdol55JgMvyLmM2kPR0hQYAD
+tw2pjv9E7gsMSplrRryxFZNeDz2n9jp/lUziDCXkAQaCtH7FGRSOCu+2HE5x1J7H
+YUcrAO0A+c0BGKZbSwYm29fujT+vHkwwg/E+TEiddUDVxt+qPyPhtxjWTy+5xMGE
+N5BXJSe7kJ8oqZFFOwIO3+WPbu2jCGhUimLOK0YxQgw7cqJL1ys2tgtPnT+SQ48T
+aECllzkiJ1fdkvqn+rfR41m3HMctmdg6vIuCd1fyKXEJColbQIbDDM9yBKz1APR5
+nmQZqQm/h9kN1EfcTh6pZONVI7pczsuZx+zfgNpS2oQIHEJy/vlKimMjd9kwRJjx
+2Ccd3tGDnptQ0Nv1o8CHf5c3rvuB3tQV2XOZYAjKb09KmFfsM6BB2E02+cSiVa8f
+LfqFvBNsA5Ti6e12VzCiW5pK83zW5QlPfv8H4VjJq5vA5KEF2hqnvbKog1OLo/6V
+TQjlgqibWFQeCpiTB+zdqaA+j9qiyDkGxZh7zzAtZI14QkReY5Z14Himx5FmUlRl
+bu/enc/pkkYfuu/Q+c2u6WaGUZfIW8RWvKN0V7dUqsCwynSVcO3tEsvHwsIASqGQ
+p+v0e6cjxXHkOB6tkhooMxte7T25geZzclJnq1gX8Nd3HibSF34c99z/6XKvmwmn
+38mmHySj0H3C0F3wGSxnd7N66xVI+3ivmPrC/13u0ZNHUERI4Kyak58jJ4feWCLW
+0UtsRTXF2UwaqiRLFkPn4jNQltvLQXEITk53rqH0IAcawFQyoFjXSp0iMbVrXgoQ
+Eb6nIcCl3yOwUy4mGzv61itve1HdxY+47ZixZt0r0lYb+CvIIp7E6q1JWWR5YrG8
+OhSu49OMX1RnuzF+thvy8Fl/disd5hEfW1i8ORiaz7xl0MP6/sA26AnYXUzdZeHU
+Z2wyv6U8RfKfRACzGPCNPD+UhUhQpdC72BDE5z7Hrj+GSAfaOZZ7JyhB2Qr76DLc
+W/V6m2Ak1x2fNy+Zrtke4dGdT+DqqBpF10IJvtISUjJKGTeEP1OqXDCbqPqPIDXI
+7W0WskVKMMu7Y+ADGjXxBGtmSnhJFKXoRVyjUt/yHzNWdJpfxwz+s0QwfYiWj2O2
+85UxXpjOUukapY7R/b+rQP3Vij6eQ3/ddGLkTLBbYsZBmqqIZv1pj0oR+uYXanLW
+2kbZp6Uq4c7GwmkA4cJLnqcbCH5K0UAg/ArvCxZifTz/rQkvQ8ycz1dnWB/hLX3O
+zrP1vLO68Ci9VI/Wd3OJC79T0DUfY+E9KAtE40duL4+i5LouXfkb+tZx374Q+u2b
+DyWspIZaTQiSSYJWAgKCKfqrFhJLddNs7v8nK5zpgwYRcjutiZs94+9KHq6dYgfh
+TSOZYP79c6lr0o32NjKl64+zRRoOyhk2fKGd5W8x3JCTd+xt2ZAQaQTibV3dAHo5
+a4sLZDUDVD93kSc6goS3lpdB+Xv67cSMolHM2b5Qu2fH3Hu4LrKxgqYV0gmyEcbN
+RY+B8gEczz7Dk70J+L7kHW54ajzoqWy5OZ6RvapYpcTC1qrdnyfeq4Vl+F23MV9i
+nG5wW51p7CLhHgXfUho=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/data_files/pkcs8_pbe_sha1_3des_4096.der b/tests/data_files/pkcs8_pbe_sha1_3des_4096.der
index e8cefc0..e3a2ddb 100644
--- a/tests/data_files/pkcs8_pbe_sha1_3des_4096.der
+++ b/tests/data_files/pkcs8_pbe_sha1_3des_4096.der
Binary files differ
diff --git a/tests/data_files/pkcs8_pbe_sha1_3des_4096.key b/tests/data_files/pkcs8_pbe_sha1_3des_4096.key
index dd41447..f4c093d 100644
--- a/tests/data_files/pkcs8_pbe_sha1_3des_4096.key
+++ b/tests/data_files/pkcs8_pbe_sha1_3des_4096.key
@@ -1,53 +1,53 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIJcjAcBgoqhkiG9w0BDAEDMA4ECERco3jEpSnjAgIIAASCCVCJNnraMGeSuvti
-dMhpeToMlXLeiua/x8BiBJjOAyonM8s0v1mLble6n3kecyOb8Hbrlk1vRT944/tL
-yIOjolOsQDjs8eFzR9/aZvgizFLuC4EykuPDL8T790k26ROgM9a4kEq+cBX1My+L
-vbDN4006SONpS7MM4BjydN5XMsQEpv1WOLj8ecu7C2Dmdp82Khg/ldVZAndRcvlZ
-eiS+aT0JXg++OeQyuArXPMM1MXt1IkfO2foBIrJx/WN5BjMfgnMSC7EQur7geGhf
-DxzXvDcLkIMOG1dHz2vrvA1ck/TUbS4WnCli/ERrpXvza2ZbqEktRS/bkYKNPoDJ
-TQdZwDvmqqfe9p3dfs+TRKicqHi1WTxndTvICcofzfO1doQ0MWkJmQrecJJ8ny3j
-11DN1IZDY8aiVJ23Dr5Smq7tmQrAnEzWHJFCCcpkS4NLpGwzzq3KspRuM2ZOrGxq
-GKtHaDJ1MEBw2Lkbnmf78qrq5K6ZjpovLcgPuNhcAeycowiE0Aqpnv6UQB3eo78D
-3Xl0XuU48slTO5lwMi8It4XiCT15Q2W9fE+iy8+ozshk8f5MHDFUqIWQ6ZyqeOE2
-J+l3ahxF3V70XkYICbSYTrJNh42yDenoXxxlllfMxoAmPhHT4n0ZFUvotD5o6JJV
-4DyDmIoFzQCtH3Sld8iHHklIZOXKzUTYHakWsq76n0jVSlFtbkDx3bqdSb/KtOp4
-dojp1q4KKjyYrqLiWfxJDcbag2mCBaYcnNhxSWi9h8Rv00O8lLBi6HxRSOp3qiy/
-u32zwUM0mhy2y7YDS8HnkRxU3lvzI33ywjyreT0riGkV4/OlAx0FEffB8BqmGPFy
-Utm+4XnmS+dpkE74KvtiVqmTv7Csuli5qFyCWFvX7nmQ610Tkq/OglrZNuITY59I
-5GmEykxeejgX62wLxKrXAzShAvn3td5ZOC13ij4HAc8BrnNLidTRSc+KxVSutHRn
-Z17nkn0KRkadPpiuqFhFrleRjI3arunoI6QFe/QAF5rD8ke2WE6UNMU1a9fSe1g/
-fqTXCIgAasBPnjf1o7RE6hRBiymHyiwEi7yvRmGVrDl80Wps1ySsBt+EI0HkrvJq
-owClTHse0oNyCCin90rhmTSnCweBTCjrLw77ls6PVHrP3BluMEV4rLvkX5WXopgB
-W3PLRcRNATgN6IpQj9+nkmLQCWDtlwHipBX8qgnaeTnaqaZ+C6COPVrqq40yA918
-jN5gOun7WCcDk4luHkxGrouxoL/0Z08VFz6IiumcSrPUPVxoB19f5jv+iWx3dL8m
-uvAToRwJf/C6r1sq1AMMxbyeTrdBXPqLLi7oLjY0IjRJCDs5WGDX6qLz4+BBKkaU
-gZHCEg8uU+IJeGGD1vgf2qf2wzfI7vuplrpZJMnHu4ayrSv5Qogcp6QdnvmtUKf6
-ZkC9HZMAwcXWurc0O3OpI4tjyXdwQFttcsriji44e94+scUxUuKS2vUpKVVDoY4f
-UDSBrMtrrA76JVgnXONL2NuTExBWVLVHSaha13+04jo3fPGCaGIszc9W3k6oC/4h
-ZF8JAuKUmWRuFsninSFUnpDq9WLaN6/8+YpRkeMi5Q/vyKS0nLC4mFquL776l3Fu
-9l5c2tVbJxl7pIOFvc0JnReBLUhItcY1PU6Eycd8c9WMQ8QpKnOUc6KApWp79x1w
-ZsCOezRdzo3PMvMvH6RhP9CdJs8PP+0GN4458cFxonS5g8VRSRGWtaPu5dUB8cy3
-SaJRdOA+uwbFrceOYjy9XuXYnfNAKWaiQT0cgyF2rrXC+4IVc4G3XAFpSOt6aRyA
-iw61KtSQG/ncZKYKZvi0wM4vQYWnag7ZlynK19it/QqaOeJLuA7gbIGiD6FBamMr
-Brsg5SWHbfDe/kbRyjqCU7OLEfUo3gLBCBUn2lHyyTkgPqscjiZOgL4s4QBmkzX0
-x+wuEW4c9XR2029QbAgcBZqG3O79yDECV9ArkzKSiOsnvagTGM9JzlLihUU6cAf5
-MRHsD9opfQ1fpY/8dSFS1Ed+697hqhkd0Cw1sjJxDbTCNM1wqxOKfVaB8MqI1T4d
-E1/lLMPl6SWhEgCDGqf5IuPvIMvd7eRToEIAnX/1p3AWMd/GIk9HAHEyJDfI4VZc
-vzn93xEtZSpqegfF+XfKrTTmF0UDAKXbm0UISQ4Gk4xdJJgb+6L+6ivVyRc+7wpf
-XmXl21IaoW41lcR4OvQkG2HSS5r/sQo9KifeOcDT0MWIzEuFZwlnWOV0yOp8M3TS
-FaORXmgvdvjevd9oH3GSSyt76T7LG1myfY+5jhxo+94/oF/Ivjca4Gcw1S7sgPCO
-95BN3nL0pEUqI0nYglwryz0Tf+4SJvHUW8C2mh9Rmu6I4tyBWXlTK7jfOjn0cJlo
-gHtDpYuXh7vdOyUliCvluBmzBAzQ01tGYUMh8p9BUez3135R8GEtSKzOAoGLUI9W
-ncUFfvyJRaYGTsf/rI1SrXhzDteGoIdeMkPlVlRpSlN7t8svS3H+p4Pi98LXCTWy
-pqwkjPyWrXgJ7CCEzGMzhIOqdtvHyBJ82TA2CULGqAWEmPAyxq2hlPCw5yWfg2pP
-Xk8m6sa5KVs9JnnXXualczwbvMn8SlMlWdtYcq32jQg+aYhDOOgDf/SRyqnjiBb/
-iGxUTTChzZWDpr5Gtn8b9pAVFWJFnu/T3Lj8rP0athTMyjSQdLKMDZH9a75RmqfZ
-c5XK+S+UZaTlJDpsHiRob0m5iIywocLbs4IJVRZ+vweanDsQ4XqmDfwafIxeCeXx
-Yiu3F6M/Sejlhq1HbrmZx6qtRp5AbZGjY66jpdHCxg7iRfk5vUEkashPr+YZrsuD
-g6DnIFeFEKiw50Mie4pOGcvBrTNXWSvKQWYASv7g73/nIrJkYptHtae5cI04Bctb
-/SVaOSuNopLqe6t4Hwjhu4P4xkdf2ZGoSwE431mzflFpabLotuWgkxNfVWKgP/+Q
-oiPGc8x4Z6Pv/cpsPclcfG/zo0Wke8QuQmv8pod12+BFl+F4Hxl8gjd9GjNiNKid
-ArjjeAv03IYC/aJoPdlNoFFo1zlnPAIPv03+bvS3jSkC8WgMXomiCp64qEw8Anxx
-ugs5T0M2+T70WdQfps+YA37/UoaPTPE8n5tYW0WJqehWei6Gmfzjt3oQxtoTBCSl
-KphYNaEff7oJQwxAXBTb5ceW7NA7ow==
+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
+Ht2LPuhKmpzN1Slkpxw=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/data_files/pkcs8_pbe_sha1_rc4_128.der b/tests/data_files/pkcs8_pbe_sha1_rc4_128.der
new file mode 100644
index 0000000..bdb24e3
--- /dev/null
+++ b/tests/data_files/pkcs8_pbe_sha1_rc4_128.der
Binary files differ
diff --git a/tests/data_files/pkcs8_pbe_sha1_rc4_128.key b/tests/data_files/pkcs8_pbe_sha1_rc4_128.key
index d475ef4..c8fbd7e 100644
--- a/tests/data_files/pkcs8_pbe_sha1_rc4_128.key
+++ b/tests/data_files/pkcs8_pbe_sha1_rc4_128.key
@@ -1,29 +1,17 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIE4zAcBgoqhkiG9w0BDAEBMA4ECCLhzdwnOXIZAgIIAASCBMG8Wgfn++CFRl37
-FdQZ90pI+u37yj8v0kFd3rDaDMurEftf10gWwTbm8R8J0eK1edIAHQabkgsF83gD
-yrxKFp1zhHI1t65gPKHcirhx0t9XuClxAOzEme//iMaw/yf/IKYo9NRqyvA6BKHW
-2h3J4+JSGLSaCsRUyzhoL6xOzF+VX8zE8PI11TcqfJe7TGs/9G0Pv2XxFpfrG7pz
-nz5mkAYdckYHcu7+CQGJ09ZUkblV3MYKEEbq5xXEo4Kku/n1YNrh6BEWMLo5XgOU
-YIAkzhSfnbTt6QrxM+90b4qwk5amrC4w1jUu73ZzaBQs7fhx01pR2y3zTPBD2Dpk
-G3iLprgEFqsoGCCOqqqEiEF/xDREZEPW0es2RruQ9Tn14LbgTj5XVFI/wBcvp9uZ
-pjS5chC0/CRbGcRi47A9vx9bjgwiGCDpxx0/Kn68uFCaCeGOAQ687XxAn1UHmBD3
-esjjb7S16ld9rSKV0oXWugUZKFdoq87AHY8Njhin++biuAEfySu3iH5ajzZV9dEj
-6JHVwotuL2diVu7NU8mIsfr1kCJoUxIAbWFvoglWNmTtaIBkc5ch+kUTsz9rDtSp
-lL9fT+wzjN7Q7lyRfIhNOheg2xF9huwF6mqnSlDfvwvEJ8NsQI9+CeooI2c1Zc0a
-Bh/vDvCzov8TE+1Ma8CnrbaM/aSZ0FIq6PcpWSBLXSDXbLwabEEOLoXQXogOZsc5
-0sz71l5c8jJPlzXxFYYW8CNuxTsUP+hN2oWvbmL5YLq8P+1tw68jcdbqhTqoqrW1
-pGEXd2iMRUfCTDuCM6Bn4iIN80qUqqBAuoTC+zCVHnI7+ygmovhf/ykfVzNaDSIW
-BkDsmZoH6bq3F9HpvOWggh0yK/l1b1E4PDQ6hq7qWNyJMyjYBJEbEdd9O3GW2qev
-3ARhb0yGulxYH/h3yp2mIfxL+UTfRMcUZD2SobL+phLR/9TMUi6IaHnBAF85snAb
-rbtAKCp9myFLwG1BujaQ18fKQFgcMjbJY3gLIz+3AC72irLSdgGti2drjP2hDGKp
-RITAEydZXIwf67JMKkvyuknVWMf9ri9tMOZEvohnU3bW4g9vkv89CUtCLWF8iejM
-fKIP5hjHOcKRLvvACFbgjYCPt8iPCcQckYe+FZI5T7zYsyQQ47fygS1f7MWZblPJ
-UKAm8jxWUyySvEzIMHkoZaHtC72OS/L3iCjJ7mkKSZKeCDAzSEJeeQcOl0klVCQ8
-0P+mXq5wtGakW9MKLhmsOjUIsyN2f3gCO0nESYhWD+3EKFLSW7ZsHbDmwqSDh6bn
-blFvlQd7cpfYFtlmbxZFcv/l2ijQWPHi93G/0VIhFHxI6LegKt00bIL5iwyF3NpW
-dNzuE69hweTSKvOPqRsRnWyGv9dVLIaQPwUS+eEfsGGNzM9rbty0j5Bw6KY/uDgt
-blTfN3yZBcyEsdPwyiVLdi65zMzN8g4VVQBHFhXWPa2N4gJQVq+6q9hQkgFFU7y3
-f8MX4BrKq8ifwWxsjL2FawcAoDcHUdCZjt/HZ+9/rL3iQvKeHbDbqu4kxlrE1FJn
-0LHIB21qZIo+6r3fdNMUFkuDRBT9eEh3Wxlg8G35FYCIiOuIwB2ED/Hdnqtnemxj
-kjRXU176HQ==
+MIICnzAcBgoqhkiG9w0BDAEBMA4ECHQhpmYrGd0CAgIIAASCAn2hV4Jz28YdWGFK
+0gLJr9d41Dgsa4BgBAD+dVf1D8prnkR5I9VoPMY8Fl2EZFVIgBCfKTehR2d5jMjg
+EszFKDnSh6Oc1Rk2Xfp8zOy5lFBXbr7sGfHPFTBaN6lnFwRlxsDOdXHNpMVJkqnt
+sli1A4Myjhf+y7G7jz7t5cavMxSkVf9NiNQ+4YwdzJTDuFOHPvHfTk+4x/QMw2Gw
+IjKPyWZVYXk9biEad81eWO0waV6+wexmB6adIo7FkNFC7Mu3Yjxg+2DRnEnKRuuT
+X0+Lt7vzHSUV5+yYwLQhQSGQvuci6U9zin8hcJ7tkJEQ3kJzQu9yL5ozRI/kAXRW
+LhS4A6wGaQFSNYf4LzUxkqb/VvNnQ/EBT+BXKv/N83ja4KX6iD4X93uKlUGifsi6
+8/z3mI4e6FhO2XM5PdNE1iCdJtkw5vQZYPACVdX5LIpY+202hl/+qrzJkW09OZfE
+TbNJRq89AvpB+Z1RVpIdvnFLuNZCk7GJyfpQCDWmK2msL0XTohlf5jUB49SwchKQ
+NJ1NQM4K1JDz/yI+N39CCB7MyUEoA2bwRIpNRFDpNC/rE8ruqtPs5mhDfHqYCEUv
+DfU1Aix0oQpFKICNlxqXgmszlzthTGUvNzT7zPsePfhReIBfiOG3hmqNzmq5N7bV
+hhBzpqKIS59htjKZ1EDGCr7RdYdO/wzy1LCVyXyWZ1QCYPyyK2C04fGrDAxnOOqM
+vpPoQPswK5WbfEbVqj1z9Y6MjcYdtr92x1ZDhTbM7BAdeBEhjzfMvrKPVuZO4+rZ
+aC6TidEeAneJablTGz/uIGDFz1Nmtjb76cgUZHW0IRsFTNXVAPDRcxz3P1F5hujb
+uWK+
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/data_files/pkcs8_pbe_sha1_rc4_128_2048.der b/tests/data_files/pkcs8_pbe_sha1_rc4_128_2048.der
index 97319e9..760187e 100644
--- a/tests/data_files/pkcs8_pbe_sha1_rc4_128_2048.der
+++ b/tests/data_files/pkcs8_pbe_sha1_rc4_128_2048.der
Binary files differ
diff --git a/tests/data_files/pkcs8_pbe_sha1_rc4_128_2048.key b/tests/data_files/pkcs8_pbe_sha1_rc4_128_2048.key
index 21ad416..f3be991 100644
--- a/tests/data_files/pkcs8_pbe_sha1_rc4_128_2048.key
+++ b/tests/data_files/pkcs8_pbe_sha1_rc4_128_2048.key
@@ -1,29 +1,29 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIE4jAcBgoqhkiG9w0BDAEBMA4ECLhM7LCVyIdRAgIIAASCBMC1LBF5f+s/Y4/l
-ttdYBasNsmSdbAHr7uKFELCvdAZJrcBNjMfO/lyS+KeH4N7hG9CX+qJ5ydK5yKog
-rcjUdVixRfP0HwhUyqVDwe8L7gwzf0VDq2ObUkM6a55Gw0rcTWfz86kM0PSBgNlc
-Z1pAdMhjXMYBwSo3eH+yVbcyemWP1KyYFD4xan/RMdZJNrTIOaG/9ccFrQXsnXpH
-C42JC8cqufj3WEvRzbuNYsdlAqD7aEvSPDsHIe1SAXUUmyFBvkJtRo5xatqQ0lBo
-VDxpgx38EP6mUQ2pE4gPY+YFbn/PTajNrBv9IlDO42yPC90QAxo4OVd2NF1hH/Hx
-zoIuEKvOefr8wZjZhwosFt2MvPWr0B1tNPNdIyyihp+ZdZn8yQxWDdBgiwGAdhdz
-Misp9XphHmnRl2rpsWtThnZ9o+00UovchtQ+wFEZO59Xp8b4eM9acEk0Ktqkohg8
-4qQSYoAQkSZbPAqVB9nYTMhqolY7X9vL1/O7AsWACGlQzQUBZyUJBeT+UB5dlNNI
-ncdBQa/HmZXoF+SKmikchJnBJ3wBAcHBddw4Yw48adYvuhB9XQn3cl2YHyZENyzB
-b9jlQ5TcqiFzuZnPPwvOAOst05lYt3s08ewuPHCCb2tGiaLmIakQ9lvx8C/W67b5
-nH+E2verRjsRR2/Yj+aJBdvTuTSSKcCnEFey5wOVF0iWx5AuPdSEFf82LTeF2Dlw
-bWiAaGIJFKUcotGUHnUB3Dp8s4rLPVgEoy2wyYJzYK1NyFD736Yn0vbi5l0WuAEp
-HBTxrL28TxH6LDkSlb840bV5zPFVpKHH7Jb+jkya7iW1SGFU5bIHZrEJCa2rRiR9
-RUXvSJ7WuzaZmJa3OIsgsC8PB07zcoHdwERuVLYMoBZcMkI+/ThM4hEg/KMJ8BI7
-9A6VZ411tkTx+Vh7Qm2/t3OECeG28fogoDq5IR/qOMA8XstYGt3aJrUbMh47Znr5
-HtYmu0xFsmBGMTwZGnI0CPCyiMIwL0X3u41xP89x7+2VSAnSf9pzQWAJ2wYFWy/O
-6VrBGfK5AqLK0Him+qfPqNT2663LjzSKy9MxCqte8BpVhJS1Lq6NS0FfvLnfBwSJ
-TVrB2ERnKwgrxk2wIOAmzvsyLTpkM3OX1+rEEkjDTzcP1bDN4DseEzDgsXQythML
-quS1cDEJvtMglw5ha3dnAawRnhHSTw8U4I750ZJhcgisryCP7NDecQp4gdXKOcI8
-f3Kpew6Iw9g2uBGzySebxJ4EPLygLYzn4n5Qm1BxMx0Rtxigmz7kNVx2LSma6v6g
-ldBdUM/1wsk/wsfchNPKjzn/15sxdqE/i6CGO4BRZLY+f8TCh7T557AHVa+h/Tf2
-k0/pSyA5FSlfHaqAG7ythmvlGTgpe/ypeYsKsZzslmFEM9jYkfWbnD88sYgmZwhK
-Bbg5p67BTPad6fRzp+M2JSGTz4zID2/78zttGF9+760OOqbazTN82SVdt2Hc5kPj
-aHCFl5ZeFpaCuMojv/RbNdsHAryYpgaEwK91lh1Da6MPrq7Pc8J0df2Ns095kx5S
-XinqwOUvRMCD8310j9fISt9mBiH2BG+69pz0CTMWL3Gje78oKEVaFfaFa/r4SjXD
-01/LrZRT
+MIIE5DAcBgoqhkiG9w0BDAEBMA4ECANod10o/6XyAgIIAASCBMIhYRF0ehbnMC+T
+q8Mh/0vGvpn2rn6L++Vam+jle/aTKct49cIfHemIcWpmewwbtyAcY7b01hpbKL3D
+T60jbR6Jsf1AFkk9SliC/zS9sOlshwoNrb306ZEU3NA19zw0ezvnCZNReY50ABbr
+X6zV1zfJKsKZ+jvA7EQyAUQgVAeN6L5XpPwYxb6+CJfuM0iuolavZLVUFrIobQQE
+aI7TUnXngQARK047nCU3t4dfSnL5NmVf7uHbhffEwjvBYaHhDSECSotOCkDydzdt
+LJdtasuApmvX/c4qey/f9yIuMhDKPiIjqEVqqAriLVMs3pD9g/qxpqyrcfwQ93pZ
+ARj48cvyS0AZTeYsc3DQ0a7rOe+JnPzzIaEAeeQUW2cffa1/h71e5PoniB/imcTt
+QpYNCk2xqxJ7jLlCtfzwso1ZNeXxlLqK3jfpsMmBjAzuPdhYZFegbFyCTl+hK1DW
+CYTTo/vL+VJOcJ8o+v2vQTMA9vJYNwfwEyUN0CxXZL8IsEONSJpIg4OobgNH00aY
+yXVkSar+HHOBv0XvyfruiupNsvb0fS+U9lyLq7R8fnuApjzCas0gBgP4X1DWFmm8
+uRkdxFTdAnyo5BEDKb4SzYS0c0wxPNTKU/KLI17DPZC3+UDZEyqug18QMXl5kZce
+Kl3ofBYuVEbcQDPhzwRJ69iJ+DJZ5Jy0mpp3FYdhVBty3g+fzEqQm3DSFYiXSWz+
+W+NlmiJAZ00kk0Wwi/nfKfXpdoQ1gcUOHdcEnYEEKF5wcBJs6uLuVQALPS1tAU/B
+S04PLALo/AR28D/MdAjxkV90mCKWQahks8M4IVqXeuECE9AuXd8yJ3geF1STeN7S
+f9xkdyB9n5So9zwaaNBauMq6F6Or8bPdAYN3CnQuoodqFFzRiEwGrqGZX5ht5n9U
+ROMmkBiqGfPcQ+LISvKnzFrf0n4/+Tcn1Q6H2vpHDwaXAh4/nnQL334lG7NVsDzk
+j2alocZInPZBpb7ehL0OJlWOVzkxUs2n412Qdew61/hhed1T2u8XPT1GZTgzv3fp
+1HdBNxSv/B5m6ZIM9Qc74Ibe52XtIBrOTD9jETrCIxVEi52ClFTQuVZ7PwHq21WZ
+FfmJ3c5FxNPN6VmM++F9IeStSRTtohtds531jORKsiXiX27CYru9zaX3DzZksWFk
+e9PVbccTcw4wYOJtiYA9kIu1qNVHDs4+0xCNvZeS+92deI+TKqP98Sk1+k90TtFo
+ARwkOnCgFVhQhpumT/CmX/s6gtFq2MSpwely6kxV6n9rsVm+Eqm4GNkI0tBLwQOv
+OwZQ8zTGyZ9wqcVfU0Oij2/475C8EoRmnkTE0JhcCcdei1CUPmUwiQTAhcXiqvii
+f+W21AysbugJ1lww2bBuEvG9HOaunIYq3kCFJbrmY/NZaEOLuZXKbh4cvtGUjFlr
+BrBEc3+rmjZXXKcNL8PVLs+ENvBsgKUOcf0lj4DGI0ZDgPKgcMyLGbDDsNPtUKUc
+A9gKH1pMlIiS5gKXp+O81eOihSExTrxxnDPqE32hqMXEeS5rVoDHIBEGzLE1CTbR
+9tVNuUQHtv+5V79ie5hNweqOIcHFxM3FuwbOSDGVW54e8awj6YFQpY1pIt0n0rYw
+t0oJTQDl0KU=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/data_files/pkcs8_pbe_sha1_rc4_128_4096.der b/tests/data_files/pkcs8_pbe_sha1_rc4_128_4096.der
index 496d602..8b538fd 100644
--- a/tests/data_files/pkcs8_pbe_sha1_rc4_128_4096.der
+++ b/tests/data_files/pkcs8_pbe_sha1_rc4_128_4096.der
Binary files differ
diff --git a/tests/data_files/pkcs8_pbe_sha1_rc4_128_4096.key b/tests/data_files/pkcs8_pbe_sha1_rc4_128_4096.key
index 92e0e15..1591f8c 100644
--- a/tests/data_files/pkcs8_pbe_sha1_rc4_128_4096.key
+++ b/tests/data_files/pkcs8_pbe_sha1_rc4_128_4096.key
@@ -1,53 +1,53 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIJajAcBgoqhkiG9w0BDAEBMA4ECHvTDAvIXz7AAgIIAASCCUjmBX8AmQpI9qj9
-Eo6lmEmiUx+lObs/dCZP7u5PPftqIRtvg3O+170z+r7uYglA8RqbYFg/JmK0CT+S
-/A10tdB60Oz5hDC6KramdtnyeeH0H/KR+GkBaWQdY/7MLmC2YAtQV8toKVbuFfoX
-StBmlMTPiEtANXoJqD2l+wpIDSD/TPNRmiMTh74oU466Stxah85wUbbSoi5QlqUm
-td/cTP3A7BumyUl/PYWHx26TO+dvdvg6bCT/IJyVZt3Xp5pjQCIH/HOr6i1+IUtF
-JSPcfRVfvmWD46RjhOHTTWFUPx8gUDoMkabOD2iivmSiAYJNY8wZtqIO19EAjsxG
-RuleRANfaNIFjkz8mU1QQzct98GDX7+OKCWBLSDzzNQFWvMZ8p1UIh7PcIdEpEdF
-gSqHjLmDYk4IVNtBHg2hChjrZ+F/4chSMykehuyDwsn1BhUtRST/Atml6XoryBnE
-2imMAvq6Guu8BOUfOYJHU+FBojKox2K9tadY/DvFRXNMOw7TSVY+v/t9ZGlwTrX0
-6e3dSKBjQHN7P1a9TinOgY7nwGMowYaEv+xyJ89h8a4H04SG+N4WqbHf2+B5KpNN
-gwMlps+hT6V2/9LfJpJCb0GpB73Mxkc+RAFZVOUZlEtSyMbOgoRjF0S0IRSvP1/3
-auHEr1z62LTXsh+kAIvOOH+2zN91S5wn3xjFLepI6jq5QYk0jfyIRDcLzX5dpPSf
-Q0QJmG4Pzx7ScAUfYh30Ga9FjQSWQjGbeHwTQ2V0QbqweNfdLEaYm7mSzNAtuaGD
-y34Bta2mIQ3eWo6c/ipdViLzsCh5wBUuMXA+bWGHTPbyYae7jalnK6k6sfCe7teC
-fC+im8v2tiO/eTl+82/NquFKyRfTHWCFC2AbgAJNqV0BxBeHAKYVNCYRXXhPD0Ag
-0D7afVUFrsnL0DvLEdQ93YRV4Ykrcw8wl/bnGTRqfmAaiXkdP+gScxlWJH97r4Sq
-sYN5S+M9653ETiZlQLsELtVf9LNbGja5qK2kdr6CdYts4fQS2sxjwADGjdaP4ANR
-RwVvRsIX1uxfFI6kSwnOf6NxIkSz58i925e2w6bSv0/IDp+Ofu0fyGLECzVLNhoj
-79tzEA3dXZr7jRzf00itVYcaPxzMJMROZWgdWvKPVJAPrSEiCCvmTfC+LMAHSHqB
-6ajEO6Vkft60cfC7qRgpjKquaVkwPqSr9Wu75WTVG+cqEulZ+nJqFVUhFM6CqPyW
-ER5d3M793S7dinii8E4BiqgFtnw3DtAt4WJh8cj5R64SxoddIyXmGQY8gPunjzF3
-62frHXLeuRx18AYRCyBL0emL+AEmPiUdEM3ltKv/YA+GEZcmCI11ZXLASkvb2HEp
-MjiPH4OACqN50fb82qXurRCxNLteocd+BUO2ESyQDhFjHhH4zgWmBmSnMTUYCTm2
-KP19HV53QlMv4rwNLU1ASle5F6dUgnYTYpdQ/0UslKCSyesrfWOCscXvYYrVCqSm
-6QN3/FoUcWwGLWX51LsaBfxIzrf2hIjHbmXlYwujcWMtrSPillPZP+w381xSTPVv
-S/HEn8BKifMD2zLxF4w2MLHYO562lVGpkxdGlrufPUfKZrZ7AB6BDUBbj36GIFfN
-s7vpIcboXmaycv2FhmUlvmhyYBudB+g4pfVSUdQyqg+dQQqyrrisZXyaIQKl+RIv
-1RKb1rij6I5Ay1TCPuWRMhBK9yAEkQ0quC7Xd/1O/vVKpMSWkj5fMKNHA2XZfaUA
-NJCkap0bQyEEi5qG5HGDTD5+NVRfj4v6U0fzBsuya35hHdSsjPHbzMic7IvUesDb
-QwjQLxIpibWd2g2QHwY2eLCjLf9Sgo7rnOH/4lbFVWPiB46yrYACatnSRZu95nZT
-C3MDgYKqxzjkcl+qohpRODnR8iDosl0GgeOAn/7de/RRVhjRs7RtYg+94fJCOOkr
-LGgL8kdB/k1cVzn42z9+A6sVtKuduo5tTOAheEN59+440wO2P0CAy86kjrOCEsxc
-tcm6FLxJrtQfUG/jp3uqoWpe7WjyD2P9YilJO85QrFzfFX2VLhssQlr+cThnyc82
-iRJp/idj6dpda1A75sg14sfk7tiEs1mo1gn5LQV+/9JQjEp6hJag3JJuUqJsNoVG
-45P0Pbv/LAZ84h9E8TMfLauSZ+r5AY8heiWHahg+MiCOPdsp7TbhYF3fichCB/0/
-7dHuxP0Mu/4725kLDxFfkn/M5jtRnT0jXlzcZoVramqWPhagkvSjcpJy/csLjWJN
-VisGc6GbTUe2XvEeUQb8/Fx6MS477PZsLEHu/gtkH2jBMnbXhRtbBjVPsRQjG0mc
-g24itQD7FE3ZCwrB0m6kv2hrQfYDrK2F46oK83DwqnNlRHjMIgmIekBIwAz5AmzH
-2tnMw8F2ISZE+PaQ110RuBCTrCKG0sQPfF/7RIbeaq/aHjvmBTDxYZS2Co5Un8RM
-pxENTFdtTB+yXs8iUoeFXRrNcdXQXvME7PymTP9768le3JjtOIwq6f4dnRdlvUEq
-SnwPWChWK26c9/1G7Zml+m5Ya++Ya5RZThvDBPCMIOlu7k04IkNOBFV83AsVT5lo
-vkLlcLz8OPv/OpWCc1FcxsmXQHD3fKFI+mSM/JMyGA+VKcXedjXJwuRAVz2ZgHk1
-n3LZAfVF9IEZPgt1qFuHsc2j2YUwf4T330R9dNc5N2LzwyxLp1Q0Qer57UCI9IQR
-K3k6PszIYyHLISqniGdiokjiXidiAeDCB0Kll2sK/GFmezEefQrte3nlLaV+Wh7Q
-qo0pwTxkW96OzDIVj4sHqheb5y8Rifhf6E8NSBlrswgWCOC0DfNnbDn50GxlpCpy
-8axIY9JbPNpNlcG9Iik0bIHRHRYF6h1M54QsKXQwX12DGRYVfm/Y37l3IMYSXp4o
-sj/EpBwht3mMh8BYFz7Z9pcSGRpzUCu0Eos9v2vchwkcQJuWLztmLy8LCnWU3mB1
-ACZ00ce3SuBfbPp79ZMXVZIjz6r6fUX1nFrVh9s01Q29VFb5oatb+Mk8PHflebvi
-i/z0Ku2K5tcyl8wzIVUwHyr9DlzSXRHePT9CI0JmWnVOy/jiB0LVWN7mlEuEjmsk
-fh9h/67/JvVfpU3opyBu9mR5D0y3NSWUdvGkaFJ/my1I/jPDclQ02TgUIcuJyQGo
-V8gMphCDNGFehLwnptI=
+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
+VEr3ANKx3AmSsoHvhQ==
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/data_files/pkcs8_pbes2_pbkdf2_3des.der b/tests/data_files/pkcs8_pbes2_pbkdf2_3des.der
index 75c5734..420a296 100644
--- a/tests/data_files/pkcs8_pbes2_pbkdf2_3des.der
+++ b/tests/data_files/pkcs8_pbes2_pbkdf2_3des.der
Binary files differ
diff --git a/tests/data_files/pkcs8_pbes2_pbkdf2_3des.key b/tests/data_files/pkcs8_pbes2_pbkdf2_3des.key
index a303daa..f5d8ed6 100644
--- a/tests/data_files/pkcs8_pbes2_pbkdf2_3des.key
+++ b/tests/data_files/pkcs8_pbes2_pbkdf2_3des.key
@@ -1,30 +1,17 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQI4W7G1sVqHJMCAggA
-MBQGCCqGSIb3DQMHBAjXOQ/kHb9EVASCBMg68SwrdD/DLeKcPtCkE36wHvrK6wi7
-CjwFv2U/gIfNCUNXBZPI4G7voL1XOLJ8h0WWqlEraHo7zYWI5Ky98SI6wOpDGDzo
-URvavOVT3Ry/QfLtt0GZvELmJb6qO2AcL1qIDULx4xXqb3rI29xR/xVaCkB8CGSe
-JxU+1TbJJG0UdVDm28dhO8J4qgBpj9N6M/e8K1TIu8ty6IkFPFumTN9zMV9VXRIo
-Ajr1RDIiFXCZ4ayEnja2RIZwi89rn/iC/QzfsqQFr5axw58wz+0/EfD/i79gKoOX
-jKBEwWN44LsxJW/ucy3pm7xRurwZvOQZIeZcecVVecAaHmCRFfq+VpSnU5iDZEDL
-0GU+CKXW+zDnuIfUc/lx7LWjFyqR12OviS2CdrkaTKSVBAEYCFQdGPCp51WoZMnE
-uaKkLp0y58e5J0mHx4kmk2saAacdO/YolHjkh5zNe1Z+sORwPEo4ruZY/+wem/TG
-KFQsVjH/jAsyQFsyXaOrQ4QyOwxw52Vz6b7vrffaTdnKlyvJTvebEbhNiNmt2Ni+
-wac/1VcedkMpUrNmpJyal6lzWrVQmW1Q9qBinxHeGnNHk2QWTGZCQCClxDTfPoE1
-HC85cD4h91eBV4fiQm/ML/WmaGAQGUiTlX5vESJG1pKYXGqv1cr1pj+MTjqfjApl
-KOj93yAvx4ss42onWe9DPOBojSMuIzEVZOeq7mt7QeNpN9unjsDVrvq/fmsvIBb0
-t5HFVX4JlZoF2sfrwP0jEkyHxlk0pZZc5rbwtVI601MolDzjTNBcYbUB0IUlIj9f
-mM35IAFWZtrXXv3k5ZRFQU2jB7DFP9zHWsai7quhhduvt498rNxiWu7YlAQfhaU/
-wVK+3Fca7AGrlQ8YmzV0uOwoTMvKbLNwiiIG6QsgWRhmOIwHdNlRvhaZl6ybRLty
-ppMaqlOgDu88/8SMCce8yBderXW/0QxCZjQ3gEDufqxjC2IelOfEbChMLIs6p+9B
-qaPtji3TxOscQZMD9g4jYXUawHSq55B/MegD5sfvTl3ql+qsQnleXDUz2gJ+MBlH
-Qp6HZMs2woAbvFyxAXSUeKAOZrnW1TmRNmj6SwtE9aPmMwSYxZtTukesl+CpzEqi
-BdBZia3Yxu9Z5694Cg1eXoPIir6u6svZA5OIpEIUDIUPnMmG9pjxQ1xK40vyjdMZ
-+9uAVdGX118nuwZ6Al4bfrPOOmwII2X1xmfFGG3rbVHVD9dIGJ1HGWPZio4F/eai
-kfSYHr0410JRAOvd9G4vrH6rq/zE5QcLCmXyH5W9vF3RJDAK4ArcaLF5RPY8slEJ
-NcZ7XTcKUc/Tg6VCMo3agozuzrxKCX5x6rvn0COYgdU3ozTO72dJlFQY2KpJP0n2
-RWWjdl2r7XYVRoQJd5XaZ3/mgJ7FtL42Rh6+vjEJLezWgUTo3B4Z0WG8WIp4wfAw
-d4qbAa4lVWtP++HZvIqOPaL+nZgFS22ygtoIVyYDj7lcqH9cdMsaMrZFAxisVQK2
-z2DnysfLg4dkdDuJjFUI07QUPwqjfRVKC8Mec45j9zrpuzu82zQ8Fub7ldtECsby
-oq0smBG1vd+ozMPnr3yvU7X7jaaM4toW+dG3OQxnUO2GyB/BAEamOB4CWWbKSfy1
-tfM=
+MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQI10unvSnMKS4CAggA
+MBQGCCqGSIb3DQMHBAi/YThgINTMtASCAoBsHdTnbfIzYHiLDUfMA9NESRL7/xww
+em6vTiJMGhJxIxNykVuzuxeglZPEj487sbFAsHTQrD/2VAm2lXmkoD83EQOP4uYr
+xYRVvsdYGXtBCCxFKEyn5iU7YZs5xY4v8u9nfn/Zq95mT69V2CJFre6JYfnqDlR2
+bIcqJhD6r5gF4GhOvdGj1Q9ykC45ZEAci3Vxr6Eu+3Z4fokRwb4FUhUojt4rjqwf
+HdwsMU6gMElop6EzymHL5FQKkN5Dy+uFEjx1BqLamglBgfZrZ+HnU0zlEQ++GGVW
+NPn4XpqR6ZH1sLcBOzdg09Xzw2qnJrN795S1nAlnhQmFv+0TpBW+vDnTjCO4og+f
+hmdRq7pV25swctIX8bkKibywZiSDmm5u6LXOpOvcKOGe3b1WBq1ipenhz5IAMDjE
+/Gma6DSmWpceAeJWjLZWknuOTqJWpIN9IrJNmLF1GuU3Gq217hhAd456vZSnyGi4
+MtpqdhtxgO28xpzgQ6ojOsYtGjWRa1ML26G5KK17YnVCHGo38FCAgkxmDRxFvTOc
+BbxsFOjfi3SUb4rwOI1MjddsLSomd3gYb6eaXEmAzCxeuMg8eSDWA9Af7XBS+hch
+dM5H+6jpdpAwEr4vI25v9Rc/OA3tOZSgedr1dDeJWhEouL6a9JjjOGLknkbvelJf
+2SJD+fodD82eM3g52ZVHhkh936gWKntE98gwTejONgK0l9q3FnBplUU2b7WNwWg0
+3lnihHVcHe/TJ+oRlbKttRnwQ6Ys9kXBzxAi3555V5VRKwWka76FhtihXKwcIK5d
+Ej+DW19j2JHD1v9Y/YWUcLgz5d3XA8Jsjb+8BSzk/hYwNLY0fit1ep26
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/data_files/pkcs8_pbes2_pbkdf2_3des_2048.der b/tests/data_files/pkcs8_pbes2_pbkdf2_3des_2048.der
index 9a1eb40..b9da065 100644
--- a/tests/data_files/pkcs8_pbes2_pbkdf2_3des_2048.der
+++ b/tests/data_files/pkcs8_pbes2_pbkdf2_3des_2048.der
Binary files differ
diff --git a/tests/data_files/pkcs8_pbes2_pbkdf2_3des_2048.key b/tests/data_files/pkcs8_pbes2_pbkdf2_3des_2048.key
index d595fc7..113ff43 100644
--- a/tests/data_files/pkcs8_pbes2_pbkdf2_3des_2048.key
+++ b/tests/data_files/pkcs8_pbes2_pbkdf2_3des_2048.key
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIP6oIwSIapDICAggA
-MBQGCCqGSIb3DQMHBAgsTKISyhpWuQSCBMjQoazTeTtrgdDa+phkGwSDgcgxSUHf
-E8DmqX5hUNU4uX+hcqHbaRZIVGUs+GXw8iySarVbswbXakNVQCgp4HX8w46mhes/
-BlcJ0ALGf5jD4wluHNWZgEei3pMW7yJxXitoEoa9Hyshjeq//HLSNxmkWWTrrSAg
-cUBLStsUHeSxXEXWpcRPin6LuZEGV0spb30BHi4vohIOYN6DDtxugbvwxzUChgDu
-RyyhlA4F3ZjZW37BMTiZDyKSBODgj7nfPzzHfZnSC16ekiXYWbo7h3MihQmMkjOm
-YLNBhOHRzZtXlmgFtY1yRfiREyk9zGcGYv14PB8sUOwotN8pktnwd2UgINaX+ccO
-6/PHAoU/MiqJ0cpZH8SZlFalqGSsF+LI/bf/qs14YwXI4DeCTyvoOJdobU16Lg9W
-Ole229Tg4eV96X82MbQ7cCx1QGWwAGR8spmrls5b1OAGbEXBFWZXK666SQMpOE27
-1qVKiwg7PIdzyDwPGj4UoJbhg+9APRNfIh6ihxALmy1N5qprY/B4I60QJzACgXb7
-wixSFbpDBqztCI0BkS3K4CgZnnrf7OTbOdZKVIcESen9P3xn3dfn1+7unZzGRm8M
-nHQzTrlCW2z77AX8HGvP7AjETxG2JQxefER1+AyZFTbWp/zkv5ApYy/u/24MXRH3
-lYVBxaX2iZ/R9TRCDkr13VhQMpSCCPY0M3yphbUWAmk2OjjqKccw6IMMG8Xb/4u0
-IwtFeFzk567WQ4NL3WlyFjjeTww6LjXaI6IYvFMHvRrOBJt0OYLtVa8vACYWF5PF
-XpE+xYDYt0RE9+c6j83c5UOriuo7KEsZ1d0JmHy4cck+17GR1TlNiciKyoY7Gvf3
-/8vm/kziEWJVcstgFdsIC1eZmRSJwCSmK3yXs+bejnmWmxHEpUaSDotfFH+U9Te6
-TfBoQFfOZfLYxhYFOPTcvAgo3ru1wxxMyaADZ0e40hPKbpOJrM0fA+GSkTf+kKUF
-oHwZi3SZ39SLYTR/GoOKgkARtS1NjQDDjwLUTnKq118Uzma7ZFAkAmwMCF0eyY0o
-ZI7NItEFTGH9QGEZosF4n+R4iHpQj8bkZWSt92K+j9PxqNSVesAi/uluj11F42mt
-yGhSdFVG5ogemvS/5Uad797V4QVg4mepAx61dr8s8utEJkx1x78XP2bHpV5JxH3t
-8zndRtHC7HD235BVjfgkU4Fwq5GElTXbhrVVsgivrerJsgvQGxpMI2rL84geFt83
-/ceWgA40BxkifJgaDLxSeSgt+7d8jWuDBRE/pHpFPI3Ey/0TuO85/D18mSS4YFr+
-66mB5Fr5cNJHC/NvJCgCRPncN4At/UgXhl9e/r/j8ENYaw4jZmiMo8GncmE1J6jc
-Ze3V9q//pAb1rQoI1X6Buvp+a9vyFMn1MJ8CO56rwWnv5MK8m9Nx9uLO4Ufstv7x
-/fYWGCoHBHsueiASMzZ8bL0hJe2ytIJawKxngUtWfYEO4N5W8H3TqtY1KY3lRqAx
-0gTmt0e6a8veJkUFG1JCjr27A0GUaVJZ2gXC8A+QeW5DveMfYLkje6pyg+Opw+qv
-5gz4twbCOAFuG+wvraNvHE3HVuqdcdTGlpBaYOyblwlWBzEAVVvsKNtWyXQDlV9Q
-0JA=
+MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQI/AHrzeKeap4CAggA
+MBQGCCqGSIb3DQMHBAh7ILIFfzuMngSCBMgo7osY2jE3UGsryC0M1mpOLcr88oSp
+OjyCBLdVgX6t7jz+EAWM18tcStBEVYpJfhKaMxyvn+qoif30K7BnTSHHL+J4q16Q
+VuAnoTpCq/13SDidX2062BsjSYlsgAe/933hq9vUXstlq69FoRDbVgE9NFQib44G
+TkJDsMJLfOXdJdLNcnzAEvZAEbvzhuuqeYPNm5PN9msIlo/kf+tX++rtZATArbhF
+KYBunm/wEsNKrL4YrdqErj2SDGob8h0V4YFAIYjCHjn5z4kkOlfc8qwgCLZnn4hG
+TaJhn4x8A/ahaYeWJKaDf1s5xe9iyp4VOwFBIXVTvDqR05ysc8uKFr+MkMSQuq/w
+85ztpSBmOxT7I96O/bCYiQOfHsDdqx9cM2lUbYHk7wl0qF/r22TlO5tR7LEjfkDQ
+qYbbe7Dcux5574PPHt8TcKmmXRA/Tm4DuqcHH4DIl7FS5T19Ger1O61YWnPNIEH1
+bvR32y2MjAe67tMzatWM9cUVOLvBrfUhLE409sK2xip4ef4Zfn4UvbxSqQ0c0lg/
+tfy4HR+UiO1lYfqG2e43GtDajXDVWjLlouWAN+oO74kZ2UYVK0bOisdklls3idjs
+3Ot6NWyIR5XgyWxxpmYt8Ikqy7L2bUEYahW9+bgY2EAjcoJKdqaS/oWlWqe+wpYH
+WpRn+K5Uq+EzXiRfO2HhsyDwEaHQEih6Tc/5ycNJ+CDXy3fOX+cjOZ3C8D/BAJGd
+xw00XdBJbnlGEfWFI06r/Dt9tuDOpmOUxdQAk9ZZYNEb2l4jHjSh5pW/V/okOxpT
+byy0QQMESnHInMiDpmTAMyhGPqZHy9XXz9BLPr9+WYgJFSbEKIPJYss3vd9V0P2j
+DdnCS1eiLYR9jGmOOSrx7GDYqL1TW4KgpN7Nlk7H51R4YHVL34GGToboKdQL4/wb
+870Uw8OnEqG/rOiNX8kyJmH9PgyMjrSZNXpb6hjfIyL86BbburI1svne5fku69Dq
+DT04cLekL3RwtsyQgWk98C/3amIak1EZGXmAhkPUwGDQ8lxARfdnuJGNYUbF0asz
+kvGJ0mXQyGJV9CdSI01gKsv7/qAxTl9ndHBCaP+aPuMRNlAPJuF9LHsLpcbaq/hI
+OCPclBU1nEW7RtC6+tSKxmzOKEp0mtM0PPdLJ96QVijv18Dkit77e+rco8VrUUnf
+LPdvv26SZViHg3sOyfECS/Oxl6mnkIJvXI1pQVdkWXQu8VtX2aNxTv9+0TtXz4W4
+acAn6kB2BshqLA3m2qZFKFFD4oriO/GcgWEm9K7sogVZ30fDSbxeXI+WEDLXiAuK
+fgqgada+nq6S7/6sim37BwIvrnbSLA4s3qwgesPQ3zocH5DTR3r4eCqWFjAXVIOt
+r6y7OoZzYAD7hHaFk4Xj/1xYbtFwciQBmXEtRfxRrhlsv/ESDVcN9ynKkUCP4tSN
+mk8R4c7Bm8cgysAdFRwYczP2al+jxaV8K6vBV/9xOzVujzhJf9lxcx441mKhENSU
+RT2YYgaD4xb1i963nAZ4aK6PEpJAxQPvc0OP/YjBhxF4g2eGEQ4wQ8vBffB/iECl
+8E+fAXwGCk7I6XHGqeI3MnI2bCSC/TQIPv2EmHLOFEeHsw0hKp6BmnsouUklijVm
+0LI=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/data_files/pkcs8_pbes2_pbkdf2_3des_4096.der b/tests/data_files/pkcs8_pbes2_pbkdf2_3des_4096.der
index cd6c520..565b4a7 100644
--- a/tests/data_files/pkcs8_pbes2_pbkdf2_3des_4096.der
+++ b/tests/data_files/pkcs8_pbes2_pbkdf2_3des_4096.der
Binary files differ
diff --git a/tests/data_files/pkcs8_pbes2_pbkdf2_3des_4096.key b/tests/data_files/pkcs8_pbes2_pbkdf2_3des_4096.key
index 1270639..44e7683 100644
--- a/tests/data_files/pkcs8_pbes2_pbkdf2_3des_4096.key
+++ b/tests/data_files/pkcs8_pbes2_pbkdf2_3des_4096.key
@@ -1,54 +1,54 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-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
-fpRidHHOSWLOQQ==
+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
+By8=
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/data_files/pkcs8_pbes2_pbkdf2_des.der b/tests/data_files/pkcs8_pbes2_pbkdf2_des.der
new file mode 100644
index 0000000..c4f1f30
--- /dev/null
+++ b/tests/data_files/pkcs8_pbes2_pbkdf2_des.der
Binary files differ
diff --git a/tests/data_files/pkcs8_pbes2_pbkdf2_des.key b/tests/data_files/pkcs8_pbes2_pbkdf2_des.key
index f3a2d0c..2e1de1a 100644
--- a/tests/data_files/pkcs8_pbes2_pbkdf2_des.key
+++ b/tests/data_files/pkcs8_pbes2_pbkdf2_des.key
@@ -1,29 +1,17 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-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
+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
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/data_files/pkcs8_pbes2_pbkdf2_des_2048.der b/tests/data_files/pkcs8_pbes2_pbkdf2_des_2048.der
index b72a4ac..e60bbf2 100644
--- a/tests/data_files/pkcs8_pbes2_pbkdf2_des_2048.der
+++ b/tests/data_files/pkcs8_pbes2_pbkdf2_des_2048.der
Binary files differ
diff --git a/tests/data_files/pkcs8_pbes2_pbkdf2_des_2048.key b/tests/data_files/pkcs8_pbes2_pbkdf2_des_2048.key
index ca7cff4..8484bb8 100644
--- a/tests/data_files/pkcs8_pbes2_pbkdf2_des_2048.key
+++ b/tests/data_files/pkcs8_pbes2_pbkdf2_des_2048.key
@@ -1,29 +1,29 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-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
+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
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/data_files/pkcs8_pbes2_pbkdf2_des_4096.der b/tests/data_files/pkcs8_pbes2_pbkdf2_des_4096.der
index d9561e4..22e157f 100644
--- a/tests/data_files/pkcs8_pbes2_pbkdf2_des_4096.der
+++ b/tests/data_files/pkcs8_pbes2_pbkdf2_des_4096.der
Binary files differ
diff --git a/tests/data_files/pkcs8_pbes2_pbkdf2_des_4096.key b/tests/data_files/pkcs8_pbes2_pbkdf2_des_4096.key
index 079fe6c..37a17d9 100644
--- a/tests/data_files/pkcs8_pbes2_pbkdf2_des_4096.key
+++ b/tests/data_files/pkcs8_pbes2_pbkdf2_des_4096.key
@@ -1,54 +1,53 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-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
-R6KAae9ygQ==
+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
 -----END ENCRYPTED PRIVATE KEY-----