Reformat evptests.txt

When compiling without EC support the test fails abruptly reading some keys.
Some keys merged in commit db040557c8bf4449e0a0b43510a2b30d89d58a83 start with
------BEGIN EC PRIVATE KEY-----

this format is not supported without EC support.

This commit reformat those keys with the generic format. After this change the
test simply skips the unsupported EC keys when EC is disabled, without parsing
errors.

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3222)

1 files changed, 824 insertions, 782 deletions

diff --git a/test/evptests.txt b/test/evptests.txt
index 8a7f17491e..ff518d6ad6 100644
--- a/test/evptests.txt
+++ b/test/evptests.txt
@@ -2446,7 +2446,6 @@ Output = 8F49A1B7D6AA2258
 # RSA 2048 bit key.
 
 PrivateKey = RSA-2048
-
 -----BEGIN PRIVATE KEY-----
 MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDNAIHqeyrh6gbV
 n3xz2f+5SglhXC5Lp8Y2zvCN01M+wxhVJbAVx2m5mnfWclv5w1Mqm25fZifV+4UW
@@ -2479,7 +2478,6 @@ fMkTd7GabVourqIZdgvu1Q==
 # Corresponding public key
 
 PublicKey = RSA-2048-PUBLIC
-
 -----BEGIN PUBLIC KEY-----
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzQCB6nsq4eoG1Z98c9n/
 uUoJYVwuS6fGNs7wjdNTPsMYVSWwFcdpuZp31nJb+cNTKptuX2Yn1fuFFgdo092p
@@ -2493,7 +2491,6 @@ TwIDAQAB
 # EC P-256 key
 
 PrivateKey=P-256
-
 -----BEGIN PRIVATE KEY-----
 MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgiocvtiiTxNH/xbnw
 +RdYBp+DUuCPoFpJ+NuSbLVyhyWhRANCAAQsFQ9CnOcPIWwlLPXgYs4fY5zV0WXH
@@ -2503,7 +2500,6 @@ MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgiocvtiiTxNH/xbnw
 # EC public key for above
 
 PublicKey=P-256-PUBLIC
-
 -----BEGIN PUBLIC KEY-----
 MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAELBUPQpznDyFsJSz14GLOH2Oc1dFl
 x/iUJAcsJxl9eLM7kg6VzbZk6ZDc8M/qDZTiqOavnQ5YBW5lMQSSW5/myQ==
@@ -2525,7 +2521,6 @@ CrmVlCNy6lFAldO8IPkSyzGPMjSvZI6nIGQ7P3Afm3reuJ0KvnTZ77acRg==
 
 # DSA key
 PrivateKey=DSA-1024
-
 -----BEGIN PRIVATE KEY-----
 MIIBSwIBADCCASwGByqGSM44BAEwggEfAoGBAO0SwRpkAeM21qSM5ch4CLEHpFk4
 19R5ve1UUr421y3HEUURsrVpxYKvyx8aOBQC/akz95cYxNN3y1JnJJMxPklhdJrJ
@@ -2537,7 +2532,6 @@ woS0mp33oQYs43nt29B6UwbtMmbzCOQ9vGGwWVho+JtHyyPWrDuLmkvLtoQPaxYt
 -----END PRIVATE KEY-----
 
 PublicKey=DSA-1024-PUBLIC
-
 -----BEGIN PUBLIC KEY-----
 MIIBtzCCASwGByqGSM44BAEwggEfAoGBAO0SwRpkAeM21qSM5ch4CLEHpFk419R5
 ve1UUr421y3HEUURsrVpxYKvyx8aOBQC/akz95cYxNN3y1JnJJMxPklhdJrJf/WD
@@ -3687,10 +3681,10 @@ Reason = operation not supported for this keytype
 # TEST CURVE secp112r1
 
 PrivateKey=ALICE_secp112r1
------BEGIN EC PRIVATE KEY-----
-MD4CAQEEDqyoqnf0BYsKW6zaFrmuoAcGBSuBBAAGoSADHgAEng1OA5HXFACvczp4
-zjpapdbbMDoWexQwoUXBzA==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+ME4CAQAwEAYHKoZIzj0CAQYFK4EEAAYENzA1AgEBBA6sqKp39AWLClus2ha5rqEg
+Ax4ABJ4NTgOR1xQAr3M6eM46WqXW2zA6FnsUMKFFwcw=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_secp112r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -3699,10 +3693,10 @@ oUXBzA==
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_secp112r1
------BEGIN EC PRIVATE KEY-----
-MD4CAQEEDmkhtf6ESrj2YU+NSXj/oAcGBSuBBAAGoSADHgAEGw81kebWlx3DXTiJ
-vAjJwJ76vm+h5F9BRlFndw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+ME4CAQAwEAYHKoZIzj0CAQYFK4EEAAYENzA1AgEBBA5pIbX+hEq49mFPjUl4/6Eg
+Ax4ABBsPNZHm1pcdw104ibwIycCe+r5voeRfQUZRZ3c=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_secp112r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -3723,10 +3717,10 @@ SharedSecret=a6cefb5aa7a352afe818749eb401
 # TEST CURVE secp112r2
 
 PrivateKey=ALICE_secp112r2
------BEGIN EC PRIVATE KEY-----
-MD4CAQEEDiDPNuUp8TpnChRbQVCZoAcGBSuBBAAHoSADHgAEkngvtWjnQ1nlUZni
-c2TEU1yMlDAMhBvX/0iQsQ==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+ME4CAQAwEAYHKoZIzj0CAQYFK4EEAAcENzA1AgEBBA4gzzblKfE6ZwoUW0FQmaEg
+Ax4ABJJ4L7Vo50NZ5VGZ4nNkxFNcjJQwDIQb1/9IkLE=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_secp112r2_PUB
 -----BEGIN PUBLIC KEY-----
@@ -3735,10 +3729,10 @@ MDIwEAYHKoZIzj0CAQYFK4EEAAcDHgAEkngvtWjnQ1nlUZnic2TEU1yMlDAMhBvX
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_secp112r2
------BEGIN EC PRIVATE KEY-----
-MD4CAQEEDgP2gYaP47y+NnPc5k1qoAcGBSuBBAAHoSADHgAE1k6/mBTO9VuAAelO
-C7eFSFNC0HwtqZMQh9pFYQ==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+ME4CAQAwEAYHKoZIzj0CAQYFK4EEAAcENzA1AgEBBA4D9oGGj+O8vjZz3OZNaqEg
+Ax4ABNZOv5gUzvVbgAHpTgu3hUhTQtB8LamTEIfaRWE=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_secp112r2_PUB
 -----BEGIN PUBLIC KEY-----
@@ -3759,10 +3753,10 @@ SharedSecret=6bed2c55e233e9214d5898c4c12a
 # TEST CURVE secp128r1
 
 PrivateKey=ALICE_secp128r1
------BEGIN EC PRIVATE KEY-----
-MEQCAQEEEI/Vz6XF9FP4xlZny4YJhiWgBwYFK4EEAByhJAMiAAQfafSJynzuKe/u
-RRisQWOlm4cngOoCuEdL5l+nZdc7UA==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MFQCAQAwEAYHKoZIzj0CAQYFK4EEABwEPTA7AgEBBBCP1c+lxfRT+MZWZ8uGCYYl
+oSQDIgAEH2n0icp87inv7kUYrEFjpZuHJ4DqArhHS+Zfp2XXO1A=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_secp128r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -3771,10 +3765,10 @@ S+Zfp2XXO1A=
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_secp128r1
------BEGIN EC PRIVATE KEY-----
-MEQCAQEEEIZsR3ceHCvvpdtB6SEisNOgBwYFK4EEAByhJAMiAAQ0qNLQc3H+AQph
-A01pv2/zOVb8PjNKO/c3LcSnQZViaw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MFQCAQAwEAYHKoZIzj0CAQYFK4EEABwEPTA7AgEBBBCGbEd3Hhwr76XbQekhIrDT
+oSQDIgAENKjS0HNx/gEKYQNNab9v8zlW/D4zSjv3Ny3Ep0GVYms=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_secp128r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -3795,10 +3789,10 @@ SharedSecret=91ded46ac404afdbd708fdcc1cac6842
 # TEST CURVE secp128r2
 
 PrivateKey=ALICE_secp128r2
------BEGIN EC PRIVATE KEY-----
-MEQCAQEEECBEpKM+xnvosMYgDaK3lIKgBwYFK4EEAB2hJAMiAAQFV2NxSlH5votE
-+bpHx8AP/qQHFXQqXf3f1afT6dSl/w==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MFQCAQAwEAYHKoZIzj0CAQYFK4EEAB0EPTA7AgEBBBAgRKSjPsZ76LDGIA2it5SC
+oSQDIgAEBVdjcUpR+b6LRPm6R8fAD/6kBxV0Kl3939Wn0+nUpf8=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_secp128r2_PUB
 -----BEGIN PUBLIC KEY-----
@@ -3807,10 +3801,10 @@ MDYwEAYHKoZIzj0CAQYFK4EEAB0DIgAEBVdjcUpR+b6LRPm6R8fAD/6kBxV0Kl39
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_secp128r2
------BEGIN EC PRIVATE KEY-----
-MEQCAQEEEAKnTSPDkPuhu8OYmnvAO4CgBwYFK4EEAB2hJAMiAAQE7cFtWtzlK+G8
-35+ZZKG7a1YgVBqnnKzlEcwIsuXT3w==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MFQCAQAwEAYHKoZIzj0CAQYFK4EEAB0EPTA7AgEBBBACp00jw5D7obvDmJp7wDuA
+oSQDIgAEBO3BbVrc5SvhvN+fmWShu2tWIFQap5ys5RHMCLLl098=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_secp128r2_PUB
 -----BEGIN PUBLIC KEY-----
@@ -3831,10 +3825,11 @@ SharedSecret=dc32faa978008a694672076b756a1e4b
 # TEST CURVE secp160k1
 
 PrivateKey=ALICE_secp160k1
------BEGIN EC PRIVATE KEY-----
-MFECAQEEFQC503dg5c3S67QIvZMZl09h41T/vaAHBgUrgQQACaEsAyoABHcO7R0r
-by1LJbFhLP8SzZaqvgL5s18nW6IrgncEVLlR1zjyezHF+OM=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGECAQAwEAYHKoZIzj0CAQYFK4EEAAkESjBIAgEBBBUAudN3YOXN0uu0CL2TGZdP
+YeNU/72hLAMqAAR3Du0dK28tSyWxYSz/Es2Wqr4C+bNfJ1uiK4J3BFS5Udc48nsx
+xfjj
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_secp160k1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -3843,10 +3838,11 @@ oiuCdwRUuVHXOPJ7McX44w==
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_secp160k1
------BEGIN EC PRIVATE KEY-----
-MFECAQEEFQDl82IIVUY8zVoe7BdS+6HGhjbJT6AHBgUrgQQACaEsAyoABAeUzqi2
-Zqm3T/Sxz7ltw+hhPpx/IBG/hVQ46jojZ4EZcsibzXbWuJw=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGECAQAwEAYHKoZIzj0CAQYFK4EEAAkESjBIAgEBBBUA5fNiCFVGPM1aHuwXUvuh
+xoY2yU+hLAMqAAQHlM6otmapt0/0sc+5bcPoYT6cfyARv4VUOOo6I2eBGXLIm812
+1ric
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_secp160k1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -3867,10 +3863,11 @@ SharedSecret=5457d367346cc3e82031784f95ebcd856de0c735
 # TEST CURVE secp160r1
 
 PrivateKey=ALICE_secp160r1
------BEGIN EC PRIVATE KEY-----
-MFECAQEEFQDQoO1qIVRZ3w0bSU71Mu7OMtZcl6AHBgUrgQQACKEsAyoABIdA3UMY
-Fe13IXf4GN8h9taDjTd1SpdshfNmhy0PI49NBoZVuWZLBcI=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGECAQAwEAYHKoZIzj0CAQYFK4EEAAgESjBIAgEBBBUA0KDtaiFUWd8NG0lO9TLu
+zjLWXJehLAMqAASHQN1DGBXtdyF3+BjfIfbWg403dUqXbIXzZoctDyOPTQaGVblm
+SwXC
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_secp160r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -3879,10 +3876,11 @@ MD4wEAYHKoZIzj0CAQYFK4EEAAgDKgAEh0DdQxgV7Xchd/gY3yH21oONN3VKl2yF
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_secp160r1
------BEGIN EC PRIVATE KEY-----
-MFECAQEEFQCwEjC/HpkAGKeGyL5sZqIK962K5aAHBgUrgQQACKEsAyoABAnb5GGk
-Z52RRhdSI9n+mUdcUHLpHdfMxQYgqJcUZIGnAXyEZE2pQPI=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGECAQAwEAYHKoZIzj0CAQYFK4EEAAgESjBIAgEBBBUAsBIwvx6ZABinhsi+bGai
+CvetiuWhLAMqAAQJ2+RhpGedkUYXUiPZ/plHXFBy6R3XzMUGIKiXFGSBpwF8hGRN
+qUDy
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_secp160r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -3903,10 +3901,11 @@ SharedSecret=87856536b6a295ea94d3e483d69c6212d5c7afcf
 # TEST CURVE secp160r2
 
 PrivateKey=ALICE_secp160r2
------BEGIN EC PRIVATE KEY-----
-MFECAQEEFQCGYs4AkY25KhlQI3h/Q6ctnqtFJKAHBgUrgQQAHqEsAyoABA9I2+El
-CiEwR+KNer4mWrtr2XOixB8++4jI6DqyHLNRVLjdH7suCvk=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGECAQAwEAYHKoZIzj0CAQYFK4EEAB4ESjBIAgEBBBUAhmLOAJGNuSoZUCN4f0On
+LZ6rRSShLAMqAAQPSNvhJQohMEfijXq+Jlq7a9lzosQfPvuIyOg6shyzUVS43R+7
+Lgr5
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_secp160r2_PUB
 -----BEGIN PUBLIC KEY-----
@@ -3915,10 +3914,11 @@ iMjoOrIcs1FUuN0fuy4K+Q==
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_secp160r2
------BEGIN EC PRIVATE KEY-----
-MFECAQEEFQDXSaPNHYPLQIuab8xMAdNvkIF6c6AHBgUrgQQAHqEsAyoABGrNgBxK
-KPMCja/OYy4ry1ryyX9uC64KlHAUP3cAI/rhPOAjet4WGxc=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGECAQAwEAYHKoZIzj0CAQYFK4EEAB4ESjBIAgEBBBUA10mjzR2Dy0CLmm/MTAHT
+b5CBenOhLAMqAARqzYAcSijzAo2vzmMuK8ta8sl/bguuCpRwFD93ACP64TzgI3re
+FhsX
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_secp160r2_PUB
 -----BEGIN PUBLIC KEY-----
@@ -3939,10 +3939,11 @@ SharedSecret=5481e282c47cbd37c84873847c4fc2f31fc15a1a
 # TEST CURVE secp192k1
 
 PrivateKey=ALICE_secp192k1
------BEGIN EC PRIVATE KEY-----
-MFwCAQEEGLMXcp4cyxpX8o5H+i0KZ0tBPaoY2rceFaAHBgUrgQQAH6E0AzIABM/4
-v1IaXcrrCZ6+QvAmeQw0enQjlF9e6VJ8e4dk+ngIauGLp4o1AuSlnY5Bo8gTEA==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGwCAQAwEAYHKoZIzj0CAQYFK4EEAB8EVTBTAgEBBBizF3KeHMsaV/KOR/otCmdL
+QT2qGNq3HhWhNAMyAATP+L9SGl3K6wmevkLwJnkMNHp0I5RfXulSfHuHZPp4CGrh
+i6eKNQLkpZ2OQaPIExA=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_secp192k1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -3951,10 +3952,11 @@ Unx7h2T6eAhq4YunijUC5KWdjkGjyBMQ
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_secp192k1
------BEGIN EC PRIVATE KEY-----
-MFwCAQEEGHwFc9UZApgLDS/sNjfBlVpzKHJSMhtTKaAHBgUrgQQAH6E0AzIABOAj
-uHDYtKPq43fIvme8c46QyI+1qUqv4EawVpzf1Fianriav7DrpsMhY3dWWU7otg==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGwCAQAwEAYHKoZIzj0CAQYFK4EEAB8EVTBTAgEBBBh8BXPVGQKYCw0v7DY3wZVa
+cyhyUjIbUymhNAMyAATgI7hw2LSj6uN3yL5nvHOOkMiPtalKr+BGsFac39RYmp64
+mr+w66bDIWN3VllO6LY=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_secp192k1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -3975,11 +3977,11 @@ SharedSecret=6a4daca0412284172e8fcaafa0d9df76257d899752bf0f23
 # TEST CURVE secp224k1
 
 PrivateKey=ALICE_secp224k1
------BEGIN EC PRIVATE KEY-----
-MGkCAQEEHQCFcoYkWo4jg/U8sVHczoyR6lP/YO13bsjUDDPHoAcGBSuBBAAgoTwD
-OgAE9U3/VvpUdurtTqlZo6tR6onm9KBYvj27+64PjwPgVF/ugV2LE31VYivGvQ9E
-HJ4RiaUfDgw4RAo=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MHkCAQAwEAYHKoZIzj0CAQYFK4EEACAEYjBgAgEBBB0AhXKGJFqOI4P1PLFR3M6M
+kepT/2Dtd27I1Awzx6E8AzoABPVN/1b6VHbq7U6pWaOrUeqJ5vSgWL49u/uuD48D
+4FRf7oFdixN9VWIrxr0PRByeEYmlHw4MOEQK
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_secp224k1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -3988,11 +3990,11 @@ ME4wEAYHKoZIzj0CAQYFK4EEACADOgAE9U3/VvpUdurtTqlZo6tR6onm9KBYvj27
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_secp224k1
------BEGIN EC PRIVATE KEY-----
-MGkCAQEEHQA6MRdijPxhxaiRJ/hTmBcduMN8gs9096OUTRP8oAcGBSuBBAAgoTwD
-OgAEZcBD4Ce1fs6fhwrA/5/grNkZolnCMGreMKPKayv0DdzxUKhFdcGD5U+gqDt8
-OQwiAjyo+asL3lA=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MHkCAQAwEAYHKoZIzj0CAQYFK4EEACAEYjBgAgEBBB0AOjEXYoz8YcWokSf4U5gX
+HbjDfILPdPejlE0T/KE8AzoABGXAQ+AntX7On4cKwP+f4KzZGaJZwjBq3jCjymsr
+9A3c8VCoRXXBg+VPoKg7fDkMIgI8qPmrC95Q
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_secp224k1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4013,11 +4015,11 @@ SharedSecret=80b65e65fe29c779213dd31189d371ff57b0b2bf08c6458ed142399a
 # TEST CURVE secp224r1
 
 PrivateKey=ALICE_secp224r1
------BEGIN EC PRIVATE KEY-----
-MGgCAQEEHEsqRcUldioZSVOyaCOV6yKTCp6Ot6SuRJNt6HKgBwYFK4EEACGhPAM6
-AARRwSHQaDL+sP42P0lCjPMj6rM+2JTtvYPYe10JriF9tU9eeBxEfYHbE3xb51we
-gjGvE7ZQVfLjGg==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MHgCAQAwEAYHKoZIzj0CAQYFK4EEACEEYTBfAgEBBBxLKkXFJXYqGUlTsmgjlesi
+kwqejrekrkSTbehyoTwDOgAEUcEh0Ggy/rD+Nj9JQozzI+qzPtiU7b2D2HtdCa4h
+fbVPXngcRH2B2xN8W+dcHoIxrxO2UFXy4xo=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_secp224r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4026,11 +4028,11 @@ ME4wEAYHKoZIzj0CAQYFK4EEACEDOgAEUcEh0Ggy/rD+Nj9JQozzI+qzPtiU7b2D
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_secp224r1
------BEGIN EC PRIVATE KEY-----
-MGgCAQEEHM4cYZRHd9liDcZJpQ3qnGg1C0CU7MzdRyUSEzOgBwYFK4EEACGhPAM6
-AAR3AWSUr9igNFTpsztfa6U0vCrH1NQRMwVQzpVX0MHhhy8DO/qlCBXBgRTshqGZ
-IqlfX1yFs+3YjQ==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MHgCAQAwEAYHKoZIzj0CAQYFK4EEACEEYTBfAgEBBBzOHGGUR3fZYg3GSaUN6pxo
+NQtAlOzM3UclEhMzoTwDOgAEdwFklK/YoDRU6bM7X2ulNLwqx9TUETMFUM6VV9DB
+4YcvAzv6pQgVwYEU7IahmSKpX19chbPt2I0=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_secp224r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4051,11 +4053,11 @@ SharedSecret=34ea06d16d82f0d1725de47f3639ac0c23db7d7ed68f01488539a2a5
 # TEST CURVE secp256k1
 
 PrivateKey=ALICE_secp256k1
------BEGIN EC PRIVATE KEY-----
-MHQCAQEEIBwkc8tCHBMegngOqIDTSkjn7k5R8uHxPyzcZADVEuJPoAcGBSuBBAAK
-oUQDQgAEgwZsCpJV+DnG2UiSV/ZsZtVq+0z0y6W8qcSnCkZtFyjcVZa2VPFkApeu
-hrV9gw8l/tPl4gt4W2kVnGLYOz+ljg==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGEAgEAMBAGByqGSM49AgEGBSuBBAAKBG0wawIBAQQgHCRzy0IcEx6CeA6ogNNK
+SOfuTlHy4fE/LNxkANUS4k+hRANCAASDBmwKklX4OcbZSJJX9mxm1Wr7TPTLpbyp
+xKcKRm0XKNxVlrZU8WQCl66GtX2DDyX+0+XiC3hbaRWcYtg7P6WO
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_secp256k1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4064,11 +4066,11 @@ qcSnCkZtFyjcVZa2VPFkApeuhrV9gw8l/tPl4gt4W2kVnGLYOz+ljg==
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_secp256k1
------BEGIN EC PRIVATE KEY-----
-MHQCAQEEIAoQpBb1rTnK1y5l1RqpEdIHZ7csrYxsxCrnubfiC9pYoAcGBSuBBAAK
-oUQDQgAEBUKCHJHsvlcod0MCVlFHylzW241nveMmRAFhryNgX6rVqooGReVUm+Wi
-F7Uz0ZsIjdHKd9HHe+2BOWfnuWyR1A==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGEAgEAMBAGByqGSM49AgEGBSuBBAAKBG0wawIBAQQgChCkFvWtOcrXLmXVGqkR
+0gdntyytjGzEKue5t+IL2lihRANCAAQFQoIckey+Vyh3QwJWUUfKXNbbjWe94yZE
+AWGvI2BfqtWqigZF5VSb5aIXtTPRmwiN0cp30cd77YE5Z+e5bJHU
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_secp256k1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4089,12 +4091,12 @@ SharedSecret=af43b52790082fd87afb1d14b883c12d12bb9e554080d1f8e527920676e31f3e
 # TEST CURVE secp384r1
 
 PrivateKey=ALICE_secp384r1
------BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDCxE7Q4m1dsK7M3OtxocgY/ejX9JOKKdAtSnRiU4bnK3eFmALkMN7XI
-veQnWLB1PEKgBwYFK4EEACKhZANiAAQaUsvUFr/uISpAmYqYZIme4VassCtb0tNG
-U97s3qt4ozcogZ4z+fIzXZ4YXqfGoEa57+uQDgqr+jNOTji7Gxopt6AqZ9EvwuVa
-CuunUi0pcx6cc8IuUfrwMwSFovV/7sM=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDCxE7Q4m1dsK7M3Otxo
+cgY/ejX9JOKKdAtSnRiU4bnK3eFmALkMN7XIveQnWLB1PEKhZANiAAQaUsvUFr/u
+ISpAmYqYZIme4VassCtb0tNGU97s3qt4ozcogZ4z+fIzXZ4YXqfGoEa57+uQDgqr
++jNOTji7Gxopt6AqZ9EvwuVaCuunUi0pcx6cc8IuUfrwMwSFovV/7sM=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_secp384r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4104,12 +4106,12 @@ Wgrrp1ItKXMenHPCLlH68DMEhaL1f+7D
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_secp384r1
------BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDBRiGXRsb5sUq0b3/dgZ+pA9kbrSivBMCUCXVwxno1d/30hI/Yy0Z5P
-WwbBgwTFprWgBwYFK4EEACKhZANiAASp1FeUOBJFmzQCNbGiOz8He0kF+KIf24UG
-YVO5MC7u5rV9hpoYsbcgmwxALskPN18os2ygK1Pnf/h+WALIsG2RknSTbiyvBYko
-IhJV9cflvEDpMeaWSLF7qJ5YjEIf9PM=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDBRiGXRsb5sUq0b3/dg
+Z+pA9kbrSivBMCUCXVwxno1d/30hI/Yy0Z5PWwbBgwTFprWhZANiAASp1FeUOBJF
+mzQCNbGiOz8He0kF+KIf24UGYVO5MC7u5rV9hpoYsbcgmwxALskPN18os2ygK1Pn
+f/h+WALIsG2RknSTbiyvBYkoIhJV9cflvEDpMeaWSLF7qJ5YjEIf9PM=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_secp384r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4131,13 +4133,14 @@ SharedSecret=2006ed49acbb991b8fbf8a15c3f263542496eaefe1e2952591b72fb929463eac7a4
 # TEST CURVE secp521r1
 
 PrivateKey=ALICE_secp521r1
------BEGIN EC PRIVATE KEY-----
-MIHcAgEBBEIAFBIz3FLAuX8VCWzMwu1f/tm8pf1QqnsdLqaIWCQAJa2W5ldpJTYf
-kj1gGxM44AD3qHnkXISvNLwwuxI1hr2+pOGgBwYFK4EEACOhgYkDgYYABACWlOOF
-Yk/p3AS2LxEQWBuMm6uIjo3XArjh1QrsLcUc5hhi82CIz6kKwKjCnYRDHq4iv1x6
-3rVEzGGhQOM1g+cRVwHSpfbBpaxK7bMLkVFOOavvOdcdyRHaHsvxw2pREmdS/Gwt
-fgT8odQrG06KMIwVeL+H08fGJSbPX0Zock0DOPCpaw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIAFBIz3FLAuX8VCWzM
+wu1f/tm8pf1QqnsdLqaIWCQAJa2W5ldpJTYfkj1gGxM44AD3qHnkXISvNLwwuxI1
+hr2+pOGhgYkDgYYABACWlOOFYk/p3AS2LxEQWBuMm6uIjo3XArjh1QrsLcUc5hhi
+82CIz6kKwKjCnYRDHq4iv1x63rVEzGGhQOM1g+cRVwHSpfbBpaxK7bMLkVFOOavv
+OdcdyRHaHsvxw2pREmdS/GwtfgT8odQrG06KMIwVeL+H08fGJSbPX0Zock0DOPCp
+aw==
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_secp521r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4148,13 +4151,14 @@ xiUmz19GaHJNAzjwqWs=
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_secp521r1
------BEGIN EC PRIVATE KEY-----
-MIHcAgEBBEIA9C/sMWveRlHPr9P5cc3U+1L2/zB0VtHewKSQRWZ67SmS4+m7uXTq
-UVSLRHiQEgQid0cg77gSxXPlmV+zy0f3zd+gBwYFK4EEACOhgYkDgYYABAE18N3S
-wDGtea3IOqUdh3j0JtnMeP41i/agEBlxK8/iEBXcQ61mkIrQIKcabRhoylEugXHi
-yNnqNQOD4DUa0bTKzAHtJ4UqqbEVno6byRmcUQwbmvG89eS8GLEmk5X/O2atHU4y
-IGTuTRQWn/BTJUCS+OgJz4FZdadscc5Z640EZqSDiw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIA9C/sMWveRlHPr9P5
+cc3U+1L2/zB0VtHewKSQRWZ67SmS4+m7uXTqUVSLRHiQEgQid0cg77gSxXPlmV+z
+y0f3zd+hgYkDgYYABAE18N3SwDGtea3IOqUdh3j0JtnMeP41i/agEBlxK8/iEBXc
+Q61mkIrQIKcabRhoylEugXHiyNnqNQOD4DUa0bTKzAHtJ4UqqbEVno6byRmcUQwb
+mvG89eS8GLEmk5X/O2atHU4yIGTuTRQWn/BTJUCS+OgJz4FZdadscc5Z640EZqSD
+iw==
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_secp521r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4177,11 +4181,11 @@ SharedSecret=018c8f33e544a0fa8854dcd96bdba75b7687d1c42b2ff1bf0a06d49c424fee96d8a
 # TEST CURVE prime192v1
 
 PrivateKey=ALICE_prime192v1
------BEGIN EC PRIVATE KEY-----
-MF8CAQEEGPF9e9IU2oPZTMVU3UttCs+XOint3FCr96AKBggqhkjOPQMBAaE0AzIA
-BOJuka5jMKORPW1YtgSiCkrPvhaqG9tC1k+QJhAKKfVyZm41b4FnSPJUSkaWmdk8
-yA==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQEEVTBTAgEBBBjxfXvSFNqD2UzFVN1L
+bQrPlzop7dxQq/ehNAMyAATibpGuYzCjkT1tWLYEogpKz74WqhvbQtZPkCYQCin1
+cmZuNW+BZ0jyVEpGlpnZPMg=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_prime192v1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4190,11 +4194,11 @@ MEkwEwYHKoZIzj0CAQYIKoZIzj0DAQEDMgAE4m6RrmMwo5E9bVi2BKIKSs++Fqob
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_prime192v1
------BEGIN EC PRIVATE KEY-----
-MF8CAQEEGF7Bqpc1mVjKqea4QQRj+hRd7f+OnOGbIaAKBggqhkjOPQMBAaE0AzIA
-BKSnA0kQ//UW65YoIMNSbbqLKquz7MrBrJmdoXvtgLqoK2CJrvI1xKX22VYeHeBC
-DA==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQEEVTBTAgEBBBhewaqXNZlYyqnmuEEE
+Y/oUXe3/jpzhmyGhNAMyAASkpwNJEP/1FuuWKCDDUm26iyqrs+zKwayZnaF77YC6
+qCtgia7yNcSl9tlWHh3gQgw=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_prime192v1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4215,11 +4219,11 @@ SharedSecret=be2a779b587f8f5d7c9d8f006e0a6d0e996c9c63c255f861
 # TEST CURVE prime192v2
 
 PrivateKey=ALICE_prime192v2
------BEGIN EC PRIVATE KEY-----
-MF8CAQEEGC0i4qqlFzusRi4bHVp0PFy+yjQ0BnD59aAKBggqhkjOPQMBAqE0AzIA
-BMxIfAk+rvrVVrClFsosHe64NKeDhZ4U+OG+5svqDxXxSoVopEQPk9QhDSVhK1UJ
-qg==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQIEVTBTAgEBBBgtIuKqpRc7rEYuGx1a
+dDxcvso0NAZw+fWhNAMyAATMSHwJPq761VawpRbKLB3uuDSng4WeFPjhvubL6g8V
+8UqFaKRED5PUIQ0lYStVCao=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_prime192v2_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4228,11 +4232,11 @@ nhT44b7my+oPFfFKhWikRA+T1CENJWErVQmq
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_prime192v2
------BEGIN EC PRIVATE KEY-----
-MF8CAQEEGCBOOpYLX+Ieu8pH3+7WDGkva1YmSQAxi6AKBggqhkjOPQMBAqE0AzIA
-BJricb7As9MfF+SqJMgjk8EsApeZdR/l0y2mYClyOuNeOfAkgkRCvzQwr36DWtqo
-3w==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQIEVTBTAgEBBBggTjqWC1/iHrvKR9/u
+1gxpL2tWJkkAMYuhNAMyAASa4nG+wLPTHxfkqiTII5PBLAKXmXUf5dMtpmApcjrj
+XjnwJIJEQr80MK9+g1raqN8=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_prime192v2_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4253,11 +4257,11 @@ SharedSecret=9b37033a48af7fe1825c062625f8b57d4b3ac48c12bec69c
 # TEST CURVE prime192v3
 
 PrivateKey=ALICE_prime192v3
------BEGIN EC PRIVATE KEY-----
-MF8CAQEEGDSIN1yCKx7X+/aTqOxSSArBc+rH+4klN6AKBggqhkjOPQMBA6E0AzIA
-BDr+LSlI0eTzbhc7oy/SKtB9K/bLMZDL4PBaj+SVlyiQ8NxcoR1TxmacAAEfuPpR
-Xw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQMEVTBTAgEBBBg0iDdcgise1/v2k6js
+UkgKwXPqx/uJJTehNAMyAAQ6/i0pSNHk824XO6Mv0irQfSv2yzGQy+DwWo/klZco
+kPDcXKEdU8ZmnAABH7j6UV8=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_prime192v3_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4266,11 +4270,11 @@ kMvg8FqP5JWXKJDw3FyhHVPGZpwAAR+4+lFf
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_prime192v3
------BEGIN EC PRIVATE KEY-----
-MF8CAQEEGJ5bWG6rBVTd6/uqClMsWNgQxE8404BxoqAKBggqhkjOPQMBA6E0AzIA
-BJdpOMEhBfrzoFkkCJ1f6EW68PLFs3W8FC+njQ5WXQsIbiGhn7kxwu08BMv6iwq9
-fw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQMEVTBTAgEBBBieW1huqwVU3ev7qgpT
+LFjYEMRPONOAcaKhNAMyAASXaTjBIQX686BZJAidX+hFuvDyxbN1vBQvp40OVl0L
+CG4hoZ+5McLtPATL+osKvX8=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_prime192v3_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4291,11 +4295,11 @@ SharedSecret=7133f1d99b0e03ed9c4d78d3be40598cf419cd588283ac29
 # TEST CURVE prime239v1
 
 PrivateKey=ALICE_prime239v1
------BEGIN EC PRIVATE KEY-----
-MHECAQEEHkZomV2qq97tdYYhitXB++VP6ynNfvGDKsXF4QAkZKAKBggqhkjOPQMB
-BKFAAz4ABHyCaVYIAl1ETh4F+IeYeuv9D4K/2jLTKhMR0D+88VmM393GAD+Ff7fT
-gk+fNlozC5wpnZRZ2FDw+dHclA==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGBAgEAMBMGByqGSM49AgEGCCqGSM49AwEEBGcwZQIBAQQeRmiZXaqr3u11hiGK
+1cH75U/rKc1+8YMqxcXhACRkoUADPgAEfIJpVggCXUROHgX4h5h66/0Pgr/aMtMq
+ExHQP7zxWYzf3cYAP4V/t9OCT582WjMLnCmdlFnYUPD50dyU
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_prime239v1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4304,11 +4308,11 @@ MtMqExHQP7zxWYzf3cYAP4V/t9OCT582WjMLnCmdlFnYUPD50dyU
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_prime239v1
------BEGIN EC PRIVATE KEY-----
-MHECAQEEHgGxkUaAYKh1VARaLeZvWLZvEVPiEpAN91YEKxxjP6AKBggqhkjOPQMB
-BKFAAz4ABHUYD7C/zIt7nCXGIm7xSUMQw8i6oFB94jJNuukQBxaqIqIhk+9kzonQ
-YYvla1J+jTiMp2vH6MMNjOOb0Q==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGBAgEAMBMGByqGSM49AgEGCCqGSM49AwEEBGcwZQIBAQQeAbGRRoBgqHVUBFot
+5m9Ytm8RU+ISkA33VgQrHGM/oUADPgAEdRgPsL/Mi3ucJcYibvFJQxDDyLqgUH3i
+Mk266RAHFqoioiGT72TOidBhi+VrUn6NOIyna8foww2M45vR
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_prime239v1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4329,11 +4333,11 @@ SharedSecret=2ef92070f7a5fa14c8a67a8aa3080b4c4a597eafaa81d3f698599ac0be1e
 # TEST CURVE prime239v2
 
 PrivateKey=ALICE_prime239v2
------BEGIN EC PRIVATE KEY-----
-MHECAQEEHnpqukuabhxfeGVv1ugTEYpvhxRTNM8VWUKVhvm39qAKBggqhkjOPQMB
-BaFAAz4ABC7pFKHQkLJsMxlUd5SxBikOqrhnepA1zQ443DKw2mwbVig7rlK4IwRr
-COzUWwkNGuTVk6PhJ1ntC122DQ==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGBAgEAMBMGByqGSM49AgEGCCqGSM49AwEFBGcwZQIBAQQeemq6S5puHF94ZW/W
+6BMRim+HFFM0zxVZQpWG+bf2oUADPgAELukUodCQsmwzGVR3lLEGKQ6quGd6kDXN
+DjjcMrDabBtWKDuuUrgjBGsI7NRbCQ0a5NWTo+EnWe0LXbYN
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_prime239v2_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4342,11 +4346,11 @@ kDXNDjjcMrDabBtWKDuuUrgjBGsI7NRbCQ0a5NWTo+EnWe0LXbYN
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_prime239v2
------BEGIN EC PRIVATE KEY-----
-MHECAQEEHgBGgsO7pRfBmXJm42g5nK8PBnsfoV9Kzb8M6Au/uqAKBggqhkjOPQMB
-BaFAAz4ABCodBJmFKY+l27hBsTAWj5hAk/C/vooVFprOMWrtEVGIo+B4EtYI0jA3
-8r7wgVMtdESJMPoKMVXVIX1trg==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGBAgEAMBMGByqGSM49AgEGCCqGSM49AwEFBGcwZQIBAQQeAEaCw7ulF8GZcmbj
+aDmcrw8Gex+hX0rNvwzoC7+6oUADPgAEKh0EmYUpj6XbuEGxMBaPmECT8L++ihUW
+ms4xau0RUYij4HgS1gjSMDfyvvCBUy10RIkw+goxVdUhfW2u
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_prime239v2_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4367,11 +4371,11 @@ SharedSecret=5bdab282dc371ee88ade318a6aad2b329ec3ea957e0df18b7a691c1bf703
 # TEST CURVE prime239v3
 
 PrivateKey=ALICE_prime239v3
------BEGIN EC PRIVATE KEY-----
-MHECAQEEHhpcEjwGH5oj/a9pwEg+dlaismaRJ1PiZsp5X9gyO6AKBggqhkjOPQMB
-BqFAAz4ABBZSAeGJfuSdruCS2L/M/orcH/l5zi/wQ6jSt7kaGDyh2HWFiZIF8ZEN
-UA2cDaaQEEXMUoEypyelfHK26Q==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGBAgEAMBMGByqGSM49AgEGCCqGSM49AwEGBGcwZQIBAQQeGlwSPAYfmiP9r2nA
+SD52VqKyZpEnU+Jmynlf2DI7oUADPgAEFlIB4Yl+5J2u4JLYv8z+itwf+XnOL/BD
+qNK3uRoYPKHYdYWJkgXxkQ1QDZwNppAQRcxSgTKnJ6V8crbp
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_prime239v3_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4380,11 +4384,11 @@ L/BDqNK3uRoYPKHYdYWJkgXxkQ1QDZwNppAQRcxSgTKnJ6V8crbp
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_prime239v3
------BEGIN EC PRIVATE KEY-----
-MHECAQEEHlNSiHyQRryLa/P/4JFtc6D5L3qPZb1wZZ1Fef+aw6AKBggqhkjOPQMB
-BqFAAz4ABHqXNNwBBIDpyPor6YxleMqb5/LEUGlQG90AHiBGA0C1ARTnW95BdjL5
-ZyyldzgnQdxkIDX2bRB23Z9G6g==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGBAgEAMBMGByqGSM49AgEGCCqGSM49AwEGBGcwZQIBAQQeU1KIfJBGvItr8//g
+kW1zoPkveo9lvXBlnUV5/5rDoUADPgAEepc03AEEgOnI+ivpjGV4ypvn8sRQaVAb
+3QAeIEYDQLUBFOdb3kF2MvlnLKV3OCdB3GQgNfZtEHbdn0bq
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_prime239v3_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4405,11 +4409,11 @@ SharedSecret=78e80ae760061178bd005e9e3634333971468bc6d3f82baee238c5ed32f9
 # TEST CURVE prime256v1
 
 PrivateKey=ALICE_prime256v1
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJVDw5PIEPJTI9/Fe9IzwWQ30FMeaTTlUijjE6pYdODzoAoGCCqGSM49
-AwEHoUQDQgAEavO8PitKvW9ZsyRod9PZIzb2E0tNpmJBysQHsImcJrf+cPubssM/
-/tNd9EnQFm17RAo2h1CveGBB86dBvzwpeQ==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQglUPDk8gQ8lMj38V7
+0jPBZDfQUx5pNOVSKOMTqlh04POhRANCAARq87w+K0q9b1mzJGh309kjNvYTS02m
+YkHKxAewiZwmt/5w+5uywz/+0130SdAWbXtECjaHUK94YEHzp0G/PCl5
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_prime256v1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4418,11 +4422,11 @@ pmJBysQHsImcJrf+cPubssM//tNd9EnQFm17RAo2h1CveGBB86dBvzwpeQ==
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_prime256v1
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIDbC35/7EWX5vWXDO8VEYlB0+/sPCYJPUm8E1Q46S2GJoAoGCCqGSM49
-AwEHoUQDQgAEkZsijYFGwAxsZCDgFYfU+yF79mQ0+iOWDFusDrNu1TDgA9AIjS67
-+7FtU3asZFLRde/xhaS7xTrmXG3V+Kd4vw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgNsLfn/sRZfm9ZcM7
+xURiUHT7+w8Jgk9SbwTVDjpLYYmhRANCAASRmyKNgUbADGxkIOAVh9T7IXv2ZDT6
+I5YMW6wOs27VMOAD0AiNLrv7sW1TdqxkUtF17/GFpLvFOuZcbdX4p3i/
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_prime256v1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4443,10 +4447,10 @@ SharedSecret=390021fbca00d959c1adaf7e9cedef0e65a582489eab9adbe739ef66bf82adb4
 # TEST CURVE sect113r1
 
 PrivateKey=ALICE_sect113r1
------BEGIN EC PRIVATE KEY-----
-MEECAQEEDwBys/27wGVZviSeQZVmZKAHBgUrgQQABKEiAyAABAG+JN/rb7VXh60l
-vYP0uQFp0AWZ2ZFL6tUjeylNiw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MFECAQAwEAYHKoZIzj0CAQYFK4EEAAQEOjA4AgEBBA8AcrP9u8BlWb4knkGVZmSh
+IgMgAAQBviTf62+1V4etJb2D9LkBadAFmdmRS+rVI3spTYs=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_sect113r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4455,10 +4459,10 @@ MDQwEAYHKoZIzj0CAQYFK4EEAAQDIAAEAb4k3+tvtVeHrSW9g/S5AWnQBZnZkUvq
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_sect113r1
------BEGIN EC PRIVATE KEY-----
-MEECAQEEDwCaESrcD0p1spBTPUX8zKAHBgUrgQQABKEiAyAABAC5JEE3FeMiN7PC
-sYXxWQHFZHr2DRQloEggCul02g==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MFECAQAwEAYHKoZIzj0CAQYFK4EEAAQEOjA4AgEBBA8AmhEq3A9KdbKQUz1F/Myh
+IgMgAAQAuSRBNxXjIjezwrGF8VkBxWR69g0UJaBIIArpdNo=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_sect113r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4479,10 +4483,10 @@ SharedSecret=015405437add26b8841c62a9016c85
 # TEST CURVE sect113r2
 
 PrivateKey=ALICE_sect113r2
------BEGIN EC PRIVATE KEY-----
-MEECAQEEDwAGoVnpnsEoqO+vNeH31aAHBgUrgQQABaEiAyAABAFNBMcD25LFxnyS
-+xJVRQFwtDibjlTXRXBUJD6gZA==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MFECAQAwEAYHKoZIzj0CAQYFK4EEAAUEOjA4AgEBBA8ABqFZ6Z7BKKjvrzXh99Wh
+IgMgAAQBTQTHA9uSxcZ8kvsSVUUBcLQ4m45U10VwVCQ+oGQ=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_sect113r2_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4491,10 +4495,10 @@ cFQkPqBk
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_sect113r2
------BEGIN EC PRIVATE KEY-----
-MEECAQEEDwAE8eFnSQKnROhxAki6K6AHBgUrgQQABaEiAyAABAFKLu75SvvvqIbK
-DQiPpQA3vQjM9VnEYrnM/GnrCg==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MFECAQAwEAYHKoZIzj0CAQYFK4EEAAUEOjA4AgEBBA8ABPHhZ0kCp0TocQJIuiuh
+IgMgAAQBSi7u+Ur776iGyg0Ij6UAN70IzPVZxGK5zPxp6wo=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_sect113r2_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4515,10 +4519,10 @@ SharedSecret=014231c5e9e28d451aa44a755407e1
 # TEST CURVE sect131r1
 
 PrivateKey=ALICE_sect131r1
------BEGIN EC PRIVATE KEY-----
-MEcCAQEEEQBQIUPAkstOEseIOXD9ByfxoAcGBSuBBAAWoSYDJAAEABT7LAX2I+/o
-sOV0o4uEuBcFEjsSlmdtc9eFSaRBY+EcBA==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MFcCAQAwEAYHKoZIzj0CAQYFK4EEABYEQDA+AgEBBBEAUCFDwJLLThLHiDlw/Qcn
+8aEmAyQABAAU+ywF9iPv6LDldKOLhLgXBRI7EpZnbXPXhUmkQWPhHAQ=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_sect131r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4527,10 +4531,10 @@ c9eFSaRBY+EcBA==
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_sect131r1
------BEGIN EC PRIVATE KEY-----
-MEcCAQEEEQPHEzPGPEmZh9Jm9Ykqr5W8oAcGBSuBBAAWoSYDJAAEAUdDZr6H5ifk
-3gu3QiglxVUGt/3GRk1LTHFuWH7TCd2r2w==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MFcCAQAwEAYHKoZIzj0CAQYFK4EEABYEQDA+AgEBBBEDxxMzxjxJmYfSZvWJKq+V
+vKEmAyQABAFHQ2a+h+Yn5N4Lt0IoJcVVBrf9xkZNS0xxblh+0wndq9s=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_sect131r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4551,10 +4555,10 @@ SharedSecret=009e4acc8c1ba3a129a9ad83a733d7d702
 # TEST CURVE sect131r2
 
 PrivateKey=ALICE_sect131r2
------BEGIN EC PRIVATE KEY-----
-MEcCAQEEEQMc8+1AIokHyDTWsyRPxKT1oAcGBSuBBAAXoSYDJAAEBxaXZn/WQhzi
-ZYJtEfj5z/YHjtELfUnKJ8q+TGQe3TnHeA==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MFcCAQAwEAYHKoZIzj0CAQYFK4EEABcEQDA+AgEBBBEDHPPtQCKJB8g01rMkT8Sk
+9aEmAyQABAcWl2Z/1kIc4mWCbRH4+c/2B47RC31JyifKvkxkHt05x3g=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_sect131r2_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4563,10 +4567,10 @@ J8q+TGQe3TnHeA==
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_sect131r2
------BEGIN EC PRIVATE KEY-----
-MEcCAQEEEQNH17P9i1Lb1Lv9Hn6tSJdUoAcGBSuBBAAXoSYDJAAEAtkc0EhMOiKC
-k7BPNzOVo30CxGTknMxQldiS8ESqP5ggtA==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MFcCAQAwEAYHKoZIzj0CAQYFK4EEABcEQDA+AgEBBBEDR9ez/YtS29S7/R5+rUiX
+VKEmAyQABALZHNBITDoigpOwTzczlaN9AsRk5JzMUJXYkvBEqj+YILQ=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_sect131r2_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4587,10 +4591,11 @@ SharedSecret=03cbec3a3050c7f13d4801ad692d61c417
 # TEST CURVE sect163k1
 
 PrivateKey=ALICE_sect163k1
------BEGIN EC PRIVATE KEY-----
-MFMCAQEEFQHGR4Y5cTzo8CKOmTy2s39/eSXhSaAHBgUrgQQAAaEuAywABAPWGsMI
-nYxIUpnpDXVxOWVf+XkdjQeDldkLEwULzgBpzPA+00lg0LF8KQ==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGMCAQAwEAYHKoZIzj0CAQYFK4EEAAEETDBKAgEBBBUBxkeGOXE86PAijpk8trN/
+f3kl4UmhLgMsAAQD1hrDCJ2MSFKZ6Q11cTllX/l5HY0Hg5XZCxMFC84AaczwPtNJ
+YNCxfCk=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_sect163k1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4599,10 +4604,11 @@ MEAwEAYHKoZIzj0CAQYFK4EEAAEDLAAEA9YawwidjEhSmekNdXE5ZV/5eR2NB4OV
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_sect163k1
------BEGIN EC PRIVATE KEY-----
-MFMCAQEEFQJQnmQi1J9eJ0deyCiRxLufM8Vs5KAHBgUrgQQAAaEuAywABAatg0nW
-qB1vcD0hI6ZO6N9L5ZgUrAFdeskSW4CR42HeNecOrxf5cEHSTw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGMCAQAwEAYHKoZIzj0CAQYFK4EEAAEETDBKAgEBBBUCUJ5kItSfXidHXsgokcS7
+nzPFbOShLgMsAAQGrYNJ1qgdb3A9ISOmTujfS+WYFKwBXXrJEluAkeNh3jXnDq8X
++XBB0k8=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_sect163k1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4623,10 +4629,11 @@ SharedSecret=07bfdf00759b383aa7741ae4634400f8ddf2047092
 # TEST CURVE sect163r1
 
 PrivateKey=ALICE_sect163r1
------BEGIN EC PRIVATE KEY-----
-MFMCAQEEFQGX3OaU+YUXm/2HUggQ0DHVvy2PT6AHBgUrgQQAAqEuAywABATePwmf
-nwIK0QPC85nkPCBgYFi8gQLPXM3xTA99MVJ1eNNZByv2BbE0wA==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGMCAQAwEAYHKoZIzj0CAQYFK4EEAAIETDBKAgEBBBUBl9zmlPmFF5v9h1IIENAx
+1b8tj0+hLgMsAAQE3j8Jn58CCtEDwvOZ5DwgYGBYvIECz1zN8UwPfTFSdXjTWQcr
+9gWxNMA=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_sect163r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4635,10 +4642,11 @@ zfFMD30xUnV401kHK/YFsTTA
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_sect163r1
------BEGIN EC PRIVATE KEY-----
-MFMCAQEEFQD+fM3nIJq+9mVfIMYSKFavAbfrT6AHBgUrgQQAAqEuAywABAO3pdkd
-/NcAFJOcaHN+g+190tmBqgaEF15bP7fXy82YLoAwk/4+e0fOwA==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGMCAQAwEAYHKoZIzj0CAQYFK4EEAAIETDBKAgEBBBUA/nzN5yCavvZlXyDGEihW
+rwG360+hLgMsAAQDt6XZHfzXABSTnGhzfoPtfdLZgaoGhBdeWz+318vNmC6AMJP+
+PntHzsA=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_sect163r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4659,10 +4667,11 @@ SharedSecret=02355c765bbc07fcc44bb1496e490912f6df56e6d4
 # TEST CURVE sect163r2
 
 PrivateKey=ALICE_sect163r2
------BEGIN EC PRIVATE KEY-----
-MFMCAQEEFQOMfYbsGQ9MEzhW2WNpCvyxdUs06qAHBgUrgQQAD6EuAywABAcepbEl
-ZHYqscI+n89KNkh0rzwRPQDfbf9Q5PGFgfCwulHuundqGrWVDw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGMCAQAwEAYHKoZIzj0CAQYFK4EEAA8ETDBKAgEBBBUDjH2G7BkPTBM4VtljaQr8
+sXVLNOqhLgMsAAQHHqWxJWR2KrHCPp/PSjZIdK88ET0A323/UOTxhYHwsLpR7rp3
+ahq1lQ8=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_sect163r2_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4671,10 +4680,11 @@ MEAwEAYHKoZIzj0CAQYFK4EEAA8DLAAEBx6lsSVkdiqxwj6fz0o2SHSvPBE9AN9t
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_sect163r2
------BEGIN EC PRIVATE KEY-----
-MFMCAQEEFQFc4z1ObqwpdSVEuVbQeAI1MPFbaKAHBgUrgQQAD6EuAywABAbFrzFF
-wL5MhwOAa16ENURXU+gGiQHC0guPXo09gLRoFkjz+cUXiOGCZw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGMCAQAwEAYHKoZIzj0CAQYFK4EEAA8ETDBKAgEBBBUBXOM9Tm6sKXUlRLlW0HgC
+NTDxW2ihLgMsAAQGxa8xRcC+TIcDgGtehDVEV1PoBokBwtILj16NPYC0aBZI8/nF
+F4jhgmc=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_sect163r2_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4695,11 +4705,11 @@ SharedSecret=040df54e6df412790ef5c0fafbbfcba5136b872951
 # TEST CURVE sect193r1
 
 PrivateKey=ALICE_sect193r1
------BEGIN EC PRIVATE KEY-----
-MF8CAQEEGQARCWh8GW+PzMMrmjgIJ8Bo5A6aUDJOKYGgBwYFK4EEABihNgM0AAQA
-oFzJEHFANlO+k8zf1lVdhBLlonBl9Sc3AGflPbqbXlEzgwudgZ2SVwAzygw4wv33
-3A==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MG8CAQAwEAYHKoZIzj0CAQYFK4EEABgEWDBWAgEBBBkAEQlofBlvj8zDK5o4CCfA
+aOQOmlAyTimBoTYDNAAEAKBcyRBxQDZTvpPM39ZVXYQS5aJwZfUnNwBn5T26m15R
+M4MLnYGdklcAM8oMOML999w=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_sect193r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -4708,11 +4718,11 @@ NwBn5T26m15RM4MLnYGdklcAM8oMOML999w=
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_sect193r1
------BEGIN EC PRIVATE KEY-----
-MF8CAQEEGQCfG9gsplrDhGPbhZNEF+CJqvm+ndHekImgBwYFK4EEABihNgM0AAQB
-fDQ9a3c+1lPm/1ofSjpacW0UY4E0RSlhAT+MGPNQcgKow1lMfL2BPZH3JzQYFn8O
-Jw==
------END EC PRIVATE KEY-----
+--