Reformat evptests.txt
authorNicola Tuveri <nic.tuv@gmail.com>
Thu, 13 Apr 2017 17:56:19 +0000 (20:56 +0300)
committerRich Salz <rsalz@openssl.org>
Fri, 14 Apr 2017 12:19:19 +0000 (08:19 -0400)
When compiling without EC support the test fails abruptly reading some keys.
Some keys merged in commit db04055 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: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3223)

test/evptests.txt

index 9310aa1..cad828f 100644 (file)
@@ -2624,7 +2624,6 @@ Output = 8F49A1B7D6AA2258
 # RSA 2048 bit key.
 
 PrivateKey = RSA-2048
-
 -----BEGIN PRIVATE KEY-----
 MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDNAIHqeyrh6gbV
 n3xz2f+5SglhXC5Lp8Y2zvCN01M+wxhVJbAVx2m5mnfWclv5w1Mqm25fZifV+4UW
@@ -2657,7 +2656,6 @@ fMkTd7GabVourqIZdgvu1Q==
 # Corresponding public key
 
 PublicKey = RSA-2048-PUBLIC
-
 -----BEGIN PUBLIC KEY-----
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzQCB6nsq4eoG1Z98c9n/
 uUoJYVwuS6fGNs7wjdNTPsMYVSWwFcdpuZp31nJb+cNTKptuX2Yn1fuFFgdo092p
@@ -2671,7 +2669,6 @@ TwIDAQAB
 # EC P-256 key
 
 PrivateKey=P-256
-
 -----BEGIN PRIVATE KEY-----
 MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgiocvtiiTxNH/xbnw
 +RdYBp+DUuCPoFpJ+NuSbLVyhyWhRANCAAQsFQ9CnOcPIWwlLPXgYs4fY5zV0WXH
@@ -2681,7 +2678,6 @@ MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgiocvtiiTxNH/xbnw
 # EC public key for above
 
 PublicKey=P-256-PUBLIC
-
 -----BEGIN PUBLIC KEY-----
 MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAELBUPQpznDyFsJSz14GLOH2Oc1dFl
 x/iUJAcsJxl9eLM7kg6VzbZk6ZDc8M/qDZTiqOavnQ5YBW5lMQSSW5/myQ==
@@ -2703,7 +2699,6 @@ CrmVlCNy6lFAldO8IPkSyzGPMjSvZI6nIGQ7P3Afm3reuJ0KvnTZ77acRg==
 
 # DSA key
 PrivateKey=DSA-1024
-
 -----BEGIN PRIVATE KEY-----
 MIIBSwIBADCCASwGByqGSM44BAEwggEfAoGBAO0SwRpkAeM21qSM5ch4CLEHpFk4
 19R5ve1UUr421y3HEUURsrVpxYKvyx8aOBQC/akz95cYxNN3y1JnJJMxPklhdJrJ
@@ -2715,7 +2710,6 @@ woS0mp33oQYs43nt29B6UwbtMmbzCOQ9vGGwWVho+JtHyyPWrDuLmkvLtoQPaxYt
 -----END PRIVATE KEY-----
 
 PublicKey=DSA-1024-PUBLIC
-
 -----BEGIN PUBLIC KEY-----
 MIIBtzCCASwGByqGSM44BAEwggEfAoGBAO0SwRpkAeM21qSM5ch4CLEHpFk419R5
 ve1UUr421y3HEUURsrVpxYKvyx8aOBQC/akz95cYxNN3y1JnJJMxPklhdJrJf/WD
@@ -5258,10 +5252,10 @@ Output=eaf1a73a1b0c4609537de69cd9228bbcfb9a8ca8c6c3efaf056fe4a7f4634ed00b7c39ec6
 # 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-----
@@ -5270,10 +5264,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-----
@@ -5294,10 +5288,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-----
@@ -5306,10 +5300,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-----
@@ -5330,10 +5324,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-----
@@ -5342,10 +5336,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-----
@@ -5366,10 +5360,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-----
@@ -5378,10 +5372,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-----
@@ -5402,10 +5396,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-----
@@ -5414,10 +5409,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-----
@@ -5438,10 +5434,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-----
@@ -5450,10 +5447,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-----
@@ -5474,10 +5472,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-----
@@ -5486,10 +5485,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-----
@@ -5510,10 +5510,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-----
@@ -5522,10 +5523,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-----
@@ -5546,11 +5548,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-----
@@ -5559,11 +5561,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-----
@@ -5584,11 +5586,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-----
@@ -5597,11 +5599,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-----
@@ -5622,11 +5624,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-----
@@ -5635,11 +5637,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-----
@@ -5660,12 +5662,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-----
@@ -5675,12 +5677,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-----
@@ -5702,13 +5704,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-----
@@ -5719,13 +5722,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-----
@@ -5748,11 +5752,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-----
@@ -5761,11 +5765,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-----
@@ -5786,11 +5790,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-----
@@ -5799,11 +5803,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-----
@@ -5824,11 +5828,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-----
@@ -5837,11 +5841,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-----
@@ -5862,11 +5866,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-----
@@ -5875,11 +5879,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-----
@@ -5900,11 +5904,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-----
@@ -5913,11 +5917,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-----
@@ -5938,11 +5942,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-----
@@ -5951,11 +5955,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-----
@@ -5976,11 +5980,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-----
@@ -5989,11 +5993,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-----
@@ -6014,10 +6018,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-----
@@ -6026,10 +6030,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-----
@@ -6050,10 +6054,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-----
@@ -6062,10 +6066,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-----
@@ -6086,10 +6090,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-----
@@ -6098,10 +6102,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-----
@@ -6122,10 +6126,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-----
@@ -6134,10 +6138,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-----
@@ -6158,10 +6162,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-----
@@ -6170,10 +6175,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-----
@@ -6194,10 +6200,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-----
@@ -6206,10 +6213,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-----
@@ -6230,10 +6238,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-----
@@ -6242,10 +6251,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-----
@@ -6266,11 +6276,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-----
@@ -6279,11 +6289,11 @@ NwBn5T26m15RM4MLnYGdklcAM8oMOML999w=
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_sect193r1
------BEGIN EC PRIVATE KEY-----
-MF8CAQEEGQCfG9gsplrDhGPbhZNEF+CJqvm+ndHekImgBwYFK4EEABihNgM0AAQB
-fDQ9a3c+1lPm/1ofSjpacW0UY4E0RSlhAT+MGPNQcgKow1lMfL2BPZH3JzQYFn8O
-Jw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MG8CAQAwEAYHKoZIzj0CAQYFK4EEABgEWDBWAgEBBBkAnxvYLKZaw4Rj24WTRBfg
+iar5vp3R3pCJoTYDNAAEAXw0PWt3PtZT5v9aH0o6WnFtFGOBNEUpYQE/jBjzUHIC
+qMNZTHy9gT2R9yc0GBZ/Dic=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_sect193r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6304,11 +6314,11 @@ SharedSecret=00458b4c5ad122de5a377bea0adf1ab87bcb961b24ed764f47
 # TEST CURVE sect193r2
 
 PrivateKey=ALICE_sect193r2
------BEGIN EC PRIVATE KEY-----
-MF8CAQEEGQCPnhdBb5vdudf126+ppr6U9M1y86XFEC+gBwYFK4EEABmhNgM0AAQA
-eFbrGMfhM0+z97Xa2xlywYP5r3aQBaTBAVzibUhLHiia03IJUjsVdXnM2doZZUAJ
-Pg==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MG8CAQAwEAYHKoZIzj0CAQYFK4EEABkEWDBWAgEBBBkAj54XQW+b3bnX9duvqaa+
+lPTNcvOlxRAvoTYDNAAEAHhW6xjH4TNPs/e12tsZcsGD+a92kAWkwQFc4m1ISx4o
+mtNyCVI7FXV5zNnaGWVACT4=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_sect193r2_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6317,11 +6327,11 @@ wQFc4m1ISx4omtNyCVI7FXV5zNnaGWVACT4=
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_sect193r2
------BEGIN EC PRIVATE KEY-----
-MF8CAQEEGQC8yJVHRpuTqkeh44gERIt8H0HiCxkmMuygBwYFK4EEABmhNgM0AAQA
-O0oNzAvrrT4ybXVWXbngYjdOcP5+tqB3AX7BjmqUy7lW2tQMwe4A/Srd4ZBSyvM2
-jQ==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MG8CAQAwEAYHKoZIzj0CAQYFK4EEABkEWDBWAgEBBBkAvMiVR0abk6pHoeOIBESL
+fB9B4gsZJjLsoTYDNAAEADtKDcwL660+Mm11Vl254GI3TnD+fragdwF+wY5qlMu5
+VtrUDMHuAP0q3eGQUsrzNo0=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_sect193r2_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6342,11 +6352,11 @@ SharedSecret=019d1f316d204a9cd1b9632cebb4accddb204158be3e435891
 # TEST CURVE sect233k1
 
 PrivateKey=ALICE_sect233k1
------BEGIN EC PRIVATE KEY-----
-MG0CAQEEHVpHupoqbW+ZlYrZsawnWteYfoGlORbi3UvjNJ/8oAcGBSuBBAAaoUAD
-PgAEANwOK/5tO89VWKpgs3PTpU7nCh2vL6waLp+ckitBAJN9n13nCGIixtjlOGVy
-bsjQD9wgahKED/ou6Y5U
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MH0CAQAwEAYHKoZIzj0CAQYFK4EEABoEZjBkAgEBBB1aR7qaKm1vmZWK2bGsJ1rX
+mH6BpTkW4t1L4zSf/KFAAz4ABADcDiv+bTvPVViqYLNz06VO5wodry+sGi6fnJIr
+QQCTfZ9d5whiIsbY5Thlcm7I0A/cIGoShA/6LumOVA==
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_sect233k1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6355,11 +6365,11 @@ Lp+ckitBAJN9n13nCGIixtjlOGVybsjQD9wgahKED/ou6Y5U
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_sect233k1
------BEGIN EC PRIVATE KEY-----
-MG0CAQEEHShrkGvNjGbqafnVfKmGfpc5SMpz2gwMcKjADIdNoAcGBSuBBAAaoUAD
-PgAEAYqIW4UlVB7KYdhFWe3Ys0XYxJpMxwv0kZI+fbM7AGKzkxLiSAQVqRZCXsqk
-aLLe9Lz3CaluW8csn/4h
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MH0CAQAwEAYHKoZIzj0CAQYFK4EEABoEZjBkAgEBBB0oa5BrzYxm6mn51Xyphn6X
+OUjKc9oMDHCowAyHTaFAAz4ABAGKiFuFJVQeymHYRVnt2LNF2MSaTMcL9JGSPn2z
+OwBis5MS4kgEFakWQl7KpGiy3vS89wmpblvHLJ/+IQ==
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_sect233k1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6380,11 +6390,11 @@ SharedSecret=00a5e5f2e992f4360d530dd365d14f5c6013212e14f4ea258c91c71f1512
 # TEST CURVE sect233r1
 
 PrivateKey=ALICE_sect233r1
------BEGIN EC PRIVATE KEY-----
-MG4CAQEEHgAQ3p949HaCLPJfNTqQiBQaKOnn4hABeg0F8qdV4KAHBgUrgQQAG6FA
-Az4ABAHSQTC7Z/BBajW/WPtdDy4lPeIzBELzD5zGDHEZDgH8XKOuEhSkQNZoyp9X
-bcxxnpZ1shR7cxnsrmkbfw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MH4CAQAwEAYHKoZIzj0CAQYFK4EEABsEZzBlAgEBBB4AEN6fePR2gizyXzU6kIgU
+Gijp5+IQAXoNBfKnVeChQAM+AAQB0kEwu2fwQWo1v1j7XQ8uJT3iMwRC8w+cxgxx
+GQ4B/FyjrhIUpEDWaMqfV23McZ6WdbIUe3MZ7K5pG38=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_sect233r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6393,11 +6403,11 @@ nMYMcRkOAfxco64SFKRA1mjKn1dtzHGelnWyFHtzGeyuaRt/
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_sect233r1
------BEGIN EC PRIVATE KEY-----
-MG4CAQEEHgBcdY55Lp8bRcIfcWccO5IhwQtR4Mb4Bg014tVl3qAHBgUrgQQAG6FA
-Az4ABABhFFgfTXu7Fxow8XcY6wvhu+h1bXJksS0vemYKRwB+okj/ieIKvy4cqHSA
-FrYkGMFYxXW7wyl/rS6+iQ==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MH4CAQAwEAYHKoZIzj0CAQYFK4EEABsEZzBlAgEBBB4AXHWOeS6fG0XCH3FnHDuS
+IcELUeDG+AYNNeLVZd6hQAM+AAQAYRRYH017uxcaMPF3GOsL4bvodW1yZLEtL3pm
+CkcAfqJI/4niCr8uHKh0gBa2JBjBWMV1u8Mpf60uvok=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_sect233r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6418,11 +6428,11 @@ SharedSecret=01625f3fcd367ee7cd74c67cca02dccfce6c3b19ef07e358ed943d17a8e2
 # TEST CURVE sect239k1
 
 PrivateKey=ALICE_sect239k1
------BEGIN EC PRIVATE KEY-----
-MG4CAQEEHgyGm5BO0N4sFuhmCJbXV38oGWBQvhi9ONnzODgdHaAHBgUrgQQAA6FA
-Az4ABBp9EPpfcv/tz8U3r0q4DThrhuHEdl7ObPUbXma2W3CXzOVaxHn4Y1OjFXQ4
-EttK0BBtfGoFrYaDzcHShw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MH4CAQAwEAYHKoZIzj0CAQYFK4EEAAMEZzBlAgEBBB4MhpuQTtDeLBboZgiW11d/
+KBlgUL4YvTjZ8zg4HR2hQAM+AAQafRD6X3L/7c/FN69KuA04a4bhxHZezmz1G15m
+tltwl8zlWsR5+GNToxV0OBLbStAQbXxqBa2Gg83B0oc=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_sect239k1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6431,11 +6441,11 @@ MFIwEAYHKoZIzj0CAQYFK4EEAAMDPgAEGn0Q+l9y/+3PxTevSrgNOGuG4cR2Xs5s
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_sect239k1
------BEGIN EC PRIVATE KEY-----
-MG4CAQEEHgUEbjvsq/KWKymlQXBsOX9JEadfkUWZ/D/FYiIQx6AHBgUrgQQAA6FA
-Az4ABAWKLT3hRfoXmbwOTR4j8OEXf4gNS7uHzWFN3JnHERPQiiTEWRNR/+t71Y8D
-svE84K6Ig9lQ1UJHFFZK5Q==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MH4CAQAwEAYHKoZIzj0CAQYFK4EEAAMEZzBlAgEBBB4FBG477KvylisppUFwbDl/
+SRGnX5FFmfw/xWIiEMehQAM+AAQFii094UX6F5m8Dk0eI/DhF3+IDUu7h81hTdyZ
+xxET0IokxFkTUf/re9WPA7LxPOCuiIPZUNVCRxRWSuU=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_sect239k1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6456,11 +6466,12 @@ SharedSecret=4d1c9a8ae73f754d0a593d6e426114f4f67d7c8082ccc4e04a72b0d2aff8
 # TEST CURVE sect283k1
 
 PrivateKey=ALICE_sect283k1
------BEGIN EC PRIVATE KEY-----
-MIGAAgEBBCQAaGeyZnZQMpXdAqareT7fctDqfloJi8pdwyCJmUFL9GtWAhGgBwYF
-K4EEABChTANKAAQFKCk7DlMxNzg7wceHDlq0mXmauda4LqhZVhFikPUgy881NGwB
-ijhJhGY8h+DNW/8RJVwdVoPWU82j56rQc3WqG9Ff7iuYY7s=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGQAgEAMBAGByqGSM49AgEGBSuBBAAQBHkwdwIBAQQkAGhnsmZ2UDKV3QKmq3k+
+33LQ6n5aCYvKXcMgiZlBS/RrVgIRoUwDSgAEBSgpOw5TMTc4O8HHhw5atJl5mrnW
+uC6oWVYRYpD1IMvPNTRsAYo4SYRmPIfgzVv/ESVcHVaD1lPNo+eq0HN1qhvRX+4r
+mGO7
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_sect283k1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6469,11 +6480,12 @@ WVYRYpD1IMvPNTRsAYo4SYRmPIfgzVv/ESVcHVaD1lPNo+eq0HN1qhvRX+4rmGO7
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_sect283k1
------BEGIN EC PRIVATE KEY-----
-MIGAAgEBBCQAAlcjB9aNhuIzmMRw3Dzz/WRsSeFWNYaK87vMM+2zsC4pIySgBwYF
-K4EEABChTANKAAQDkC6x7ml0fqSzs93I96g9tgCTPpUPm/wpNXVv3s+JiZk0N6gF
-jvwVDIdFK91Kj6hF7DZFpyloICe1GiJYfI3WcB0NLOMI3+Y=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGQAgEAMBAGByqGSM49AgEGBSuBBAAQBHkwdwIBAQQkAAJXIwfWjYbiM5jEcNw8
+8/1kbEnhVjWGivO7zDPts7AuKSMkoUwDSgAEA5Ause5pdH6ks7PdyPeoPbYAkz6V
+D5v8KTV1b97PiYmZNDeoBY78FQyHRSvdSo+oRew2RacpaCAntRoiWHyN1nAdDSzj
+CN/m
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_sect283k1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6494,11 +6506,12 @@ SharedSecret=02f2e682c2f60d7261624f3661a5e85fca920443b72aa4dd5a540082e65e552302d
 # TEST CURVE sect283r1
 
 PrivateKey=ALICE_sect283r1
------BEGIN EC PRIVATE KEY-----
-MIGAAgEBBCQCLgmuG7X2S3sfyPDUU7tXMLGHqnSkjSiCXer16/k0WS59mRmgBwYF
-K4EEABGhTANKAAQAfHpzCdbD72XehkenH5Hye7tIupRLjRNTa4vRbpVM0A0i9wkH
-Vv77eiQfQUmAUBqFtqi1p9hPJ+oKhjXVVrGdWpTn9oTuOwM=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGQAgEAMBAGByqGSM49AgEGBSuBBAARBHkwdwIBAQQkAi4Jrhu19kt7H8jw1FO7
+VzCxh6p0pI0ogl3q9ev5NFkufZkZoUwDSgAEAHx6cwnWw+9l3oZHpx+R8nu7SLqU
+S40TU2uL0W6VTNANIvcJB1b++3okH0FJgFAahbaotafYTyfqCoY11VaxnVqU5/aE
+7jsD
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_sect283r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6507,11 +6520,12 @@ U2uL0W6VTNANIvcJB1b++3okH0FJgFAahbaotafYTyfqCoY11VaxnVqU5/aE7jsD
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_sect283r1
------BEGIN EC PRIVATE KEY-----
-MIGAAgEBBCQAIPTiAlpV9XEr8OlvGOqvNlZzoHvprbcwr8hAPWMyUY9DPPGgBwYF
-K4EEABGhTANKAAQDXeYhgy+KTXYMGnwmR0RMwHV7A7DbYL/GGfMsQeaCsbR7DF4A
-1UCghnLa6/m3RVQking9h0s1qoiC4372/pTvw7iVqywirkg=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGQAgEAMBAGByqGSM49AgEGBSuBBAARBHkwdwIBAQQkACD04gJaVfVxK/Dpbxjq
+rzZWc6B76a23MK/IQD1jMlGPQzzxoUwDSgAEA13mIYMvik12DBp8JkdETMB1ewOw
+22C/xhnzLEHmgrG0ewxeANVAoIZy2uv5t0VUJIp4PYdLNaqIguN+9v6U78O4lass
+Iq5I
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_sect283r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6532,12 +6546,13 @@ SharedSecret=05778bc1afcf38d7dddb2150cacbfe4d38dc588968fd8b2e859c28ae2629d3435f8
 # TEST CURVE sect409k1
 
 PrivateKey=ALICE_sect409k1
------BEGIN EC PRIVATE KEY-----
-MIGvAgEBBDMg1vV7wiPe1ovX+ukzVfwPZoqvyj/vdif04Opi9PcjV5mPBEZgSFBg
-8hbutNxZJdVLrxSgBwYFK4EEACShbANqAAQACe1IJ5ilSk1pPLvbcjEZIE6abC9L
-Z9WmHuNJxM9LAW1OuLvJGi72AsGYUOGpX0WGmK6CAYaqZb2Qeedq/yUIljDHYi66
-J+26owYl7lOMpRzZ9U2QDJrZ7TYuxeMUui6re0B+JuZdYw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIHBAgEAMBAGByqGSM49AgEGBSuBBAAkBIGpMIGmAgEBBDMg1vV7wiPe1ovX+ukz
+VfwPZoqvyj/vdif04Opi9PcjV5mPBEZgSFBg8hbutNxZJdVLrxShbANqAAQACe1I
+J5ilSk1pPLvbcjEZIE6abC9LZ9WmHuNJxM9LAW1OuLvJGi72AsGYUOGpX0WGmK6C
+AYaqZb2Qeedq/yUIljDHYi66J+26owYl7lOMpRzZ9U2QDJrZ7TYuxeMUui6re0B+
+JuZdYw==
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_sect409k1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6547,12 +6562,13 @@ uqMGJe5TjKUc2fVNkAya2e02LsXjFLouq3tAfibmXWM=
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_sect409k1
------BEGIN EC PRIVATE KEY-----
-MIGvAgEBBDMIYBGZZcZz4qCdhAV9vqpfe8vV+vJEhjawR52JUV1rumWEBPAx0o6E
-+gaxHBr5hzVGkIKgBwYFK4EEACShbANqAAQAAQKKs60CTUUkltsT+lIBukjz850p
-kGGLltJ4eaZn4k9AtN/lFTCq6Vgqe2sDrjA3b45qAdWjf1vRaP0wawJ13SjApJmy
-Xg5hQks6d0Zqz2OHYhGEGiM159VtTlStK067dVe1fGVDeg==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIHBAgEAMBAGByqGSM49AgEGBSuBBAAkBIGpMIGmAgEBBDMIYBGZZcZz4qCdhAV9
+vqpfe8vV+vJEhjawR52JUV1rumWEBPAx0o6E+gaxHBr5hzVGkIKhbANqAAQAAQKK
+s60CTUUkltsT+lIBukjz850pkGGLltJ4eaZn4k9AtN/lFTCq6Vgqe2sDrjA3b45q
+AdWjf1vRaP0wawJ13SjApJmyXg5hQks6d0Zqz2OHYhGEGiM159VtTlStK067dVe1
+fGVDeg==
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_sect409k1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6574,12 +6590,13 @@ SharedSecret=01523ec40ad40226a57281a4c423801ae9495dcf736eddd667023b1390977d018ce
 # TEST CURVE sect409r1
 
 PrivateKey=ALICE_sect409r1
------BEGIN EC PRIVATE KEY-----
-MIGwAgEBBDQAYTMsTpey51D2ULndpN+AAWnJLy9pTerziakhjii8OyWKpUVfpDFN
-neCCd2oQTDcPX5vdoAcGBSuBBAAloWwDagAEAYfk3ZejxpVYCG7dYHTVhhcqILEy
-TYoQa4YehGPxKcbmgpqW4Wev1tEDVI3JIowICYGUowHXXzgDXoJeR79wgb7ySAlX
-JXgQ8Ficr7i0CaqyAuIpFw9FWJT3jheFwnbpDTvIeIozlf4=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIHCAgEAMBAGByqGSM49AgEGBSuBBAAlBIGqMIGnAgEBBDQAYTMsTpey51D2ULnd
+pN+AAWnJLy9pTerziakhjii8OyWKpUVfpDFNneCCd2oQTDcPX5vdoWwDagAEAYfk
+3ZejxpVYCG7dYHTVhhcqILEyTYoQa4YehGPxKcbmgpqW4Wev1tEDVI3JIowICYGU
+owHXXzgDXoJeR79wgb7ySAlXJXgQ8Ficr7i0CaqyAuIpFw9FWJT3jheFwnbpDTvI
+eIozlf4=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_sect409r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6589,12 +6606,13 @@ a4YehGPxKcbmgpqW4Wev1tEDVI3JIowICYGUowHXXzgDXoJeR79wgb7ySAlXJXgQ
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_sect409r1
------BEGIN EC PRIVATE KEY-----
-MIGwAgEBBDQAsCs1nRgwW97TdKIHPRcsqmK1e8TIZ00e6rqLb3nD4sIe+Gw/fGhS
-UER9akQ7lAluEUnfoAcGBSuBBAAloWwDagAEAfM2fvBEic+7jV4oC+v8GfsunD9Z
-p9rzNgMp3dJ+ZU7r6Bp+ZH3dL9Uvv8kUiB89UlDlLwBm/W6TlzGuh1FnzXYKVnhn
-XpzSlRZQsPCceKukbV46Asl8O23b2+DPJgQBGbMfWsgK+KA=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIHCAgEAMBAGByqGSM49AgEGBSuBBAAlBIGqMIGnAgEBBDQAsCs1nRgwW97TdKIH
+PRcsqmK1e8TIZ00e6rqLb3nD4sIe+Gw/fGhSUER9akQ7lAluEUnfoWwDagAEAfM2
+fvBEic+7jV4oC+v8GfsunD9Zp9rzNgMp3dJ+ZU7r6Bp+ZH3dL9Uvv8kUiB89UlDl
+LwBm/W6TlzGuh1FnzXYKVnhnXpzSlRZQsPCceKukbV46Asl8O23b2+DPJgQBGbMf
+WsgK+KA=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_sect409r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6616,14 +6634,14 @@ SharedSecret=019dc849870dc6f79978aca8e1fc6aa6836c8fcb25bbfe3d5ab41ea53eae2c73299
 # TEST CURVE sect571k1
 
 PrivateKey=ALICE_sect571k1
------BEGIN EC PRIVATE KEY-----
-MIHuAgEBBEgBE7yEjyPpNnnnr91Fx0Zi91uWcAsPZdkIq7ZzcLnJAh4DxOJ2L5/y
-fpwKdvkW0k1Ngqo/y1F8eXABm1b+CJeL/jIXkra3BLegBwYFK4EEACahgZUDgZIA
-BAC2K5RvPu/qeOG6OcOFqcPiJXzgrQtB33A/X6S/QGfzfecq0WtkKiaCuKnZLBRo
-Rg4Tohw/IInjy9Y4q8hHp9TXW1bCwVE9TQJy3RKpVsA0AnPAvW6bC4o09uUnpkTB
-wF2DDuFYUvqyH7RrIBDdrzM6LOFWIk8KdopH86gC1pSkJYtJMcMXWArj+SaXATH7
-yg==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIBAAIBADAQBgcqhkjOPQIBBgUrgQQAJgSB6DCB5QIBAQRIARO8hI8j6TZ556/d
+RcdGYvdblnALD2XZCKu2c3C5yQIeA8Tidi+f8n6cCnb5FtJNTYKqP8tRfHlwAZtW
+/giXi/4yF5K2twS3oYGVA4GSAAQAtiuUbz7v6njhujnDhanD4iV84K0LQd9wP1+k
+v0Bn833nKtFrZComgrip2SwUaEYOE6IcPyCJ48vWOKvIR6fU11tWwsFRPU0Cct0S
+qVbANAJzwL1umwuKNPblJ6ZEwcBdgw7hWFL6sh+0ayAQ3a8zOizhViJPCnaKR/Oo
+AtaUpCWLSTHDF1gK4/kmlwEx+8o=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_sect571k1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6634,14 +6652,14 @@ CnaKR/OoAtaUpCWLSTHDF1gK4/kmlwEx+8o=
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_sect571k1
------BEGIN EC PRIVATE KEY-----
-MIHuAgEBBEgBVlPi2df10xZLpV1gKhhGX2j+P8fPsoaoXhSOT2f1vj6Zdsnfu2hu
-mOek2oqUl8jTjDzQk+n43GmgFHfynVtxz2IvhKaHjxigBwYFK4EEACahgZUDgZIA
-BABHMDH3JWQcvylt7WbKiwgsiGEstRFhEMeaik4iKMtCZMBNX2lg7sKsUE8GNoo1
-GM+nD9xU6zz1f0l3PH9uiWQapUCyMs3W2wKuoRPfUXiamd+w/BwzrNunqUTg3aAv
-lxqQoybI80zh3ebzGXV/p7nosFh9rE5qpxjNtcJD8CKKPXcfTqoqG4UziKIH/QPX
-rg==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIBAAIBADAQBgcqhkjOPQIBBgUrgQQAJgSB6DCB5QIBAQRIAVZT4tnX9dMWS6Vd
+YCoYRl9o/j/Hz7KGqF4Ujk9n9b4+mXbJ37tobpjnpNqKlJfI04w80JPp+NxpoBR3
+8p1bcc9iL4Smh48YoYGVA4GSAAQARzAx9yVkHL8pbe1myosILIhhLLURYRDHmopO
+IijLQmTATV9pYO7CrFBPBjaKNRjPpw/cVOs89X9Jdzx/bolkGqVAsjLN1tsCrqET
+31F4mpnfsPwcM6zbp6lE4N2gL5cakKMmyPNM4d3m8xl1f6e56LBYfaxOaqcYzbXC
+Q/Aiij13H06qKhuFM4iiB/0D164=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_sect571k1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6664,14 +6682,14 @@ SharedSecret=05a423515fcc91b3171c83edd5c4085ff729a8ff0a3fa1578ebf769523ded0f5c1e
 # TEST CURVE sect571r1
 
 PrivateKey=ALICE_sect571r1
------BEGIN EC PRIVATE KEY-----
-MIHuAgEBBEgCuyL/9mn2955RFhXMZgefgyU0jE23pTq+2ZM9L81qiJpq/Fs6Kake
-DFg8KOmg9iEzfdnZUGHumXZqhFbcYF6ksUugXyiJBougBwYFK4EEACehgZUDgZIA
-BANEbZvsoJQpsYNNZWBbSqo0LehhzPh/8DBMeahRLWbN1FmP9J/ohT7uYhMadDqW
-DUSRNqz9fpMrWE0xXu0CNJ6jB03vnDN3xgXfZIUcwhxZ7DmDnqgX3rWq/ci8gJmd
-EA6ZbIYd4d1jAfEwFIE82C5rjZAagnPonp1gBR68T4Xc3b2n+1EEY3MwUiqgN1b4
-0A==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIBAAIBADAQBgcqhkjOPQIBBgUrgQQAJwSB6DCB5QIBAQRIArsi//Zp9veeURYV
+zGYHn4MlNIxNt6U6vtmTPS/NaoiaavxbOimpHgxYPCjpoPYhM33Z2VBh7pl2aoRW
+3GBepLFLoF8oiQaLoYGVA4GSAAQDRG2b7KCUKbGDTWVgW0qqNC3oYcz4f/AwTHmo
+US1mzdRZj/Sf6IU+7mITGnQ6lg1EkTas/X6TK1hNMV7tAjSeowdN75wzd8YF32SF
+HMIcWew5g56oF961qv3IvICZnRAOmWyGHeHdYwHxMBSBPNgua42QGoJz6J6dYAUe
+vE+F3N29p/tRBGNzMFIqoDdW+NA=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_sect571r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6682,14 +6700,14 @@ d8YF32SFHMIcWew5g56oF961qv3IvICZnRAOmWyGHeHdYwHxMBSBPNgua42QGoJz
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_sect571r1
------BEGIN EC PRIVATE KEY-----
-MIHuAgEBBEgBiPrk3lclNC6yf6Fn3GP92BnipHUYMLUiPuNi6jD5O8asbbDP9ZPv
-r+Us22UIt8NbaQ4MNSYMAl4r975Uw7uy4lNcaesYUeKgBwYFK4EEACehgZUDgZIA
-BAbHKRgXGrPuNnFwFuI8th8kSFeV/ZJiYwq97vi2s5P6qMibfn65QByDaSs7Mftf
-/zAfptVKf9Qob+TbvBmsCdbNnlcp3xAjvQfxoe8uCsKgyio6ej6HonhOC+UOrsUg
-Znx+8Noztgnx0c9fkULxXKmG7zZNw12c0BMGqibpYNZztFMVniyKMvnLBWGi/AnW
-AA==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIBAAIBADAQBgcqhkjOPQIBBgUrgQQAJwSB6DCB5QIBAQRIAYj65N5XJTQusn+h
+Z9xj/dgZ4qR1GDC1Ij7jYuow+TvGrG2wz/WT76/lLNtlCLfDW2kODDUmDAJeK/e+
+VMO7suJTXGnrGFHioYGVA4GSAAQGxykYFxqz7jZxcBbiPLYfJEhXlf2SYmMKve74
+trOT+qjIm35+uUAcg2krOzH7X/8wH6bVSn/UKG/k27wZrAnWzZ5XKd8QI70H8aHv
+LgrCoMoqOno+h6J4TgvlDq7FIGZ8fvDaM7YJ8dHPX5FC8Vyphu82TcNdnNATBqom
+6WDWc7RTFZ4sijL5ywVhovwJ1gA=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_sect571r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6712,10 +6730,11 @@ SharedSecret=004b397e564055e2c7d87648183c948655ccb0ebb20bd441f9b11635cf461cb5815
 # TEST CURVE c2pnb163v1
 
 PrivateKey=ALICE_c2pnb163v1
------BEGIN EC PRIVATE KEY-----
-MFYCAQEEFQNNUFcMh0wyDkkhvrJkcumQ41q7O6AKBggqhkjOPQMAAaEuAywABAL9
-NoyLZgZjhKZhUKshVWiaYOc7IwclnVVnj59P6ET+pGlYcwxbmA5k7g==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGYCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAEETDBKAgEBBBUDTVBXDIdMMg5JIb6y
+ZHLpkONauzuhLgMsAAQC/TaMi2YGY4SmYVCrIVVommDnOyMHJZ1VZ4+fT+hE/qRp
+WHMMW5gOZO4=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_c2pnb163v1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6724,10 +6743,11 @@ ByWdVWePn0/oRP6kaVhzDFuYDmTu
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_c2pnb163v1
------BEGIN EC PRIVATE KEY-----
-MFYCAQEEFQLe4QB8Zzf5rQU6sWF+11QG1nkE86AKBggqhkjOPQMAAaEuAywABAai
-MqSGc525RBjpdPQbBBsN7VgzXAWSPe9kaSE7k7OyobVCpAuQV4zAqg==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGYCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAEETDBKAgEBBBUC3uEAfGc3+a0FOrFh
+ftdUBtZ5BPOhLgMsAAQGojKkhnOduUQY6XT0GwQbDe1YM1wFkj3vZGkhO5OzsqG1
+QqQLkFeMwKo=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_c2pnb163v1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6748,10 +6768,11 @@ SharedSecret=05939a47cb503656e684f433001e45776c7620e13b
 # TEST CURVE c2pnb163v2
 
 PrivateKey=ALICE_c2pnb163v2
------BEGIN EC PRIVATE KEY-----
-MFYCAQEEFQLebeZ4k1uEPDAUfcL/8vYTI5A2u6AKBggqhkjOPQMAAqEuAywABAFo
-BM6I9XpzyJwFhZzMtczqT63xTgUg3nuKILxGyYhLf5XIz+s3dQFlrA==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGYCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAIETDBKAgEBBBUC3m3meJNbhDwwFH3C
+//L2EyOQNruhLgMsAAQBaATOiPV6c8icBYWczLXM6k+t8U4FIN57iiC8RsmIS3+V
+yM/rN3UBZaw=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_c2pnb163v2_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6760,10 +6781,11 @@ BSDee4ogvEbJiEt/lcjP6zd1AWWs
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_c2pnb163v2
------BEGIN EC PRIVATE KEY-----
-MFYCAQEEFQG938O8qFqvLByRJpZoCeIoHJcHCKAKBggqhkjOPQMAAqEuAywABAfT
-4VZ7iZvXdCsRkI/B8hL6AKERegaHIFW5u3r5JKBLmdJ4MaCNb/fpDA==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGYCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAIETDBKAgEBBBUBvd/DvKharywckSaW
+aAniKByXBwihLgMsAAQH0+FWe4mb13QrEZCPwfIS+gChEXoGhyBVubt6+SSgS5nS
+eDGgjW/36Qw=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_c2pnb163v2_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6784,10 +6806,11 @@ SharedSecret=0779fb5f6ac7892f2f342b785d71244e0b03ca562d
 # TEST CURVE c2pnb163v3
 
 PrivateKey=ALICE_c2pnb163v3
------BEGIN EC PRIVATE KEY-----
-MFYCAQEEFQK0nRlAwPlPpib+NnEXNv21CQs6G6AKBggqhkjOPQMAA6EuAywABATb
-pgPuEb4JjTb6cEMUogGcy8dZRAZ+SIh8b3LFX4um04wJ1TjL1GEz7A==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGYCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAMETDBKAgEBBBUCtJ0ZQMD5T6Ym/jZx
+Fzb9tQkLOhuhLgMsAAQE26YD7hG+CY02+nBDFKIBnMvHWUQGfkiIfG9yxV+LptOM
+CdU4y9RhM+w=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_c2pnb163v3_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6796,10 +6819,11 @@ Bn5IiHxvcsVfi6bTjAnVOMvUYTPs
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_c2pnb163v3
------BEGIN EC PRIVATE KEY-----
-MFYCAQEEFQH0ydhH01czw6gKto6itDPUtchkkKAKBggqhkjOPQMAA6EuAywABAfX
-lH/EAbKu2aD6Gt0Boaf2tUR9ZADvJQKfi8pHZ4jL+o1h9t4dMhpMFg==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGYCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAMETDBKAgEBBBUB9MnYR9NXM8OoCraO
+orQz1LXIZJChLgMsAAQH15R/xAGyrtmg+hrdAaGn9rVEfWQA7yUCn4vKR2eIy/qN
+YfbeHTIaTBY=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_c2pnb163v3_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6820,10 +6844,11 @@ SharedSecret=02bf68863a8798e72cdc9cd3b9ce731f12654bfa81
 # TEST CURVE c2pnb176v1
 
 PrivateKey=ALICE_c2pnb176v1
------BEGIN EC PRIVATE KEY-----
-MFgCAQEEFQDFcTPU+O2GqwjrriU3ktEs3wLa7KAKBggqhkjOPQMABKEwAy4ABEPW
-pUkdsvkDsGEQp4dK4N5Ppd5nc4MWf15/rup0X61LunfOBcYq3ikoyhhy
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGgCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAQETjBMAgEBBBUAxXEz1PjthqsI664l
+N5LRLN8C2uyhMAMuAARD1qVJHbL5A7BhEKeHSuDeT6XeZ3ODFn9ef67qdF+tS7p3
+zgXGKt4pKMoYcg==
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_c2pnb176v1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6832,10 +6857,11 @@ gxZ/Xn+u6nRfrUu6d84FxireKSjKGHI=
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_c2pnb176v1
------BEGIN EC PRIVATE KEY-----
-MFgCAQEEFQAm8ccVbS/79yNot3teC3oW1KBrn6AKBggqhkjOPQMABKEwAy4ABJSz
-utQCW/WqGmkjzaKQu9nxjQMCkLfnqeGztLJBh0u0dEz6pQcEHcjOssp1
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGgCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAQETjBMAgEBBBUAJvHHFW0v+/cjaLd7
+Xgt6FtSga5+hMAMuAASUs7rUAlv1qhppI82ikLvZ8Y0DApC356nhs7SyQYdLtHRM
++qUHBB3IzrLKdQ==
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_c2pnb176v1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6856,11 +6882,11 @@ SharedSecret=b204734417542df762e09013d6ba958940837a2aa25a
 # TEST CURVE c2tnb191v1
 
 PrivateKey=ALICE_c2tnb191v1
------BEGIN EC PRIVATE KEY-----
-MF8CAQEEGBiCk77CCKtS26ocXTTajTZVzvFCMqBLMKAKBggqhkjOPQMABaE0AzIA
-BDZp77m0NDYINpXlc90L5G0uBwdLmVM5yVMKWv9ZKk9OUy3ZMaH8pGsPzn2heDop
-hg==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAUEVTBTAgEBBBgYgpO+wgirUtuqHF00
+2o02Vc7xQjKgSzChNAMyAAQ2ae+5tDQ2CDaV5XPdC+RtLgcHS5lTOclTClr/WSpP
+TlMt2TGh/KRrD859oXg6KYY=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_c2tnb191v1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6869,11 +6895,11 @@ UznJUwpa/1kqT05TLdkxofykaw/OfaF4OimG
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_c2tnb191v1
------BEGIN EC PRIVATE KEY-----
-MF8CAQEEGC7Obm4U1HL+Vfc4q4mPyL+8f/6+Ix3jzKAKBggqhkjOPQMABaE0AzIA
-BGRrmuF1Oa1upBVExZlCNSqwdQxfjeyJG3l/ZZBJl+D4hDaX/y95rLJf16tRK3eA
-rg==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAUEVTBTAgEBBBguzm5uFNRy/lX3OKuJ
+j8i/vH/+viMd48yhNAMyAARka5rhdTmtbqQVRMWZQjUqsHUMX43siRt5f2WQSZfg
++IQ2l/8veayyX9erUSt3gK4=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_c2tnb191v1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6894,11 +6920,11 @@ SharedSecret=7a30d30acd3b067f38bb3be9e8cdef739483df26455e36e1
 # TEST CURVE c2tnb191v2
 
 PrivateKey=ALICE_c2tnb191v2
------BEGIN EC PRIVATE KEY-----
-MF8CAQEEGA6WyWAnRdIre8oLkuxCZjFl+vw4QpdFDaAKBggqhkjOPQMABqE0AzIA
-BAAeK8uFLBbZIlm1Q+G5XWn19BJ/PvD1Iljx0k6lV/z0N689SUkw9xpIbKNf7ecl
-lw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAYEVTBTAgEBBBgOlslgJ0XSK3vKC5Ls
+QmYxZfr8OEKXRQ2hNAMyAAQAHivLhSwW2SJZtUPhuV1p9fQSfz7w9SJY8dJOpVf8
+9DevPUlJMPcaSGyjX+3nJZc=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_c2tnb191v2_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6907,11 +6933,11 @@ MEkwEwYHKoZIzj0CAQYIKoZIzj0DAAYDMgAEAB4ry4UsFtkiWbVD4bldafX0En8+
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_c2tnb191v2
------BEGIN EC PRIVATE KEY-----
-MF8CAQEEGAr1BpLZINTrLPu5eo77/4L5tpNNUwAZUaAKBggqhkjOPQMABqE0AzIA
-BCJHS32mWbvt7N9e8nMM12XJgLSlZf5CYnwRq+AQSWSTL8z5hdvm5+QXMVcgR9T2
-kw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAYEVTBTAgEBBBgK9QaS2SDU6yz7uXqO
++/+C+baTTVMAGVGhNAMyAAQiR0t9plm77ezfXvJzDNdlyYC0pWX+QmJ8EavgEElk
+ky/M+YXb5ufkFzFXIEfU9pM=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_c2tnb191v2_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6932,11 +6958,11 @@ SharedSecret=5ec2b6ccd193620dbad302c4ad8f8909a40698bf454d7534
 # TEST CURVE c2tnb191v3
 
 PrivateKey=ALICE_c2tnb191v3
------BEGIN EC PRIVATE KEY-----
-MF8CAQEEGBJoE5DKrpdfeFlVWBUWVGvFO6+C2/fcLqAKBggqhkjOPQMAB6E0AzIA
-BEv4W6nyM6eLFBg/HylT9vTro8euFNd+I16sURgD/k5cIoISR1EKm4MmfKqmZoLa
-/A==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAcEVTBTAgEBBBgSaBOQyq6XX3hZVVgV
+FlRrxTuvgtv33C6hNAMyAARL+Fup8jOnixQYPx8pU/b066PHrhTXfiNerFEYA/5O
+XCKCEkdRCpuDJnyqpmaC2vw=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_c2tnb191v3_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6945,11 +6971,11 @@ MEkwEwYHKoZIzj0CAQYIKoZIzj0DAAcDMgAES/hbqfIzp4sUGD8fKVP29Oujx64U
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_c2tnb191v3
------BEGIN EC PRIVATE KEY-----
-MF8CAQEEGAQTwuzulzX+rf/Su5GAytYaEYivhUu3i6AKBggqhkjOPQMAB6E0AzIA
-BAcBmyOQBdqfAZtdHdIqSgqWLqtJ9KK7SVTZccOJl20to834SKHPgp4bZgz+nebV
-2g==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAcEVTBTAgEBBBgEE8Ls7pc1/q3/0ruR
+gMrWGhGIr4VLt4uhNAMyAAQHAZsjkAXanwGbXR3SKkoKli6rSfSiu0lU2XHDiZdt
+LaPN+Eihz4KeG2YM/p3m1do=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_c2tnb191v3_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6970,11 +6996,11 @@ SharedSecret=39093dc8a2e6724a6206ed41bb99490d527d80c902c41891
 # TEST CURVE c2pnb208w1
 
 PrivateKey=ALICE_c2pnb208w1
------BEGIN EC PRIVATE KEY-----
-MGQCAQEEGQBt+c1uhfoOT40ugE7qoEHZoTWyuZOBL3qgCgYIKoZIzj0DAAqhOAM2
-AAQUsdyIC7h7FxgHSa3LysXjjZQtdl+ov3QiSA/kbbPDNjWYCUQEUyDzeLN5FoIn
-+9GKFkMn
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MHQCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAoEWjBYAgEBBBkAbfnNboX6Dk+NLoBO
+6qBB2aE1srmTgS96oTgDNgAEFLHciAu4excYB0mty8rF442ULXZfqL90IkgP5G2z
+wzY1mAlEBFMg83izeRaCJ/vRihZDJw==
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_c2pnb208w1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -6983,11 +7009,11 @@ qL90IkgP5G2zwzY1mAlEBFMg83izeRaCJ/vRihZDJw==
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_c2pnb208w1
------BEGIN EC PRIVATE KEY-----
-MGQCAQEEGQDCMYUk4+RmpA9n6YgB7cbXbOlSJrjS1GOgCgYIKoZIzj0DAAqhOAM2
-AAQPFo/q7SmEMt8zhGxmGAh9nLwK6tHj8g+2owbFt/Ok8o8xldXXYXoytauitIUN
-nwoV3nxb
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MHQCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAoEWjBYAgEBBBkAwjGFJOPkZqQPZ+mI
+Ae3G12zpUia40tRjoTgDNgAEDxaP6u0phDLfM4RsZhgIfZy8CurR4/IPtqMGxbfz
+pPKPMZXV12F6MrWrorSFDZ8KFd58Ww==
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_c2pnb208w1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7008,11 +7034,11 @@ SharedSecret=59bf3c91bd168d4d4d900d9ce155933045e0fd16dcf0511bb5af
 # TEST CURVE c2tnb239v1
 
 PrivateKey=ALICE_c2tnb239v1
------BEGIN EC PRIVATE KEY-----
-MHECAQEEHhOAgsFxCrD9wnywvwy0khfZX8jmjUrkF5qva8y6sKAKBggqhkjOPQMA
-C6FAAz4ABDOqECLFybPgDSkKRdw8wXRuBXUuQ0vqqXOX1U7GYiOBQFgl1L88z00Q
-Hsd8MLxf+Ca2CunClYfItRDqzQ==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGBAgEAMBMGByqGSM49AgEGCCqGSM49AwALBGcwZQIBAQQeE4CCwXEKsP3CfLC/
+DLSSF9lfyOaNSuQXmq9rzLqwoUADPgAEM6oQIsXJs+ANKQpF3DzBdG4FdS5DS+qp
+c5fVTsZiI4FAWCXUvzzPTRAex3wwvF/4JrYK6cKVh8i1EOrN
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_c2tnb239v1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7021,11 +7047,11 @@ S+qpc5fVTsZiI4FAWCXUvzzPTRAex3wwvF/4JrYK6cKVh8i1EOrN
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_c2tnb239v1
------BEGIN EC PRIVATE KEY-----
-MHECAQEEHgBg2AhgF6g9N8eddId+SUs5YEXlulv0/JWDxAONnaAKBggqhkjOPQMA
-C6FAAz4ABApOlMofFC5DlTsWUjWWBsLZKP6Mu2SwzxfHW7BGU3mCAaUOoVqmf+Dc
-90cs36LpMnwm92/DjLaavkIIqA==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGBAgEAMBMGByqGSM49AgEGCCqGSM49AwALBGcwZQIBAQQeAGDYCGAXqD03x510
+h35JSzlgReW6W/T8lYPEA42doUADPgAECk6Uyh8ULkOVOxZSNZYGwtko/oy7ZLDP
+F8dbsEZTeYIBpQ6hWqZ/4Nz3RyzfoukyfCb3b8OMtpq+Qgio
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_c2tnb239v1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7046,11 +7072,11 @@ SharedSecret=78c42256900725df9a47bb042cef7dad9f639b32e3010738a144e7472d1a
 # TEST CURVE c2tnb239v2
 
 PrivateKey=ALICE_c2tnb239v2
------BEGIN EC PRIVATE KEY-----
-MHECAQEEHhPJAYxy4xXgvmdoGatLJ8Ed1IBIFjFtMYpYSTY1tqAKBggqhkjOPQMA
-DKFAAz4ABEPrmyGIYfNlaIcCklc+9D5B7I5mFg7w1P0gUZPAIj+9QjPQ+1xCiubZ
-1PeDLStirHMeZ1mRXPqCIdfrGA==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGBAgEAMBMGByqGSM49AgEGCCqGSM49AwAMBGcwZQIBAQQeE8kBjHLjFeC+Z2gZ
+q0snwR3UgEgWMW0xilhJNjW2oUADPgAEQ+ubIYhh82VohwKSVz70PkHsjmYWDvDU
+/SBRk8AiP71CM9D7XEKK5tnU94MtK2Kscx5nWZFc+oIh1+sY
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_c2tnb239v2_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7059,11 +7085,11 @@ DvDU/SBRk8AiP71CM9D7XEKK5tnU94MtK2Kscx5nWZFc+oIh1+sY
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_c2tnb239v2
------BEGIN EC PRIVATE KEY-----
-MHECAQEEHhO24cymWVJu/NHNHtxAVmNRsQ/dDM7u860DIu2wM6AKBggqhkjOPQMA
-DKFAAz4ABGIFe26JGOoizM2UxtdHOjQ2ltdaZQJtEzSlVcMz6nt8pYbEJpptNixy
-l9IDeBNXVEtLgpQWzBjatpoZZw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGBAgEAMBMGByqGSM49AgEGCCqGSM49AwAMBGcwZQIBAQQeE7bhzKZZUm780c0e
+3EBWY1GxD90Mzu7zrQMi7bAzoUADPgAEYgV7bokY6iLMzZTG10c6NDaW11plAm0T
+NKVVwzPqe3ylhsQmmm02LHKX0gN4E1dUS0uClBbMGNq2mhln
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_c2tnb239v2_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7084,11 +7110,11 @@ SharedSecret=4ba2ecfa8ec7a375594d1673886cccf96d7763c55611b3c9008a35160192
 # TEST CURVE c2tnb239v3
 
 PrivateKey=ALICE_c2tnb239v3
------BEGIN EC PRIVATE KEY-----
-MHECAQEEHgsYguZWx2C9UGG29os2YkqCz51gmSHbPNdSdTeyraAKBggqhkjOPQMA
-DaFAAz4ABHRzM/rbLju1XDvSBYLElk8Hi6AdWoeViIOnFq7XFH5juxBnz8DZ4uAX
-/DaO6xhjMG4rFtL+ib9qZE0jPA==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGBAgEAMBMGByqGSM49AgEGCCqGSM49AwANBGcwZQIBAQQeCxiC5lbHYL1QYbb2
+izZiSoLPnWCZIds811J1N7KtoUADPgAEdHMz+tsuO7VcO9IFgsSWTweLoB1ah5WI
+g6cWrtcUfmO7EGfPwNni4Bf8No7rGGMwbisW0v6Jv2pkTSM8
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_c2tnb239v3_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7097,11 +7123,11 @@ h5WIg6cWrtcUfmO7EGfPwNni4Bf8No7rGGMwbisW0v6Jv2pkTSM8
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_c2tnb239v3
------BEGIN EC PRIVATE KEY-----
-MHECAQEEHgQT8XXlNzKIWXOSce1mnS7j0nl3joO+a1wtRJXsbKAKBggqhkjOPQMA
-DaFAAz4ABGh8IsEJqKmz4o/PpeoSx1UM9AGSwU+bl4QIfH4UwASqiO6mEoSAgAF9
-Lb7txL0PAUCz9eIK8VLEqBKgBQ==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGBAgEAMBMGByqGSM49AgEGCCqGSM49AwANBGcwZQIBAQQeBBPxdeU3MohZc5Jx
+7WadLuPSeXeOg75rXC1ElexsoUADPgAEaHwiwQmoqbPij8+l6hLHVQz0AZLBT5uX
+hAh8fhTABKqI7qYShICAAX0tvu3EvQ8BQLP14grxUsSoEqAF
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_c2tnb239v3_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7122,11 +7148,11 @@ SharedSecret=47ad60e5480375fccd9246c93ab04da8e5da83e1dbf5f177f10a47cb54a0
 # TEST CURVE c2pnb272w1
 
 PrivateKey=ALICE_c2pnb272w1
------BEGIN EC PRIVATE KEY-----
-MHwCAQEEIQCjLSnXRDVRo801OMPoVtEoAzrSBJXLOdsG+NEtPI+oDKAKBggqhkjO
-PQMAEKFIA0YABHxr0s0KPtNFVyA11e4ohl6SNepM7OgvK5HIQObFQQWOep0gqdJ+
-BaSF0c2n4hUJJSQ/TqycwOj13O7adp9l4SML7jpi
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGMAgEAMBMGByqGSM49AgEGCCqGSM49AwAQBHIwcAIBAQQhAKMtKddENVGjzTU4
+w+hW0SgDOtIElcs52wb40S08j6gMoUgDRgAEfGvSzQo+00VXIDXV7iiGXpI16kzs
+6C8rkchA5sVBBY56nSCp0n4FpIXRzafiFQklJD9OrJzA6PXc7tp2n2XhIwvuOmI=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_c2pnb272w1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7135,11 +7161,11 @@ MF0wEwYHKoZIzj0CAQYIKoZIzj0DABADRgAEfGvSzQo+00VXIDXV7iiGXpI16kzs
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_c2pnb272w1
------BEGIN EC PRIVATE KEY-----
-MHwCAQEEIQBQCjwcl9cJWFKVOJhAgwMYPlTOWhaOCT5ahM0dG/YSOqAKBggqhkjO
-PQMAEKFIA0YABC/PvOtyFOLsWxGPI1QY4bKxuFugBTBerfmhr6Iih7RDC0GulNef
-E0WqQ1qeHkbq5uiHb7+4XqQj6jjBBskg1MDBAokD
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGMAgEAMBMGByqGSM49AgEGCCqGSM49AwAQBHIwcAIBAQQhAFAKPByX1wlYUpU4
+mECDAxg+VM5aFo4JPlqEzR0b9hI6oUgDRgAEL8+863IU4uxbEY8jVBjhsrG4W6AF
+MF6t+aGvoiKHtEMLQa6U158TRapDWp4eRurm6Idvv7hepCPqOMEGySDUwMECiQM=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_c2pnb272w1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7160,11 +7186,12 @@ SharedSecret=3ae063b2bed6ba8aa28ff35e9bd2673f22ee8087860c86b89429a5b52538216632a
 # TEST CURVE c2pnb304w1
 
 PrivateKey=ALICE_c2pnb304w1
------BEGIN EC PRIVATE KEY-----
-MIGIAgEBBCUA4rN9xXZc69WxJSGhXPdIcbNIJ/Sr2L6KXPll8HFz7myyMruMoAoG
-CCqGSM49AwARoVADTgAENzjNA0Vpm6SP2LPeJdNh3Nq0I5hm+t86OtuDOX/w+gXG
-3mrrIlO7flW71dWnmlMK2OkMSnLAGPTFvTtFG5UMSTxO2EU/m8Z5MhYsPg==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGYAgEAMBMGByqGSM49AgEGCCqGSM49AwARBH4wfAIBAQQlAOKzfcV2XOvVsSUh
+oVz3SHGzSCf0q9i+ilz5ZfBxc+5ssjK7jKFQA04ABDc4zQNFaZukj9iz3iXTYdza
+tCOYZvrfOjrbgzl/8PoFxt5q6yJTu35Vu9XVp5pTCtjpDEpywBj0xb07RRuVDEk8
+TthFP5vGeTIWLD4=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_c2pnb304w1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7174,11 +7201,12 @@ m8Z5MhYsPg==
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_c2pnb304w1
------BEGIN EC PRIVATE KEY-----
-MIGIAgEBBCUA8/iHPqxr4p1MniF8F4JSIkF+yFxmhqmRkwWuEjW91xFjsx4BoAoG
-CCqGSM49AwARoVADTgAEwdFTMuJRjs7icQF2Z7HfVTiXpM790P7kxX+1U2LNWxaO
-RO+LZ+zvvaVn0x42npCcYxnmfmy5sexrRA4kvUumZdcrRQhYZtbSdBvnaA==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGYAgEAMBMGByqGSM49AgEGCCqGSM49AwARBH4wfAIBAQQlAPP4hz6sa+KdTJ4h
+fBeCUiJBfshcZoapkZMFrhI1vdcRY7MeAaFQA04ABMHRUzLiUY7O4nEBdmex31U4
+l6TO/dD+5MV/tVNizVsWjkTvi2fs772lZ9MeNp6QnGMZ5n5subHsa0QOJL1LpmXX
+K0UIWGbW0nQb52g=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_c2pnb304w1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7200,12 +7228,12 @@ SharedSecret=6df88b20de9f095c7632234291ea4658a9265cd2293424e11ed56705b09a069f09d
 # TEST CURVE c2tnb359v1
 
 PrivateKey=ALICE_c2tnb359v1
------BEGIN EC PRIVATE KEY-----
-MIGeAgEBBC0BeMU97SvjsIvQ1v+Ztf56OCL8JXHxRJDQZ5gWEa4c2b3FZXFVC4Cw
-EPd7cB+gCgYIKoZIzj0DABKhXgNcAAQOBgLp0TzS4Hf/VYbJCFuj3OlRC5JMzFV7
-ox41ubhl5Ij+gHIodu1bQ6cqd0YAb2/30PxwX++NNpFvq8u8435zhPYXsut6txOP
-NU5ZzCeagy2xsKacXSZc7D0=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGwAgEAMBMGByqGSM49AgEGCCqGSM49AwASBIGVMIGSAgEBBC0BeMU97SvjsIvQ
+1v+Ztf56OCL8JXHxRJDQZ5gWEa4c2b3FZXFVC4CwEPd7cB+hXgNcAAQOBgLp0TzS
+4Hf/VYbJCFuj3OlRC5JMzFV7ox41ubhl5Ij+gHIodu1bQ6cqd0YAb2/30PxwX++N
+NpFvq8u8435zhPYXsut6txOPNU5ZzCeagy2xsKacXSZc7D0=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_c2tnb359v1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7215,12 +7243,12 @@ ercTjzVOWcwnmoMtsbCmnF0mXOw9
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_c2tnb359v1
------BEGIN EC PRIVATE KEY-----
-MIGeAgEBBC0BRZ3IIh3mrLIXKBbh6Vj7TXNY5bzRuD5/ayHPlHQkJcd8K66dOqu7
-hgaN91GgCgYIKoZIzj0DABKhXgNcAAQ7njbTQ2xYYZtkKswYr8E6P/R3Dg/XEZgQ
-Q72B4qXnqbK/SgYsZAntFg7CRztcTkHjKAgdSz6fTRIc4///gwXN3Oi6D8Peswhz
-PJi/uLmCAHMm3GT6SUO3aTY=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGwAgEAMBMGByqGSM49AgEGCCqGSM49AwASBIGVMIGSAgEBBC0BRZ3IIh3mrLIX
+KBbh6Vj7TXNY5bzRuD5/ayHPlHQkJcd8K66dOqu7hgaN91GhXgNcAAQ7njbTQ2xY
+YZtkKswYr8E6P/R3Dg/XEZgQQ72B4qXnqbK/SgYsZAntFg7CRztcTkHjKAgdSz6f
+TRIc4///gwXN3Oi6D8PeswhzPJi/uLmCAHMm3GT6SUO3aTY=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_c2tnb359v1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7242,12 +7270,12 @@ SharedSecret=1d3f3396492d130caea54233c79833e90a072fe883071bb08cec671ce0319f0bc39
 # TEST CURVE c2pnb368w1
 
 PrivateKey=ALICE_c2pnb368w1
------BEGIN EC PRIVATE KEY-----
-MIGgAgEBBC0AFagbth/4/M2sb1G4FpxbFEVLIulioS34v0hrClpZ38/Z+PHmIhOf
-EFminyegCgYIKoZIzj0DABOhYANeAAQAU42w7mIIjkyAdnCC4qoEPdH42fh3oVyC
-tnaRtKUmdhUdXm0IgSM4T4SYEOsx+aQZLGIjnhHJCabcaKPQ0sai3dirUr2YsNXN
-DJiU93T7buUr+DnRPGsfBy/nEg==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGyAgEAMBMGByqGSM49AgEGCCqGSM49AwATBIGXMIGUAgEBBC0AFagbth/4/M2s
+b1G4FpxbFEVLIulioS34v0hrClpZ38/Z+PHmIhOfEFminyehYANeAAQAU42w7mII
+jkyAdnCC4qoEPdH42fh3oVyCtnaRtKUmdhUdXm0IgSM4T4SYEOsx+aQZLGIjnhHJ
+CabcaKPQ0sai3dirUr2YsNXNDJiU93T7buUr+DnRPGsfBy/nEg==
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_c2pnb368w1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7257,12 +7285,12 @@ mLDVzQyYlPd0+27lK/g50TxrHwcv5xI=
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_c2pnb368w1
------BEGIN EC PRIVATE KEY-----
-MIGgAgEBBC0AA/woMzOFy8k2zBqBkubhkOIwc7sx0u+JadM9f7V45L4P8nK7bjJa
-sOqrHRagCgYIKoZIzj0DABOhYANeAATKE6jcstacH8yWzg/qBgvGoGan2PVwTN/U
-+68K4WxHO7+oPHviUh1OVF7ZxYjsVSdyno83iHE33sq2Ej6j26f+uVs/fuWk19t8
-NpAQ6+sVETZszuMDm5adqtVZRQ==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGyAgEAMBMGByqGSM49AgEGCCqGSM49AwATBIGXMIGUAgEBBC0AA/woMzOFy8k2
+zBqBkubhkOIwc7sx0u+JadM9f7V45L4P8nK7bjJasOqrHRahYANeAATKE6jcstac
+H8yWzg/qBgvGoGan2PVwTN/U+68K4WxHO7+oPHviUh1OVF7ZxYjsVSdyno83iHE3
+3sq2Ej6j26f+uVs/fuWk19t8NpAQ6+sVETZszuMDm5adqtVZRQ==
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_c2pnb368w1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7284,12 +7312,13 @@ SharedSecret=d191710b156d1b1d14242843a7f0abf28060bbb9e655655b53852a8b0f250ef1eee
 # TEST CURVE c2tnb431r1
 
 PrivateKey=ALICE_c2tnb431r1
------BEGIN EC PRIVATE KEY-----
-MIG4AgEBBDUC18JhUt+NCIZ/q6kdjNZ7zX72UqpW4K6Uc2bAWu2PXK1aL573LNzu
-4oUlHfbvuE1BUrxNpaAKBggqhkjOPQMAFKFwA24ABDrG8SG4lckR1rrvLRpXYf7W
-spmh/fbql+Zpulyl896XtwQK2BkLVRkZ5ixTG4PUyb64OiffdSnvIaM++cb7LgJL
-BBgT3d5le8V1gtxWFFm0NggUyF6glmUqHQL0LuhXWS468O6w05KS0AL6vQ==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIHKAgEAMBMGByqGSM49AgEGCCqGSM49AwAUBIGvMIGsAgEBBDUC18JhUt+NCIZ/
+q6kdjNZ7zX72UqpW4K6Uc2bAWu2PXK1aL573LNzu4oUlHfbvuE1BUrxNpaFwA24A
+BDrG8SG4lckR1rrvLRpXYf7Wspmh/fbql+Zpulyl896XtwQK2BkLVRkZ5ixTG4PU
+yb64OiffdSnvIaM++cb7LgJLBBgT3d5le8V1gtxWFFm0NggUyF6glmUqHQL0LuhX
+WS468O6w05KS0AL6vQ==
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_c2tnb431r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7299,12 +7328,13 @@ MIGFMBMGByqGSM49AgEGCCqGSM49AwAUA24ABDrG8SG4lckR1rrvLRpXYf7Wspmh
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_c2tnb431r1
------BEGIN EC PRIVATE KEY-----
-MIG4AgEBBDUApanyPgvpfrAu1jNAKGpctH71v0+P/kFF9JxdFYarpWEwBBd4tz6C
-xoYKmvDZ9ukOOqBbX6AKBggqhkjOPQMAFKFwA24ABGh3JXuYmh6dGGEmbRhoR2T5
-pVD/5Mq2ZKKzfzY2NOoKiIs6rVzv2SW7S6BScYlRqRWiXCeZVFvT0crDY/5uodkH
-bcRw6B/Yo/iMN8wLI257Tjm9/C5G+JPCLopCcLILgTwAJM2ZhtPnc08LyQ==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIHKAgEAMBMGByqGSM49AgEGCCqGSM49AwAUBIGvMIGsAgEBBDUApanyPgvpfrAu
+1jNAKGpctH71v0+P/kFF9JxdFYarpWEwBBd4tz6CxoYKmvDZ9ukOOqBbX6FwA24A
+BGh3JXuYmh6dGGEmbRhoR2T5pVD/5Mq2ZKKzfzY2NOoKiIs6rVzv2SW7S6BScYlR
+qRWiXCeZVFvT0crDY/5uodkHbcRw6B/Yo/iMN8wLI257Tjm9/C5G+JPCLopCcLIL
+gTwAJM2ZhtPnc08LyQ==
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_c2tnb431r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7326,10 +7356,10 @@ SharedSecret=4c4d7d387843ff5152f22f101b0609238819357fae2ccc9097b818e383ef6809cb4
 # TEST CURVE wap-wsg-idm-ecid-wtls1
 
 PrivateKey=ALICE_wap-wsg-idm-ecid-wtls1
------BEGIN EC PRIVATE KEY-----
-MEACAQEEDle73WoHDFMOaEP/fQp/oAcGBWcrAQQBoSIDIAAEAVBJnQb5p9rXHgrB
-TMGNARYU11mgXpQ1gaQJEg3K
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MFACAQAwEAYHKoZIzj0CAQYFZysBBAEEOTA3AgEBBA5Xu91qBwxTDmhD/30Kf6Ei
+AyAABAFQSZ0G+afa1x4KwUzBjQEWFNdZoF6UNYGkCRINyg==
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_wap-wsg-idm-ecid-wtls1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7338,10 +7368,10 @@ gaQJEg3K
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_wap-wsg-idm-ecid-wtls1
------BEGIN EC PRIVATE KEY-----
-MEACAQEEDlpToJDjvhnV8ffEC2f/oAcGBWcrAQQBoSIDIAAEAWlvgZNz7m9/meS3
-jMvHAZlDqpJtiUfylRum/Byo
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MFACAQAwEAYHKoZIzj0CAQYFZysBBAEEOTA3AgEBBA5aU6CQ474Z1fH3xAtn/6Ei
+AyAABAFpb4GTc+5vf5nkt4zLxwGZQ6qSbYlH8pUbpvwcqA==
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_wap-wsg-idm-ecid-wtls1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7362,10 +7392,11 @@ SharedSecret=0000fc6e280987e8b9bf6e3c7fa003
 # TEST CURVE wap-wsg-idm-ecid-wtls3
 
 PrivateKey=ALICE_wap-wsg-idm-ecid-wtls3
------BEGIN EC PRIVATE KEY-----
-MFMCAQEEFQE3YUWBCLPgo8n0YSyuPkGb3TyJ+6AHBgVnKwEEA6EuAywABAFXbVPH
-e/z7XAUqrs+KWhHULHOaVQO+fJeuziY2Zzk2zfybM94255A2jQ==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGMCAQAwEAYHKoZIzj0CAQYFZysBBAMETDBKAgEBBBUBN2FFgQiz4KPJ9GEsrj5B
+m908ifuhLgMsAAQBV21Tx3v8+1wFKq7PiloR1CxzmlUDvnyXrs4mNmc5Ns38mzPe
+NueQNo0=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_wap-wsg-idm-ecid-wtls3_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7374,10 +7405,11 @@ l67OJjZnOTbN/Jsz3jbnkDaN
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_wap-wsg-idm-ecid-wtls3
------BEGIN EC PRIVATE KEY-----
-MFMCAQEEFQD/RSy3signnbrOfbCJYG6tHk15JaAHBgVnKwEEA6EuAywABAHt37/M
-wy2Lh2OGVWdoapqqiduajgK/6IpPVwXefNdX8pcdIkin2Jl5qw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGMCAQAwEAYHKoZIzj0CAQYFZysBBAMETDBKAgEBBBUA/0Ust7IoJ526zn2wiWBu
+rR5NeSWhLgMsAAQB7d+/zMMti4djhlVnaGqaqonbmo4Cv+iKT1cF3nzXV/KXHSJI
+p9iZeas=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_wap-wsg-idm-ecid-wtls3_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7398,10 +7430,10 @@ SharedSecret=00cf1d850f396436be68f1e5502935853ed054511f
 # TEST CURVE wap-wsg-idm-ecid-wtls4
 
 PrivateKey=ALICE_wap-wsg-idm-ecid-wtls4
------BEGIN EC PRIVATE KEY-----
-MEECAQEEDwCy4Qa59I1KsM+7djU1qaAHBgVnKwEEBKEiAyAABABy89FsCuyR4Gzp
-bag56wAcxCjwuT8UdxgpR8w4pg==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MFECAQAwEAYHKoZIzj0CAQYFZysBBAQEOjA4AgEBBA8AsuEGufSNSrDPu3Y1Namh
+IgMgAAQAcvPRbArskeBs6W2oOesAHMQo8Lk/FHcYKUfMOKY=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_wap-wsg-idm-ecid-wtls4_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7410,10 +7442,10 @@ GClHzDim
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_wap-wsg-idm-ecid-wtls4
------BEGIN EC PRIVATE KEY-----
-MEECAQEEDwAUnCZSQptZ2bO+q/4BtaAHBgVnKwEEBKEiAyAABAGuI4lLJEviujnk
-JsLB6QGW4QrAh8/rg58kIR9ZNQ==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MFECAQAwEAYHKoZIzj0CAQYFZysBBAQEOjA4AgEBBA8AFJwmUkKbWdmzvqv+AbWh
+IgMgAAQBriOJSyRL4ro55CbCwekBluEKwIfP64OfJCEfWTU=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_wap-wsg-idm-ecid-wtls4_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7434,10 +7466,11 @@ SharedSecret=01076232302ca32b5f3daf075e5213
 # TEST CURVE wap-wsg-idm-ecid-wtls5
 
 PrivateKey=ALICE_wap-wsg-idm-ecid-wtls5
------BEGIN EC PRIVATE KEY-----
-MFMCAQEEFQKaeBto7ZL/9NrRlSGf+dtnJ1MoP6AHBgVnKwEEBaEuAywABADXv3aJ
-3eEsi7bPQoQKQEJRtNI/1QUu7YVMmQtryo/hkisG3kVcomjYPA==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGMCAQAwEAYHKoZIzj0CAQYFZysBBAUETDBKAgEBBBUCmngbaO2S//Ta0ZUhn/nb
+ZydTKD+hLgMsAAQA1792id3hLIu2z0KECkBCUbTSP9UFLu2FTJkLa8qP4ZIrBt5F
+XKJo2Dw=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_wap-wsg-idm-ecid-wtls5_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7446,10 +7479,11 @@ hUyZC2vKj+GSKwbeRVyiaNg8
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_wap-wsg-idm-ecid-wtls5
------BEGIN EC PRIVATE KEY-----
-MFMCAQEEFQGtprhp5jEd30cnS8sigLBq4Yp33KAHBgVnKwEEBaEuAywABAfNzYWB
-8kZqw2Uxwk0MOs1ASWEDVwcPiLOoR52YLe54y7vb9KlUXY+mKA==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGMCAQAwEAYHKoZIzj0CAQYFZysBBAUETDBKAgEBBBUBraa4aeYxHd9HJ0vLIoCw
+auGKd9yhLgMsAAQHzc2FgfJGasNlMcJNDDrNQElhA1cHD4izqEedmC3ueMu72/Sp
+VF2Ppig=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_wap-wsg-idm-ecid-wtls5_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7470,10 +7504,10 @@ SharedSecret=066091c591278f5b949106052b2546aacc20917c20
 # TEST CURVE wap-wsg-idm-ecid-wtls6
 
 PrivateKey=ALICE_wap-wsg-idm-ecid-wtls6
------BEGIN EC PRIVATE KEY-----
-MD4CAQEEDksnBE2s80zAbKgE/3lroAcGBWcrAQQGoSADHgAExnEWLvXVaXmvu1vV
-cn18ncfVbUwq9Wti9+Y0Wg==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+ME4CAQAwEAYHKoZIzj0CAQYFZysBBAYENzA1AgEBBA5LJwRNrPNMwGyoBP95a6Eg
+Ax4ABMZxFi711Wl5r7tb1XJ9fJ3H1W1MKvVrYvfmNFo=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_wap-wsg-idm-ecid-wtls6_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7482,10 +7516,10 @@ MDIwEAYHKoZIzj0CAQYFZysBBAYDHgAExnEWLvXVaXmvu1vVcn18ncfVbUwq9Wti
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_wap-wsg-idm-ecid-wtls6
------BEGIN EC PRIVATE KEY-----
-MD4CAQEEDreLXPgqXwEQTUjcJhT0oAcGBWcrAQQGoSADHgAEbcW3kXzC+caKZQCY
-ZCt+oCVUkp3OE1Jre/jspw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+ME4CAQAwEAYHKoZIzj0CAQYFZysBBAYENzA1AgEBBA63i1z4Kl8BEE1I3CYU9KEg
+Ax4ABG3Ft5F8wvnGimUAmGQrfqAlVJKdzhNSa3v47Kc=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_wap-wsg-idm-ecid-wtls6_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7506,10 +7540,11 @@ SharedSecret=8d184455748c56115ba2183070b0
 # TEST CURVE wap-wsg-idm-ecid-wtls7
 
 PrivateKey=ALICE_wap-wsg-idm-ecid-wtls7
------BEGIN EC PRIVATE KEY-----
-MFECAQEEFQC56iKyI36W4kTLTB2IjuNwAuVOoKAHBgVnKwEEB6EsAyoABD8VawbE
-Py+68QVZd9ZF46q8HOpasX2Z0x5N44TXL2v0844hRUk820s=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGECAQAwEAYHKoZIzj0CAQYFZysBBAcESjBIAgEBBBUAueoisiN+luJEy0wdiI7j
+cALlTqChLAMqAAQ/FWsGxD8vuvEFWXfWReOqvBzqWrF9mdMeTeOE1y9r9POOIUVJ
+PNtL
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_wap-wsg-idm-ecid-wtls7_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7518,10 +7553,11 @@ Hk3jhNcva/TzjiFFSTzbSw==
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_wap-wsg-idm-ecid-wtls7
------BEGIN EC PRIVATE KEY-----
-MFECAQEEFQCvja8qNtRcVqTaZXMVim7KE39wPKAHBgVnKwEEB6EsAyoABIlmm4WD
-6fy+xy6r6mp8UU9h6ad8t2F0AHgmh19HcnkHO7ruESZsgpA=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGECAQAwEAYHKoZIzj0CAQYFZysBBAcESjBIAgEBBBUAr42vKjbUXFak2mVzFYpu
+yhN/cDyhLAMqAASJZpuFg+n8vscuq+pqfFFPYemnfLdhdAB4JodfR3J5Bzu67hEm
+bIKQ
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_wap-wsg-idm-ecid-wtls7_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7542,10 +7578,10 @@ SharedSecret=990eda6a0406caef965018b97c94d0faa200f6e4
 # TEST CURVE wap-wsg-idm-ecid-wtls8
 
 PrivateKey=ALICE_wap-wsg-idm-ecid-wtls8
------BEGIN EC PRIVATE KEY-----
-MD8CAQEEDwDWbrZ9+XqeK4zjpc5TKKAHBgVnKwEECKEgAx4ABPiapgCh7s0S0p8Q
-xCzah8ieFlFkIWsVTlyMRaI=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+ME8CAQAwEAYHKoZIzj0CAQYFZysBBAgEODA2AgEBBA8A1m62ffl6niuM46XOUyih
+IAMeAAT4mqYAoe7NEtKfEMQs2ofInhZRZCFrFU5cjEWi
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_wap-wsg-idm-ecid-wtls8_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7554,10 +7590,10 @@ XIxFog==
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_wap-wsg-idm-ecid-wtls8
------BEGIN EC PRIVATE KEY-----
-MD8CAQEEDwB6BOsugxHI+XhTjE52DqAHBgVnKwEECKEgAx4ABNAqTJDeMvYSS7oL
-69JBrNuONKTM17rs5xyqPY8=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+ME8CAQAwEAYHKoZIzj0CAQYFZysBBAgEODA2AgEBBA8AegTrLoMRyPl4U4xOdg6h
+IAMeAATQKkyQ3jL2Eku6C+vSQazbjjSkzNe67Occqj2P
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_wap-wsg-idm-ecid-wtls8_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7578,10 +7614,11 @@ SharedSecret=7524c547bd6b26644ce70571cb06
 # TEST CURVE wap-wsg-idm-ecid-wtls9
 
 PrivateKey=ALICE_wap-wsg-idm-ecid-wtls9
------BEGIN EC PRIVATE KEY-----
-MFECAQEEFQATTfvo2/OwheLpdp2tWfjTqhtNEKAHBgVnKwEECaEsAyoABFsLXLD1
-/W4E5WUx/lkVB7BODJzzUCqHZMUxJF+6MIiF28ZNiBG27oU=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGECAQAwEAYHKoZIzj0CAQYFZysBBAkESjBIAgEBBBUAE0376NvzsIXi6XadrVn4
+06obTRChLAMqAARbC1yw9f1uBOVlMf5ZFQewTgyc81Aqh2TFMSRfujCIhdvGTYgR
+tu6F
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_wap-wsg-idm-ecid-wtls9_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7590,10 +7627,11 @@ xTEkX7owiIXbxk2IEbbuhQ==
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_wap-wsg-idm-ecid-wtls9
------BEGIN EC PRIVATE KEY-----
-MFECAQEEFQB3aR8xyVolTZuDxrJOuNmiiUjzbKAHBgVnKwEECaEsAyoABDQ15b1M
-qFB4WutPIxH0Zvnn4Gd4JBIHIBKEzwOfdXUUVjPufTJu8Fc=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGECAQAwEAYHKoZIzj0CAQYFZysBBAkESjBIAgEBBBUAd2kfMclaJU2bg8ayTrjZ
+oolI82yhLAMqAAQ0NeW9TKhQeFrrTyMR9Gb55+BneCQSByAShM8Dn3V1FFYz7n0y
+bvBX
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_wap-wsg-idm-ecid-wtls9_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7614,11 +7652,11 @@ SharedSecret=5ca1d9eed44def2c390fd5bbb16ca2c3a09eb7b1
 # TEST CURVE wap-wsg-idm-ecid-wtls10
 
 PrivateKey=ALICE_wap-wsg-idm-ecid-wtls10
------BEGIN EC PRIVATE KEY-----
-MG0CAQEEHTVMOCMgZ36Bc9nh6xCdbPP/LW/MmeJQEzlc3I+roAcGBWcrAQQKoUAD
-PgAEAdWzmBilsnOrI7wuTeeRPCG7gG5dvjC2uAZxjYtPAbGQLhmrhqoujCx7EaNV
-rQiMYp1bPn9N/AvAak3g
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MH0CAQAwEAYHKoZIzj0CAQYFZysBBAoEZjBkAgEBBB01TDgjIGd+gXPZ4esQnWzz
+/y1vzJniUBM5XNyPq6FAAz4ABAHVs5gYpbJzqyO8Lk3nkTwhu4BuXb4wtrgGcY2L
+TwGxkC4Zq4aqLowsexGjVa0IjGKdWz5/TfwLwGpN4A==
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_wap-wsg-idm-ecid-wtls10_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7627,11 +7665,11 @@ uAZxjYtPAbGQLhmrhqoujCx7EaNVrQiMYp1bPn9N/AvAak3g
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_wap-wsg-idm-ecid-wtls10
------BEGIN EC PRIVATE KEY-----
-MG0CAQEEHSZOrBjAHJG67jNxTVAspwabzB7C5qgqpVKmnzFBoAcGBWcrAQQKoUAD
-PgAEAQXjFOtYAgXURpw0ypMbeTDHBqu0AoUWrI6V77AHAOLqCtrtwVV50PWnlHAP
-iBlThDOAItLBrvFlsHOC
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MH0CAQAwEAYHKoZIzj0CAQYFZysBBAoEZjBkAgEBBB0mTqwYwByRuu4zcU1QLKcG
+m8wewuaoKqVSpp8xQaFAAz4ABAEF4xTrWAIF1EacNMqTG3kwxwartAKFFqyOle+w
+BwDi6gra7cFVedD1p5RwD4gZU4QzgCLSwa7xZbBzgg==
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_wap-wsg-idm-ecid-wtls10_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7652,11 +7690,11 @@ SharedSecret=0199de137bc263e25b543994d6315b5a3f1e38e7e1f60662cb5cbaab5f98
 # TEST CURVE wap-wsg-idm-ecid-wtls11
 
 PrivateKey=ALICE_wap-wsg-idm-ecid-wtls11
------BEGIN EC PRIVATE KEY-----
-MG4CAQEEHgC7qWvMLdEiTeNea1t44Cktk9HQ1Suvp1N/WVIIaqAHBgVnKwEEC6FA
-Az4ABAGXvdXZMRnwE7hAL5iIGUnQaZbxYtzdG1LeIiv+hQBoNBAAZUkUPcaCGME9
-8j0pUFxnY/y1RdS/mJ+tZw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MH4CAQAwEAYHKoZIzj0CAQYFZysBBAsEZzBlAgEBBB4Au6lrzC3RIk3jXmtbeOAp
+LZPR0NUrr6dTf1lSCGqhQAM+AAQBl73V2TEZ8BO4QC+YiBlJ0GmW8WLc3RtS3iIr
+/oUAaDQQAGVJFD3GghjBPfI9KVBcZ2P8tUXUv5ifrWc=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_wap-wsg-idm-ecid-wtls11_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7665,11 +7703,11 @@ Ut4iK/6FAGg0EABlSRQ9xoIYwT3yPSlQXGdj/LVF1L+Yn61n
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_wap-wsg-idm-ecid-wtls11
------BEGIN EC PRIVATE KEY-----
-MG4CAQEEHgAYm4a1AjUW8d+nYCx0pvc1VZrCOllC7IzVp6XCzaAHBgVnKwEEC6FA
-Az4ABAB1NbfFToiN/9jzflnaFLh86fpeanc7qJuVceucqgE5G7EdVF9eR90vlOp8
-Wm4OCHMLIBLpkxJaGMZXmg==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MH4CAQAwEAYHKoZIzj0CAQYFZysBBAsEZzBlAgEBBB4AGJuGtQI1FvHfp2AsdKb3
+NVWawjpZQuyM1aelws2hQAM+AAQAdTW3xU6Ijf/Y835Z2hS4fOn6Xmp3O6iblXHr
+nKoBORuxHVRfXkfdL5TqfFpuDghzCyAS6ZMSWhjGV5o=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_wap-wsg-idm-ecid-wtls11_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7690,11 +7728,11 @@ SharedSecret=01ee4b517d8a64be5ee32e10152c7bbcb8cde73a3da8e9643bce173011f7
 # TEST CURVE wap-wsg-idm-ecid-wtls12
 
 PrivateKey=ALICE_wap-wsg-idm-ecid-wtls12
------BEGIN EC PRIVATE KEY-----
-MGgCAQEEHICdS9BmFmvWWBNGLFIwjHQoe5Xi3xxtcJbjXmygBwYFZysBBAyhPAM6
-AATcbzAiX1InSYCa4gxZsmkWN/3A7yAo27qcCnJ7f1iGld5hEv+ebsboeaKIDk7W
-K51YLeENsEfRxw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MHgCAQAwEAYHKoZIzj0CAQYFZysBBAwEYTBfAgEBBByAnUvQZhZr1lgTRixSMIx0
+KHuV4t8cbXCW415soTwDOgAE3G8wIl9SJ0mAmuIMWbJpFjf9wO8gKNu6nApye39Y
+hpXeYRL/nm7G6HmiiA5O1iudWC3hDbBH0cc=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_wap-wsg-idm-ecid-wtls12_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7703,11 +7741,11 @@ nApye39YhpXeYRL/nm7G6HmiiA5O1iudWC3hDbBH0cc=
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_wap-wsg-idm-ecid-wtls12
------BEGIN EC PRIVATE KEY-----
-MGgCAQEEHNnue3gKs+uTabmJHri+mSP3kkc6bNZ/hWFFmp2gBwYFZysBBAyhPAM6
-AAS6TPjQjiBalSZcIz48uZYZ3Qg7Rcg9Br0pfNe+Fst0kfTIWQn4KVJug4LbqC0x
-MgKI+ESBiN4oRA==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MHgCAQAwEAYHKoZIzj0CAQYFZysBBAwEYTBfAgEBBBzZ7nt4CrPrk2m5iR64vpkj
+95JHOmzWf4VhRZqdoTwDOgAEukz40I4gWpUmXCM+PLmWGd0IO0XIPQa9KXzXvhbL
+dJH0yFkJ+ClSboOC26gtMTICiPhEgYjeKEQ=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_wap-wsg-idm-ecid-wtls12_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7728,10 +7766,11 @@ SharedSecret=c75a8283a73312de82c8f99d41a9173a43b8f921e8161dd140131b36
 # TEST CURVE brainpoolP160r1
 
 PrivateKey=ALICE_brainpoolP160r1
------BEGIN EC PRIVATE KEY-----
-MFQCAQEEFGU0GLeiDrGVFIK9+lmBik49dHq0oAsGCSskAwMCCAEBAaEsAyoABCQx
-/ve3cKi/Zx17M9JS31afTJ2GmT37YfBnXdi59TJ9y8+KN0n/MU4=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGQCAQAwFAYHKoZIzj0CAQYJKyQDAwIIAQEBBEkwRwIBAQQUZTQYt6IOsZUUgr36
+WYGKTj10erShLAMqAAQkMf73t3Cov2cdezPSUt9Wn0ydhpk9+2HwZ13YufUyfcvP
+ijdJ/zFO
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_brainpoolP160r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7740,10 +7779,11 @@ mT37YfBnXdi59TJ9y8+KN0n/MU4=
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_brainpoolP160r1
------BEGIN EC PRIVATE KEY-----
-MFQCAQEEFG/7pSERuMqDjooVgwFeJe/CNhi1oAsGCSskAwMCCAEBAaEsAyoABE+M
-Qx609ZLgWWAUIe9V8rWdMr9MuxhJwet6B5kBmqfyBoW+CrhsTy8=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGQCAQAwFAYHKoZIzj0CAQYJKyQDAwIIAQEBBEkwRwIBAQQUb/ulIRG4yoOOihWD
+AV4l78I2GLWhLAMqAARPjEMetPWS4FlgFCHvVfK1nTK/TLsYScHregeZAZqn8gaF
+vgq4bE8v
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_brainpoolP160r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7764,10 +7804,11 @@ SharedSecret=e4fe5ae99a60d17b597f5705a719cea6709c63b9
 # TEST CURVE brainpoolP160t1
 
 PrivateKey=ALICE_brainpoolP160t1
------BEGIN EC PRIVATE KEY-----
-MFQCAQEEFFlgMlJzL5kMninhxGyI8q1tCc1aoAsGCSskAwMCCAEBAqEsAyoABD+H
-VVI8q+fZxM+Z8yrQVnebHKmMIha0Ixq/sYf0VvL6QKtYoDSUVXA=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGQCAQAwFAYHKoZIzj0CAQYJKyQDAwIIAQECBEkwRwIBAQQUWWAyUnMvmQyeKeHE
+bIjyrW0JzVqhLAMqAAQ/h1VSPKvn2cTPmfMq0FZ3mxypjCIWtCMav7GH9Fby+kCr
+WKA0lFVw
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_brainpoolP160t1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7776,10 +7817,11 @@ Iha0Ixq/sYf0VvL6QKtYoDSUVXA=
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_brainpoolP160t1
------BEGIN EC PRIVATE KEY-----
-MFQCAQEEFAxaVMfEme9fF9HML/qEGk10itM8oAsGCSskAwMCCAEBAqEsAyoABAiA
-NiG7L1yPTggUTQt+iuAk+32uByO47zVXpZH4Tcs0RMmtizLVf2Q=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MGQCAQAwFAYHKoZIzj0CAQYJKyQDAwIIAQECBEkwRwIBAQQUDFpUx8SZ718X0cwv
++oQaTXSK0zyhLAMqAAQIgDYhuy9cj04IFE0LforgJPt9rgcjuO81V6WR+E3LNETJ
+rYsy1X9k
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_brainpoolP160t1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7800,11 +7842,11 @@ SharedSecret=199a218458b71a4e13f05a599fc17bc76f30ea2f
 # TEST CURVE brainpoolP192r1
 
 PrivateKey=ALICE_brainpoolP192r1
------BEGIN EC PRIVATE KEY-----
-MGACAQEEGBoiKWVUe9Qt9W/QBJS4hIhMs3YUbL025KALBgkrJAMDAggBAQOhNAMy
-AAQcCi9Vkl+bnYpaomv0grPvDtNr7sdQ3kGPL6pHzuQ6jec/7jf1Ms6ziIOEi/M/
-yPU=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MHACAQAwFAYHKoZIzj0CAQYJKyQDAwIIAQEDBFUwUwIBAQQYGiIpZVR71C31b9AE
+lLiEiEyzdhRsvTbkoTQDMgAEHAovVZJfm52KWqJr9IKz7w7Ta+7HUN5Bjy+qR87k
+Oo3nP+439TLOs4iDhIvzP8j1
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_brainpoolP192r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7813,11 +7855,11 @@ x1DeQY8vqkfO5DqN5z/uN/UyzrOIg4SL8z/I9Q==
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_brainpoolP192r1
------BEGIN EC PRIVATE KEY-----
-MGACAQEEGJLrfB5Y8Ms8TgKygGs4pW6APMmOqMuLL6ALBgkrJAMDAggBAQOhNAMy
-AAS//c2Gt1UQD48wUKb6a5eGsLTDFflQe8JR384DJ1pzYmXtdXDaBLiF9eRN5Psx
-Ay4=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MHACAQAwFAYHKoZIzj0CAQYJKyQDAwIIAQEDBFUwUwIBAQQYkut8HljwyzxOArKA
+azilboA8yY6oy4svoTQDMgAEv/3NhrdVEA+PMFCm+muXhrC0wxX5UHvCUd/OAyda
+c2Jl7XVw2gS4hfXkTeT7MQMu
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_brainpoolP192r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7838,11 +7880,11 @@ SharedSecret=7ce122b49afdfd1adde6cdfaa13dc7180d6d4e70322c8773
 # TEST CURVE brainpoolP192t1
 
 PrivateKey=ALICE_brainpoolP192t1
------BEGIN EC PRIVATE KEY-----
-MGACAQEEGAldTbmMOw8DmsKoGJAC3xaRMxRNq416mKALBgkrJAMDAggBAQShNAMy
-AASYGYnbbT9klV3F9KAcVPPcU4LY8eqXYi1sbQtez+/uf+qRYZbP0HtHYUGoVosG
-TQs=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MHACAQAwFAYHKoZIzj0CAQYJKyQDAwIIAQEEBFUwUwIBAQQYCV1NuYw7DwOawqgY
+kALfFpEzFE2rjXqYoTQDMgAEmBmJ220/ZJVdxfSgHFTz3FOC2PHql2ItbG0LXs/v
+7n/qkWGWz9B7R2FBqFaLBk0L
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_brainpoolP192t1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7851,11 +7893,11 @@ MEowFAYHKoZIzj0CAQYJKyQDAwIIAQEEAzIABJgZidttP2SVXcX0oBxU89xTgtjx
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_brainpoolP192t1
------BEGIN EC PRIVATE KEY-----
-MGACAQEEGJmT9r5mKXyb0p6hJeCtGI9IjAq+HbPW26ALBgkrJAMDAggBAQShNAMy
-AARxK4tIQPazhIi4R2iZlt0MxKY2umd7MlG/9b5sJCnhtydABvbS2njshLD/JehB
-IDQ=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MHACAQAwFAYHKoZIzj0CAQYJKyQDAwIIAQEEBFUwUwIBAQQYmZP2vmYpfJvSnqEl
+4K0Yj0iMCr4ds9bboTQDMgAEcSuLSED2s4SIuEdomZbdDMSmNrpnezJRv/W+bCQp
+4bcnQAb20tp47ISw/yXoQSA0
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_brainpoolP192t1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7876,11 +7918,11 @@ SharedSecret=1a5444c2600d9d21d6a450d158fd25272ade262ab519790b
 # TEST CURVE brainpoolP224r1
 
 PrivateKey=ALICE_brainpoolP224r1
------BEGIN EC PRIVATE KEY-----
-MGwCAQEEHIfdRZjs/bSfVn3csJKzjOlF4p07mAcY1FrVNBygCwYJKyQDAwIIAQEF
-oTwDOgAEirRPkAknN0OX3BtirLETEx9Ns0O3pb+i6d1lNLqpdi8x6An6cFxd4KL4
-UEjSm7qUe/y0XVmNYtI=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MHwCAQAwFAYHKoZIzj0CAQYJKyQDAwIIAQEFBGEwXwIBAQQch91FmOz9tJ9Wfdyw
+krOM6UXinTuYBxjUWtU0HKE8AzoABIq0T5AJJzdDl9wbYqyxExMfTbNDt6W/ound
+ZTS6qXYvMegJ+nBcXeCi+FBI0pu6lHv8tF1ZjWLS
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_brainpoolP224r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7889,11 +7931,11 @@ t6W/oundZTS6qXYvMegJ+nBcXeCi+FBI0pu6lHv8tF1ZjWLS
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_brainpoolP224r1
------BEGIN EC PRIVATE KEY-----
-MGwCAQEEHL2m5CVp60eC7hlMXyzvA6gwXC+Hosf2tKkVsZugCwYJKyQDAwIIAQEF
-oTwDOgAEzqqAEj1uZnDJgTRAUEl/k2ld7amGBw5sqsbhRGN2w5GXhQnCWrt4vAg0
-ks/10+XRCVvQW/+A1Wg=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MHwCAQAwFAYHKoZIzj0CAQYJKyQDAwIIAQEFBGEwXwIBAQQcvabkJWnrR4LuGUxf
+LO8DqDBcL4eix/a0qRWxm6E8AzoABM6qgBI9bmZwyYE0QFBJf5NpXe2phgcObKrG
+4URjdsORl4UJwlq7eLwINJLP9dPl0Qlb0Fv/gNVo
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_brainpoolP224r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7914,11 +7956,11 @@ SharedSecret=419e446a66968fcc372126cff4d637505c848c3a9b82503f2d441215
 # TEST CURVE brainpoolP224t1
 
 PrivateKey=ALICE_brainpoolP224t1
------BEGIN EC PRIVATE KEY-----
-MGwCAQEEHEsFgnKmLojcsUdIGFQjAUNe8pH2sRIDDMgcmaKgCwYJKyQDAwIIAQEG
-oTwDOgAEmJWHAhkCrL44qPxF7COx1c88I4N+b7hEZXzZtgtbxKqIN4QMH5G8mKtj
-DP9rlGL4QvleT1BWRAU=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MHwCAQAwFAYHKoZIzj0CAQYJKyQDAwIIAQEGBGEwXwIBAQQcSwWCcqYuiNyxR0gY
+VCMBQ17ykfaxEgMMyByZoqE8AzoABJiVhwIZAqy+OKj8RewjsdXPPCODfm+4RGV8
+2bYLW8SqiDeEDB+RvJirYwz/a5Ri+EL5Xk9QVkQF
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_brainpoolP224t1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7927,11 +7969,11 @@ fm+4RGV82bYLW8SqiDeEDB+RvJirYwz/a5Ri+EL5Xk9QVkQF
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_brainpoolP224t1
------BEGIN EC PRIVATE KEY-----
-MGwCAQEEHCyuUfonb86gtWtvBnvZuhIebqfNmrVUk0Vnl8CgCwYJKyQDAwIIAQEG
-oTwDOgAEGDpqveWRhK/QBw4znjZJs+ECrGfL9qdL4OgQtWIzSuh/GVy+TLBmIFjR
-PjTFS9cEgsOxj/SF7bY=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MHwCAQAwFAYHKoZIzj0CAQYJKyQDAwIIAQEGBGEwXwIBAQQcLK5R+idvzqC1a28G
+e9m6Eh5up82atVSTRWeXwKE8AzoABBg6ar3lkYSv0AcOM542SbPhAqxny/anS+Do
+ELViM0rofxlcvkywZiBY0T40xUvXBILDsY/0he22
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_brainpoolP224t1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7952,11 +7994,11 @@ SharedSecret=8f83465fb6353912a51c2809ea30b19b73b3e391c0422650e0f20b58
 # TEST CURVE brainpoolP256r1
 
 PrivateKey=ALICE_brainpoolP256r1
------BEGIN EC PRIVATE KEY-----
-MHgCAQEEIBMmEFKb8UQb4oCuk226EiMpk/omRsx/rrRNuh9WGB/zoAsGCSskAwMC
-CAEBB6FEA0IABHiGHSaSKZMZ3imy/aj/70idv3e3BwrNmV4IHEYn+yijeeSKIre0
-NbFRHhsxAxW8aUViugPioLvLBZBPix6+QRk=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGIAgEAMBQGByqGSM49AgEGCSskAwMCCAEBBwRtMGsCAQEEIBMmEFKb8UQb4oCu
+k226EiMpk/omRsx/rrRNuh9WGB/zoUQDQgAEeIYdJpIpkxneKbL9qP/vSJ2/d7cH
+Cs2ZXggcRif7KKN55Ioit7Q1sVEeGzEDFbxpRWK6A+Kgu8sFkE+LHr5BGQ==
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_brainpoolP256r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7965,11 +8007,11 @@ BwrNmV4IHEYn+yijeeSKIre0NbFRHhsxAxW8aUViugPioLvLBZBPix6+QRk=
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_brainpoolP256r1
------BEGIN EC PRIVATE KEY-----
-MHgCAQEEIKXsf2pxFfTQiwbW2SKwZq50UOGhJYJZYO/xY33RHuQaoAsGCSskAwMC
-CAEBB6FEA0IABAvxQjYcsWeFXB2PMwXoRW4NzOeAFMOosSevYCNvsaMgFwZ+XfqX
-/LQBtA9E1KrcUbcAYD1pLeqWOGGAUDGPjTg=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGIAgEAMBQGByqGSM49AgEGCSskAwMCCAEBBwRtMGsCAQEEIKXsf2pxFfTQiwbW
+2SKwZq50UOGhJYJZYO/xY33RHuQaoUQDQgAEC/FCNhyxZ4VcHY8zBehFbg3M54AU
+w6ixJ69gI2+xoyAXBn5d+pf8tAG0D0TUqtxRtwBgPWkt6pY4YYBQMY+NOA==
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_brainpoolP256r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -7990,11 +8032,11 @@ SharedSecret=78ed4b7bb4ed808813f8c27132fe04f5d805365549b754994d83b002416b6ba0
 # TEST CURVE brainpoolP256t1
 
 PrivateKey=ALICE_brainpoolP256t1
------BEGIN EC PRIVATE KEY-----
-MHgCAQEEIC4yFvVLhvRyF9wuyYJbncxLagsMCD+Sxt2vAJiKFpKdoAsGCSskAwMC
-CAEBCKFEA0IABIhsZfBNMo94BOIjshQ1XtLVGEvXzXDc5MRMdgomcJtPY20jUBdq
-SgKApi2UGvFQc/lGanXl2cvUnPFKSVNxYIY=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGIAgEAMBQGByqGSM49AgEGCSskAwMCCAEBCARtMGsCAQEEIC4yFvVLhvRyF9wu
+yYJbncxLagsMCD+Sxt2vAJiKFpKdoUQDQgAEiGxl8E0yj3gE4iOyFDVe0tUYS9fN
+cNzkxEx2CiZwm09jbSNQF2pKAoCmLZQa8VBz+UZqdeXZy9Sc8UpJU3Fghg==
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_brainpoolP256t1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -8003,11 +8045,11 @@ zXDc5MRMdgomcJtPY20jUBdqSgKApi2UGvFQc/lGanXl2cvUnPFKSVNxYIY=
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_brainpoolP256t1
------BEGIN EC PRIVATE KEY-----
-MHgCAQEEIIfXus/y+3RdwUZ00db3boxPCzzRcI3CgIC8ggdGDPqPoAsGCSskAwMC
-CAEBCKFEA0IABHZWdsjogbJkRD2sPE7KxjZkyy+qtZVc/PjkO/NF8X6PVSBXkdEG
-5PAoKl9JVreYWxG28xGxeiNp2QiZ3UPVSKA=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGIAgEAMBQGByqGSM49AgEGCSskAwMCCAEBCARtMGsCAQEEIIfXus/y+3RdwUZ0
+0db3boxPCzzRcI3CgIC8ggdGDPqPoUQDQgAEdlZ2yOiBsmREPaw8TsrGNmTLL6q1
+lVz8+OQ780Xxfo9VIFeR0Qbk8CgqX0lWt5hbEbbzEbF6I2nZCJndQ9VIoA==
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_brainpoolP256t1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -8028,12 +8070,12 @@ SharedSecret=287a8f19e6f06476b222805eb11907c536fa6ea02b8877ea6d5323f9fabccdd8
 # TEST CURVE brainpoolP320r1
 
 PrivateKey=ALICE_brainpoolP320r1
------BEGIN EC PRIVATE KEY-----
-MIGQAgEBBChEG+GykvgdkDphx+i7OI1YW4TV7VFw3r3GWwnw4ZkQyhtXb2me1CVJ
-oAsGCSskAwMCCAEBCaFUA1IABFDmVKAu6UDU1doe67Fzp3WeLAKNcaLjX13W0X70
-4bqNvSU7q747RCCbd46miRYsiqYejnsX0A/A5bOiI1LJixCGcAgm1pnGajKeok/e
-csl+
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGiAgEAMBQGByqGSM49AgEGCSskAwMCCAEBCQSBhjCBgwIBAQQoRBvhspL4HZA6
+YcfouziNWFuE1e1RcN69xlsJ8OGZEMobV29pntQlSaFUA1IABFDmVKAu6UDU1doe
+67Fzp3WeLAKNcaLjX13W0X704bqNvSU7q747RCCbd46miRYsiqYejnsX0A/A5bOi
+I1LJixCGcAgm1pnGajKeok/ecsl+
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_brainpoolP320r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -8043,12 +8085,12 @@ caLjX13W0X704bqNvSU7q747RCCbd46miRYsiqYejnsX0A/A5bOiI1LJixCGcAgm
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_brainpoolP320r1
------BEGIN EC PRIVATE KEY-----
-MIGQAgEBBCiL2CGoxCnxl3HFVe44wLrq1Ui9ND0Rfq1pYsPLzZ4FEC3swi1vktoy
-oAsGCSskAwMCCAEBCaFUA1IABHFexsmyGSMPdLCma5vzaFlbk/gAkq6yfpE+BMok
-I+7GXx4dJz9+sKOi8h++T4SnocW03M7I5zOQVfK+82Kkq/vXCzEdkVRUPU4HVls7
-nil0
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGiAgEAMBQGByqGSM49AgEGCSskAwMCCAEBCQSBhjCBgwIBAQQoi9ghqMQp8Zdx
+xVXuOMC66tVIvTQ9EX6taWLDy82eBRAt7MItb5LaMqFUA1IABHFexsmyGSMPdLCm
+a5vzaFlbk/gAkq6yfpE+BMokI+7GXx4dJz9+sKOi8h++T4SnocW03M7I5zOQVfK+
+82Kkq/vXCzEdkVRUPU4HVls7nil0
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_brainpoolP320r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -8070,12 +8112,12 @@ SharedSecret=13a56c63c2dafe3e053534d5bf32c7eb4a0733bf356510725d378c5cbcf69742407
 # TEST CURVE brainpoolP320t1
 
 PrivateKey=ALICE_brainpoolP320t1
------BEGIN EC PRIVATE KEY-----
-MIGQAgEBBCjGX454gtrCjrkzhhu0tIBFdgmwUmLgXxxQXq9+jWzBGgIvqwCdXRBJ
-oAsGCSskAwMCCAEBCqFUA1IABFN48RBqcd0PyU7NTRjaJsUaYXBlectX7JwhB/X/
-bbuNUK1YW9tZJZSZ/bBUfVfEgUhC+0qrvomc3xhyYBJIQeGWODwC1rHjO2H7GGvx
-1HmF
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGiAgEAMBQGByqGSM49AgEGCSskAwMCCAEBCgSBhjCBgwIBAQQoxl+OeILawo65
+M4YbtLSARXYJsFJi4F8cUF6vfo1swRoCL6sAnV0QSaFUA1IABFN48RBqcd0PyU7N
+TRjaJsUaYXBlectX7JwhB/X/bbuNUK1YW9tZJZSZ/bBUfVfEgUhC+0qrvomc3xhy
+YBJIQeGWODwC1rHjO2H7GGvx1HmF
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_brainpoolP320t1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -8085,12 +8127,12 @@ ectX7JwhB/X/bbuNUK1YW9tZJZSZ/bBUfVfEgUhC+0qrvomc3xhyYBJIQeGWODwC
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_brainpoolP320t1
------BEGIN EC PRIVATE KEY-----
-MIGQAgEBBCgyVOIfYIzdcZpVc85Dm12b4Ymac/TeBs0rg863nJCmdbwehodz5JLn
-oAsGCSskAwMCCAEBCqFUA1IABLXO5ngGf17dU+aeQetDyXqlTTxtTrav1/NGb+i9
-BQUAsbIMQkdY0zWWbhksoMn56F2DBTSFwBlb1hBtp9fNIGUbgKqOlvtBpQHIoKXY
-Eq3l
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGiAgEAMBQGByqGSM49AgEGCSskAwMCCAEBCgSBhjCBgwIBAQQoMlTiH2CM3XGa
+VXPOQ5tdm+GJmnP03gbNK4POt5yQpnW8HoaHc+SS56FUA1IABLXO5ngGf17dU+ae
+QetDyXqlTTxtTrav1/NGb+i9BQUAsbIMQkdY0zWWbhksoMn56F2DBTSFwBlb1hBt
+p9fNIGUbgKqOlvtBpQHIoKXYEq3l
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_brainpoolP320t1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -8112,12 +8154,12 @@ SharedSecret=170d1f5fc4248700be75499eac813fac642df1311ab005e10796cc2ef43b82f8d78
 # TEST CURVE brainpoolP384r1
 
 PrivateKey=ALICE_brainpoolP384r1
------BEGIN EC PRIVATE KEY-----
-MIGoAgEBBDB5NssOnd89sgvzDsj5pDNTx51VdeIW23xSXHsdK4C8e7+5p550IoD6
-xcpd7ff9qgOgCwYJKyQDAwIIAQELoWQDYgAEgQEp8Mrclp7hd1kkTnaXCEzAyhlM
-UtBIXQGI8ALS3FaMoL4mjIlhAU+vNdIcI9NGBx7QFRUzFIy3IAyF+VPq8fM7Yyjk
-0x4P8UB1N+d2odKvKFqFBQBQmd6S5h+0ijis
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIG6AgEAMBQGByqGSM49AgEGCSskAwMCCAEBCwSBnjCBmwIBAQQweTbLDp3fPbIL
+8w7I+aQzU8edVXXiFtt8Ulx7HSuAvHu/uaeedCKA+sXKXe33/aoDoWQDYgAEgQEp
+8Mrclp7hd1kkTnaXCEzAyhlMUtBIXQGI8ALS3FaMoL4mjIlhAU+vNdIcI9NGBx7Q
+FRUzFIy3IAyF+VPq8fM7Yyjk0x4P8UB1N+d2odKvKFqFBQBQmd6S5h+0ijis
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_brainpoolP384r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -8127,12 +8169,12 @@ TFLQSF0BiPAC0txWjKC+JoyJYQFPrzXSHCPTRgce0BUVMxSMtyAMhflT6vHzO2Mo
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_brainpoolP384r1
------BEGIN EC PRIVATE KEY-----
-MIGoAgEBBDAXoRGwEo8iza9gc2eTJvXl4d9MhDnyqwWUX3SrO050bOHK2JZlc+86
-HiSHO6MV91mgCwYJKyQDAwIIAQELoWQDYgAEDxy4ddTAt+nTw0F16nhHhmmNbns3
-bX3rKEcY+686v58dAvx4VWOC7vHsiwek9ZYbZSkmKy6H78ndkBrmU3BBR7hFGyU7
-CWSDFoH5Oybk0+JzkNa0qAm8+MpAIcFqb+IY
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIG6AgEAMBQGByqGSM49AgEGCSskAwMCCAEBCwSBnjCBmwIBAQQwF6ERsBKPIs2v
+YHNnkyb15eHfTIQ58qsFlF90qztOdGzhytiWZXPvOh4khzujFfdZoWQDYgAEDxy4
+ddTAt+nTw0F16nhHhmmNbns3bX3rKEcY+686v58dAvx4VWOC7vHsiwek9ZYbZSkm
+Ky6H78ndkBrmU3BBR7hFGyU7CWSDFoH5Oybk0+JzkNa0qAm8+MpAIcFqb+IY
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_brainpoolP384r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -8154,12 +8196,12 @@ SharedSecret=0b3ad57e83759760d94904d9ea266b538120c6db2b5046217aa1ecd924828b949d3
 # TEST CURVE brainpoolP384t1
 
 PrivateKey=ALICE_brainpoolP384t1
------BEGIN EC PRIVATE KEY-----
-MIGoAgEBBDBhv/Ff07ybES61s5DBD+kHzraR6r95bGPwZbjWbY6ugS04lkvVKwr/
-xnAAvcF02jKgCwYJKyQDAwIIAQEMoWQDYgAENpcXDPQYBhU8zi4G6mQtjdgVmpdn
-4Iuwb0/VVmopmFAL0ISDB0qk9Hn2Lt9rmE8NathqkKKlVHd/Y5FRqf06PZj8jaYH
-Axvz5E1J8ykrbT7rUpbj9Df2t+eop9YBbSxc
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIG6AgEAMBQGByqGSM49AgEGCSskAwMCCAEBDASBnjCBmwIBAQQwYb/xX9O8mxEu
+tbOQwQ/pB862keq/eWxj8GW41m2OroEtOJZL1SsK/8ZwAL3BdNoyoWQDYgAENpcX
+DPQYBhU8zi4G6mQtjdgVmpdn4Iuwb0/VVmopmFAL0ISDB0qk9Hn2Lt9rmE8Nathq
+kKKlVHd/Y5FRqf06PZj8jaYHAxvz5E1J8ykrbT7rUpbj9Df2t+eop9YBbSxc
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_brainpoolP384t1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -8169,12 +8211,12 @@ BwMb8+RNSfMpK20+61KW4/Q39rfnqKfWAW0sXA==
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_brainpoolP384t1
------BEGIN EC PRIVATE KEY-----
-MIGoAgEBBDBsUc4UweUxdFh3b10XofMoyHT13Ds4DLER5E5Oo6MWwj7CFqq0vgZY
-fk/RSAU8MAegCwYJKyQDAwIIAQEMoWQDYgAER24uXKoWWnFFusbCPtDzz7n9zDIW
-zFqMeP6YE3MOseyfRFcKIVz/omWBVwpUbd3ca6Ord/Mh8hThIV4tZbPUwlyzzEW2
-NMJtd2t5JKdja0aT7fbp7NS9IJzNIRDl7r8z
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIG6AgEAMBQGByqGSM49AgEGCSskAwMCCAEBDASBnjCBmwIBAQQwbFHOFMHlMXRY
+d29dF6HzKMh09dw7OAyxEeROTqOjFsI+whaqtL4GWH5P0UgFPDAHoWQDYgAER24u
+XKoWWnFFusbCPtDzz7n9zDIWzFqMeP6YE3MOseyfRFcKIVz/omWBVwpUbd3ca6Or
+d/Mh8hThIV4tZbPUwlyzzEW2NMJtd2t5JKdja0aT7fbp7NS9IJzNIRDl7r8z
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_brainpoolP384t1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -8196,13 +8238,13 @@ SharedSecret=0fde85a61157cdd898196f291802ebd57bb2e39d98c4e6ad9bb3e2e0375e1df9bf7
 # TEST CURVE brainpoolP512r1
 
 PrivateKey=ALICE_brainpoolP512r1
------BEGIN EC PRIVATE KEY-----
-MIHaAgEBBECMxUrk8DnFiTzmA2zbxijR6tBKSCaKV0vtbAxV5PrpqWCghKV4UpP5
-9CQNGV9Io9cJmMrQ2cpfkr2uQybzD3LAoAsGCSskAwMCCAEBDaGBhQOBggAEHlj4
-gsnR2wN53k/hSIcAtbgHwbld5uS1/gR8RtoyaEDit4Ti59/I9kRkZFEHJemhpTP2
-xY03j3M5rHP7vzk1NVKgYHJQ9MvMtPd6G+Fj5D0YN1nnyqP3IJ8PyXmOdXBMoMHu
-+H50QbYZpcUFOqJhKp1T0+58xTXJdP8axl1IjtI=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIHsAgEAMBQGByqGSM49AgEGCSskAwMCCAEBDQSB0DCBzQIBAQRAjMVK5PA5xYk8
+5gNs28Yo0erQSkgmildL7WwMVeT66algoISleFKT+fQkDRlfSKPXCZjK0NnKX5K9
+rkMm8w9ywKGBhQOBggAEHlj4gsnR2wN53k/hSIcAtbgHwbld5uS1/gR8RtoyaEDi
+t4Ti59/I9kRkZFEHJemhpTP2xY03j3M5rHP7vzk1NVKgYHJQ9MvMtPd6G+Fj5D0Y
+N1nnyqP3IJ8PyXmOdXBMoMHu+H50QbYZpcUFOqJhKp1T0+58xTXJdP8axl1IjtI=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_brainpoolP512r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -8213,13 +8255,13 @@ YHJQ9MvMtPd6G+Fj5D0YN1nnyqP3IJ8PyXmOdXBMoMHu+H50QbYZpcUFOqJhKp1T
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_brainpoolP512r1
------BEGIN EC PRIVATE KEY-----
-MIHaAgEBBEBkDXT6Tj4SyZ6+ORP0t1JfTtqZHBetPsIGcSyRmkeRkShhVBroW4Ts
-VqLSSMvzqVQILjGhOMVsfe0susPS/u/CoAsGCSskAwMCCAEBDaGBhQOBggAEo3NA
-MIGp0rJxReih4nbEiTegA4pSEk84CUHHBLGuLsekVo1vmj1LTnu4dVuILLf+MSZh
-9jjNmsWuEGSHIaZx6hniFHGdaRQ3GFODGvkE6z2d2kwv3Fmsq9+gu4By2OhSCfP+
-hpFhobXAYwWXzgaBFH+TqlF31Dyr2fuPnkL7tK4=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIHsAgEAMBQGByqGSM49AgEGCSskAwMCCAEBDQSB0DCBzQIBAQRAZA10+k4+Esme
+vjkT9LdSX07amRwXrT7CBnEskZpHkZEoYVQa6FuE7Fai0kjL86lUCC4xoTjFbH3t
+LLrD0v7vwqGBhQOBggAEo3NAMIGp0rJxReih4nbEiTegA4pSEk84CUHHBLGuLsek
+Vo1vmj1LTnu4dVuILLf+MSZh9jjNmsWuEGSHIaZx6hniFHGdaRQ3GFODGvkE6z2d
+2kwv3Fmsq9+gu4By2OhSCfP+hpFhobXAYwWXzgaBFH+TqlF31Dyr2fuPnkL7tK4=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_brainpoolP512r1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -8242,13 +8284,13 @@ SharedSecret=80751feb09215a9da32f9f8c97133f53f0286a89969bd00d7f365da7f7736f45e63
 # TEST CURVE brainpoolP512t1
 
 PrivateKey=ALICE_brainpoolP512t1
------BEGIN EC PRIVATE KEY-----
-MIHaAgEBBECbwO3WdaC7ErmKqF/qaKD9jty2YyBtEJZIkwx3eXDn+Izia0/1pyGF
-oRYYiYhZXoVuvKLom/eeK0IFTGmpESlyoAsGCSskAwMCCAEBDqGBhQOBggAEH/z+
-dOHhLfxI0GLpmUjYaSlC2H380nBhe6P4GSrnpya/Yew0IRyDfo0p99vwgOaLh8wJ
-IH3Joy4NMtHthg8IAFmoctAoWkQ21E0HjPjwqZbxmvBD0S9opVycFR8XUSaK0EHy
-HO7hfuVsdyYzIIjpKViP7uOOtrggsTepWzBQt9I=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIHsAgEAMBQGByqGSM49AgEGCSskAwMCCAEBDgSB0DCBzQIBAQRAm8Dt1nWguxK5
+iqhf6mig/Y7ctmMgbRCWSJMMd3lw5/iM4mtP9achhaEWGImIWV6Fbryi6Jv3nitC
+BUxpqREpcqGBhQOBggAEH/z+dOHhLfxI0GLpmUjYaSlC2H380nBhe6P4GSrnpya/
+Yew0IRyDfo0p99vwgOaLh8wJIH3Joy4NMtHthg8IAFmoctAoWkQ21E0HjPjwqZbx
+mvBD0S9opVycFR8XUSaK0EHyHO7hfuVsdyYzIIjpKViP7uOOtrggsTepWzBQt9I=
+-----END PRIVATE KEY-----
 
 PublicKey=ALICE_brainpoolP512t1_PUB
 -----BEGIN PUBLIC KEY-----
@@ -8259,13 +8301,13 @@ ctAoWkQ21E0HjPjwqZbxmvBD0S9opVycFR8XUSaK0EHyHO7hfuVsdyYzIIjpKViP
 -----END PUBLIC KEY-----
 
 PrivateKey=BOB_brainpoolP512t1
------BEGIN EC PRIVATE KEY-----
-MIHaAgEBBEAVK2tYHA61OVj+kF5PadyNMdw3Mqb6hxOIi+vRFQS5fwhN34vnH0f5
-kuTjhPzn/zKpM+WTpxlIdvJMblSQ8ZW9oAsGCSskAwMCCAEBDqGBhQOBggAEE6EY
-YwpBA3NBflj/HYwxzbaxuALefTsTr5O0bLqh4J6SxkAwsQnlkU8PCnzEuvdBNxSw
-W7276VGfwDO7kFKEdZq3cnT+P41yi/XBVK7xgaL1R2U+vCxWsje6JLixWEdJkJ+6
-TqPKICdriNge1zbjvfhb01zP58E/Xsgh5/deJco=
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIHsAgEAMBQGByqGSM49AgEGCSskAwMCCAEBDgSB0DCBzQIBAQRAFStrWBwOtTlY
+/pBeT2ncjTHcNzKm+ocTiIvr0RUEuX8ITd+L5x9H+ZLk44T85/8yqTPlk6cZSHby
+TG5UkPGVvaGBhQOBggAEE6EYYwpBA3NBflj/HYwxzbaxuALefTsTr5O0bLqh4J6S
+xkAwsQnlkU8PCnzEuvdBNxSwW7276VGfwDO7kFKEdZq3cnT+P41yi/XBVK7xgaL1
+R2U+vCxWsje6JLixWEdJkJ+6TqPKICdriNge1zbjvfhb01zP58E/Xsgh5/deJco=
+-----END PRIVATE KEY-----
 
 PublicKey=BOB_brainpoolP512t1_PUB
 -----BEGIN PUBLIC KEY-----