Add 'fips-securitychecks' option and plumb this into the actual fips checks
[openssl.git] / test / recipes / 30-test_evp_data / evppkey_ecc.txt
index f0ae108..33bab64 100644 (file)
@@ -40,22 +40,26 @@ KuBh8tP8VSTHPCHF
 PrivPubKeyPair=BOB_cf_c2pnb163v1:BOB_cf_c2pnb163v1_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2pnb163v1
 PeerKey=BOB_cf_c2pnb163v1_PUB
 SharedSecret=065dd38fb6de7f394778e1bf65d840a2c0e7219acd
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2pnb163v1
 PeerKey=ALICE_cf_c2pnb163v1_PUB
 SharedSecret=065dd38fb6de7f394778e1bf65d840a2c0e7219acd
 
 # ECC CDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2pnb163v1
 PeerKey=BOB_cf_c2pnb163v1_PUB
 Ctrl=ecdh_cofactor_mode:1
 SharedSecret=066fc46e8cc4327634dd127748020f2de6aab67585
 
 # ECC CDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2pnb163v1
 PeerKey=ALICE_cf_c2pnb163v1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -68,6 +72,7 @@ MEMwEwYHKoZIzj0CAQYIKoZIzj0DAAEDLAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC8JxepS05nN
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
+Availablein = default
 Derive=BOB_cf_c2pnb163v1
 PeerKey=MALICE_cf_c2pnb163v1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -75,6 +80,7 @@ Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
+Availablein = default
 Derive=ALICE_cf_c2pnb163v1
 PeerKey=MALICE_cf_c2pnb163v1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -110,22 +116,26 @@ kBF3juAQuARgxuT6
 PrivPubKeyPair=BOB_cf_c2pnb163v2:BOB_cf_c2pnb163v2_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2pnb163v2
 PeerKey=BOB_cf_c2pnb163v2_PUB
 SharedSecret=0078ebb986d4f9b0aa0bc4af99e82c2bd24130f3f4
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2pnb163v2
 PeerKey=ALICE_cf_c2pnb163v2_PUB
 SharedSecret=0078ebb986d4f9b0aa0bc4af99e82c2bd24130f3f4
 
 # ECC CDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2pnb163v2
 PeerKey=BOB_cf_c2pnb163v2_PUB
 Ctrl=ecdh_cofactor_mode:1
 SharedSecret=069a80bcd45987fd1c874cd9dc5453207a09b61d41
 
 # ECC CDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2pnb163v2
 PeerKey=ALICE_cf_c2pnb163v2_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -138,6 +148,7 @@ n6HANPEoMoK+7Sv0
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
+Availablein = default
 Derive=BOB_cf_c2pnb163v2
 PeerKey=MALICE_cf_c2pnb163v2_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -145,6 +156,7 @@ Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
+Availablein = default
 Derive=ALICE_cf_c2pnb163v2
 PeerKey=MALICE_cf_c2pnb163v2_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -180,22 +192,26 @@ DZnBLhxBwtqnfUpA
 PrivPubKeyPair=BOB_cf_c2pnb163v3:BOB_cf_c2pnb163v3_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2pnb163v3
 PeerKey=BOB_cf_c2pnb163v3_PUB
 SharedSecret=07fd2ffe9b18973c51caeadbc2154b97a9a0390be9
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2pnb163v3
 PeerKey=ALICE_cf_c2pnb163v3_PUB
 SharedSecret=07fd2ffe9b18973c51caeadbc2154b97a9a0390be9
 
 # ECC CDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2pnb163v3
 PeerKey=BOB_cf_c2pnb163v3_PUB
 Ctrl=ecdh_cofactor_mode:1
 SharedSecret=06f7daf1c963594e1a13f9f17b62aaab2934872c16
 
 # ECC CDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2pnb163v3
 PeerKey=ALICE_cf_c2pnb163v3_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -208,6 +224,7 @@ LwAuHF8g5Y0JjJnI
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
+Availablein = default
 Derive=BOB_cf_c2pnb163v3
 PeerKey=MALICE_cf_c2pnb163v3_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -215,6 +232,7 @@ Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
+Availablein = default
 Derive=ALICE_cf_c2pnb163v3
 PeerKey=MALICE_cf_c2pnb163v3_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -250,22 +268,26 @@ uMtp6pzy63rCEK53bgs=
 PrivPubKeyPair=BOB_cf_c2pnb176v1:BOB_cf_c2pnb176v1_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2pnb176v1
 PeerKey=BOB_cf_c2pnb176v1_PUB
 SharedSecret=3a8021848ee0b2c1c377404267a515225781c181e6ab
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2pnb176v1
 PeerKey=ALICE_cf_c2pnb176v1_PUB
 SharedSecret=3a8021848ee0b2c1c377404267a515225781c181e6ab
 
 # ECC CDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2pnb176v1
 PeerKey=BOB_cf_c2pnb176v1_PUB
 Ctrl=ecdh_cofactor_mode:1
 SharedSecret=b06cdc633b56e813d63326c69d2cfa335352279540ac
 
 # ECC CDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2pnb176v1
 PeerKey=ALICE_cf_c2pnb176v1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -278,6 +300,7 @@ zXV3l5j8K3pow+GJBE4=
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
+Availablein = default
 Derive=BOB_cf_c2pnb176v1
 PeerKey=MALICE_cf_c2pnb176v1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -285,6 +308,7 @@ Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
+Availablein = default
 Derive=ALICE_cf_c2pnb176v1
 PeerKey=MALICE_cf_c2pnb176v1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -322,22 +346,26 @@ cl9FTi/JJznwC+RNgwVfJ1WKJun1YA==
 PrivPubKeyPair=BOB_cf_c2pnb208w1:BOB_cf_c2pnb208w1_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2pnb208w1
 PeerKey=BOB_cf_c2pnb208w1_PUB
 SharedSecret=ba32bf80c0f7ab53cb083f267a902a1ad6396eb283237fad91cd
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2pnb208w1
 PeerKey=ALICE_cf_c2pnb208w1_PUB
 SharedSecret=ba32bf80c0f7ab53cb083f267a902a1ad6396eb283237fad91cd
 
 # ECC CDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2pnb208w1
 PeerKey=BOB_cf_c2pnb208w1_PUB
 Ctrl=ecdh_cofactor_mode:1
 SharedSecret=f09f5fc8bf20677558bc65939bf1b7fbbbe2579702729304258b
 
 # ECC CDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2pnb208w1
 PeerKey=ALICE_cf_c2pnb208w1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -350,6 +378,7 @@ oPkHxRWnu5e7qI2idMcqaKDeeniUaA==
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
+Availablein = default
 Derive=BOB_cf_c2pnb208w1
 PeerKey=MALICE_cf_c2pnb208w1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -357,6 +386,7 @@ Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
+Availablein = default
 Derive=ALICE_cf_c2pnb208w1
 PeerKey=MALICE_cf_c2pnb208w1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -394,22 +424,26 @@ cUlDmcxL7vIXdx9hB4OmQBYbm+YLDNfTFGAIlDfr2tELpVVPWPo=
 PrivPubKeyPair=BOB_cf_c2pnb272w1:BOB_cf_c2pnb272w1_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2pnb272w1
 PeerKey=BOB_cf_c2pnb272w1_PUB
 SharedSecret=cfebd65006520a40f081d8940edf0ebb8e54491ba1499d9f3c63deecee84ddc07142
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2pnb272w1
 PeerKey=ALICE_cf_c2pnb272w1_PUB
 SharedSecret=cfebd65006520a40f081d8940edf0ebb8e54491ba1499d9f3c63deecee84ddc07142
 
 # ECC CDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2pnb272w1
 PeerKey=BOB_cf_c2pnb272w1_PUB
 Ctrl=ecdh_cofactor_mode:1
 SharedSecret=756fc20b27352ac74e5135359c63d375d2732c6d02f25cd526155bac0882a9211dd4
 
 # ECC CDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2pnb272w1
 PeerKey=ALICE_cf_c2pnb272w1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -422,6 +456,7 @@ oJF8ElXFXv59s/SykQBCTHPqzmUbVmrXmtD44Kt1wUBRJfuwxy4=
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
+Availablein = default
 Derive=BOB_cf_c2pnb272w1
 PeerKey=MALICE_cf_c2pnb272w1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -429,6 +464,7 @@ Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
+Availablein = default
 Derive=ALICE_cf_c2pnb272w1
 PeerKey=MALICE_cf_c2pnb272w1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -466,22 +502,26 @@ kAOUO2P/Q/H+uelM3VVwxeu6A1kaX7K0UZpNa96NRBwI4aevc+vOxCgYkGt9BA==
 PrivPubKeyPair=BOB_cf_c2pnb304w1:BOB_cf_c2pnb304w1_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2pnb304w1
 PeerKey=BOB_cf_c2pnb304w1_PUB
 SharedSecret=bfddf9f923210e8231a702e3a1c987cf27661de1bc243c1890e437d67d9f49c6ccfadc035d9d
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2pnb304w1
 PeerKey=ALICE_cf_c2pnb304w1_PUB
 SharedSecret=bfddf9f923210e8231a702e3a1c987cf27661de1bc243c1890e437d67d9f49c6ccfadc035d9d
 
 # ECC CDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2pnb304w1
 PeerKey=BOB_cf_c2pnb304w1_PUB
 Ctrl=ecdh_cofactor_mode:1
 SharedSecret=0c7afb3143f93ef2166c05437a1757a62c916ff1751c6d456dd7f2356dcbc75df48015eb5ce8
 
 # ECC CDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2pnb304w1
 PeerKey=ALICE_cf_c2pnb304w1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -494,6 +534,7 @@ fMTr+CSNkf/sfF/13GEdVGnHmBgCH61sPWG69RgzdjRPprZFZxXjubIWYkp0DQ==
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
+Availablein = default
 Derive=BOB_cf_c2pnb304w1
 PeerKey=MALICE_cf_c2pnb304w1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -501,6 +542,7 @@ Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
+Availablein = default
 Derive=ALICE_cf_c2pnb304w1
 PeerKey=MALICE_cf_c2pnb304w1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -540,22 +582,26 @@ gqfRaOs=
 PrivPubKeyPair=BOB_cf_c2pnb368w1:BOB_cf_c2pnb368w1_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2pnb368w1
 PeerKey=BOB_cf_c2pnb368w1_PUB
 SharedSecret=008d20ede3961be3b01051d6fdae63db43865664804d432293a2edb13dcc8be0fe5b0c655297a84b9067a29c2a6f
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2pnb368w1
 PeerKey=ALICE_cf_c2pnb368w1_PUB
 SharedSecret=008d20ede3961be3b01051d6fdae63db43865664804d432293a2edb13dcc8be0fe5b0c655297a84b9067a29c2a6f
 
 # ECC CDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2pnb368w1
 PeerKey=BOB_cf_c2pnb368w1_PUB
 Ctrl=ecdh_cofactor_mode:1
 SharedSecret=df32ddeeffa029aeadabad000a79c3154a0ddd0aeacf4e3de426f5c10096eff8912038c64d4c899131dcd4df2561
 
 # ECC CDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2pnb368w1
 PeerKey=ALICE_cf_c2pnb368w1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -569,6 +615,7 @@ ubcZowJ+rw5LsEZteQyeVrCpKYUiIBmIVuFb2LDjtNLIJD1lr8C+vdco24ciLS9RzF/Dc9X+tcIj
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
+Availablein = default
 Derive=BOB_cf_c2pnb368w1
 PeerKey=MALICE_cf_c2pnb368w1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -576,6 +623,7 @@ Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
+Availablein = default
 Derive=ALICE_cf_c2pnb368w1
 PeerKey=MALICE_cf_c2pnb368w1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -613,22 +661,26 @@ adqalcB6SIWOfoJReDLcpxAD
 PrivPubKeyPair=BOB_cf_c2tnb191v1:BOB_cf_c2tnb191v1_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2tnb191v1
 PeerKey=BOB_cf_c2tnb191v1_PUB
 SharedSecret=2ee8a85151c397600984285307c14f0ea0e4c2071d753a99
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2tnb191v1
 PeerKey=ALICE_cf_c2tnb191v1_PUB
 SharedSecret=2ee8a85151c397600984285307c14f0ea0e4c2071d753a99
 
 # ECC CDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2tnb191v1
 PeerKey=BOB_cf_c2tnb191v1_PUB
 Ctrl=ecdh_cofactor_mode:1
 SharedSecret=334051dfd62237e69e280ce2fab979bd77260f8dfe4df989
 
 # ECC CDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2tnb191v1
 PeerKey=ALICE_cf_c2tnb191v1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -641,6 +693,7 @@ iNoFyzyANZl8IDB0fF1RmZD6
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
+Availablein = default
 Derive=BOB_cf_c2tnb191v1
 PeerKey=MALICE_cf_c2tnb191v1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -648,6 +701,7 @@ Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
+Availablein = default
 Derive=ALICE_cf_c2tnb191v1
 PeerKey=MALICE_cf_c2tnb191v1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -685,22 +739,26 @@ JBIoz1RNNXTcgdpguLcrvcPJ
 PrivPubKeyPair=BOB_cf_c2tnb191v2:BOB_cf_c2tnb191v2_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2tnb191v2
 PeerKey=BOB_cf_c2tnb191v2_PUB
 SharedSecret=711f90cb2aaea65e939065cbd1896affe1d490ba14571400
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2tnb191v2
 PeerKey=ALICE_cf_c2tnb191v2_PUB
 SharedSecret=711f90cb2aaea65e939065cbd1896affe1d490ba14571400
 
 # ECC CDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2tnb191v2
 PeerKey=BOB_cf_c2tnb191v2_PUB
 Ctrl=ecdh_cofactor_mode:1
 SharedSecret=1740db5b771fa2889d3ec7c1ba8eeffa7741f0ee62433dce
 
 # ECC CDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2tnb191v2
 PeerKey=ALICE_cf_c2tnb191v2_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -713,6 +771,7 @@ MEkwEwYHKoZIzj0CAQYIKoZIzj0DAAYDMgAEA3yPV6Ilx7PU7dWIDzgKzFV07LNsn1EhMyLQaa5U
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
+Availablein = default
 Derive=BOB_cf_c2tnb191v2
 PeerKey=MALICE_cf_c2tnb191v2_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -720,6 +779,7 @@ Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
+Availablein = default
 Derive=ALICE_cf_c2tnb191v2
 PeerKey=MALICE_cf_c2tnb191v2_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -757,22 +817,26 @@ QFIb5QwXAdbg2tEOl7yj9qkk
 PrivPubKeyPair=BOB_cf_c2tnb191v3:BOB_cf_c2tnb191v3_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2tnb191v3
 PeerKey=BOB_cf_c2tnb191v3_PUB
 SharedSecret=196200f7ea06c43c35516b995cf4a4dd4151dbd0ed998561
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2tnb191v3
 PeerKey=ALICE_cf_c2tnb191v3_PUB
 SharedSecret=196200f7ea06c43c35516b995cf4a4dd4151dbd0ed998561
 
 # ECC CDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2tnb191v3
 PeerKey=BOB_cf_c2tnb191v3_PUB
 Ctrl=ecdh_cofactor_mode:1
 SharedSecret=311939377670a8a1ed1ee17f9dd182167da00c5a19e2e109
 
 # ECC CDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2tnb191v3
 PeerKey=ALICE_cf_c2tnb191v3_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -785,6 +849,7 @@ n5vQBTxUzkIkMjL33v6Lr3z7
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
+Availablein = default
 Derive=BOB_cf_c2tnb191v3
 PeerKey=MALICE_cf_c2tnb191v3_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -792,6 +857,7 @@ Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
+Availablein = default
 Derive=ALICE_cf_c2tnb191v3
 PeerKey=MALICE_cf_c2tnb191v3_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -829,22 +895,26 @@ G77/MY5z1oQegqImBog645vtPWI8lZd1zcl6QYRS
 PrivPubKeyPair=BOB_cf_c2tnb239v1:BOB_cf_c2tnb239v1_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2tnb239v1
 PeerKey=BOB_cf_c2tnb239v1_PUB
 SharedSecret=413ea943cdf40c45795c77aeea7099b81cc42566067924d1fdbae42ddf99
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2tnb239v1
 PeerKey=ALICE_cf_c2tnb239v1_PUB
 SharedSecret=413ea943cdf40c45795c77aeea7099b81cc42566067924d1fdbae42ddf99
 
 # ECC CDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2tnb239v1
 PeerKey=BOB_cf_c2tnb239v1_PUB
 Ctrl=ecdh_cofactor_mode:1
 SharedSecret=1f1e5a6084492e895c35d76a5d2b4a3fafbd96c4b2230ea71cc1c711fa38
 
 # ECC CDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2tnb239v1
 PeerKey=ALICE_cf_c2tnb239v1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -857,6 +927,7 @@ Itl/OAosALFh8xpt+N5gmKtUdhpjyok2udC4B/mY
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
+Availablein = default
 Derive=BOB_cf_c2tnb239v1
 PeerKey=MALICE_cf_c2tnb239v1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -864,6 +935,7 @@ Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
+Availablein = default
 Derive=ALICE_cf_c2tnb239v1
 PeerKey=MALICE_cf_c2tnb239v1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -901,22 +973,26 @@ N7yBxBmWjeclHhnXIzfc4qM4qf9n3KzMSXejPVYg
 PrivPubKeyPair=BOB_cf_c2tnb239v2:BOB_cf_c2tnb239v2_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2tnb239v2
 PeerKey=BOB_cf_c2tnb239v2_PUB
 SharedSecret=2e738f14795b2e19ee791c1bf30c5e462ca6c6ed0ec5c6c6402d0730cf4c
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2tnb239v2
 PeerKey=ALICE_cf_c2tnb239v2_PUB
 SharedSecret=2e738f14795b2e19ee791c1bf30c5e462ca6c6ed0ec5c6c6402d0730cf4c
 
 # ECC CDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2tnb239v2
 PeerKey=BOB_cf_c2tnb239v2_PUB
 Ctrl=ecdh_cofactor_mode:1
 SharedSecret=7662d8b94d3f0d20eb8e112ca8b7d5699d81f35902df5b77561977df3946
 
 # ECC CDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2tnb239v2
 PeerKey=ALICE_cf_c2tnb239v2_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -929,6 +1005,7 @@ JYUX3Gn3Ai11cHie+nVb3z51jSkpDQENHESTv5K2
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
+Availablein = default
 Derive=BOB_cf_c2tnb239v2
 PeerKey=MALICE_cf_c2tnb239v2_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -936,6 +1013,7 @@ Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
+Availablein = default
 Derive=ALICE_cf_c2tnb239v2
 PeerKey=MALICE_cf_c2tnb239v2_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -973,22 +1051,26 @@ BC10zUyppoSOAr0eX4pHAkDUF1m/KGoJa7QcJJww
 PrivPubKeyPair=BOB_cf_c2tnb239v3:BOB_cf_c2tnb239v3_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2tnb239v3
 PeerKey=BOB_cf_c2tnb239v3_PUB
 SharedSecret=6a756022ec2ea89b0fa757824909707102acf3b7da39dc625c6252eb4c48
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2tnb239v3
 PeerKey=ALICE_cf_c2tnb239v3_PUB
 SharedSecret=6a756022ec2ea89b0fa757824909707102acf3b7da39dc625c6252eb4c48
 
 # ECC CDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2tnb239v3
 PeerKey=BOB_cf_c2tnb239v3_PUB
 Ctrl=ecdh_cofactor_mode:1
 SharedSecret=3240e19dd8c290e5e1749df60ad0166dd9dbfad645e518b4948e14f774ce
 
 # ECC CDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2tnb239v3
 PeerKey=ALICE_cf_c2tnb239v3_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -1001,6 +1083,7 @@ LcXDyB342ZN1nm0NCAmBMcLjohX0Zza0ji3YNjT1
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
+Availablein = default
 Derive=BOB_cf_c2tnb239v3
 PeerKey=MALICE_cf_c2tnb239v3_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -1008,6 +1091,7 @@ Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
+Availablein = default
 Derive=ALICE_cf_c2tnb239v3
 PeerKey=MALICE_cf_c2tnb239v3_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -1047,22 +1131,26 @@ R8fe
 PrivPubKeyPair=BOB_cf_c2tnb359v1:BOB_cf_c2tnb359v1_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2tnb359v1
 PeerKey=BOB_cf_c2tnb359v1_PUB
 SharedSecret=623a71122b5acad467d40d97ef8d8fd46541d8c41d7de6ba181c24e2714c1bc35bcefcf089af69c406eedecc12
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2tnb359v1
 PeerKey=ALICE_cf_c2tnb359v1_PUB
 SharedSecret=623a71122b5acad467d40d97ef8d8fd46541d8c41d7de6ba181c24e2714c1bc35bcefcf089af69c406eedecc12
 
 # ECC CDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2tnb359v1
 PeerKey=BOB_cf_c2tnb359v1_PUB
 Ctrl=ecdh_cofactor_mode:1
 SharedSecret=1c9c4cea3251dace2cb763eabf60f106cc1b03f2491e6f20d7bea78e062f8f14c4e82e4d43786eefa44d33f7e9
 
 # ECC CDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2tnb359v1
 PeerKey=ALICE_cf_c2tnb359v1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -1076,6 +1164,7 @@ OEQw
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
+Availablein = default
 Derive=BOB_cf_c2tnb359v1
 PeerKey=MALICE_cf_c2tnb359v1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -1083,6 +1172,7 @@ Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
+Availablein = default
 Derive=ALICE_cf_c2tnb359v1
 PeerKey=MALICE_cf_c2tnb359v1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -1122,22 +1212,26 @@ fb9kEbBLU+QixSbYZOrqPasesDV9dApDXF+w6EfIeNyJEK5Lk+aXamrn7fRMUAQ2m7+Odp87GgA+
 PrivPubKeyPair=BOB_cf_c2tnb431r1:BOB_cf_c2tnb431r1_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2tnb431r1
 PeerKey=BOB_cf_c2tnb431r1_PUB
 SharedSecret=1c9a64de0b706f0e562d5144ceeb4806ce8782865dc0e3fab694967955bd40afc79bf9241ef4a173fbf9baeac0d416392fb13bdc6978
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2tnb431r1
 PeerKey=ALICE_cf_c2tnb431r1_PUB
 SharedSecret=1c9a64de0b706f0e562d5144ceeb4806ce8782865dc0e3fab694967955bd40afc79bf9241ef4a173fbf9baeac0d416392fb13bdc6978
 
 # ECC CDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_c2tnb431r1
 PeerKey=BOB_cf_c2tnb431r1_PUB
 Ctrl=ecdh_cofactor_mode:1
 SharedSecret=059e2ea2d0d8bad5005a9401196ebb1633377c7ded8ec58a0398cf1d0f42ea82614f68cb836ecfc33612b8a705b4c3b7b4ed12eb6e22
 
 # ECC CDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_c2tnb431r1
 PeerKey=ALICE_cf_c2tnb431r1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -1151,6 +1245,7 @@ F3Cls9x60wuFYNc9d6eIe4B+puz9IQ==
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
+Availablein = default
 Derive=BOB_cf_c2tnb431r1
 PeerKey=MALICE_cf_c2tnb431r1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -1158,52 +1253,13 @@ Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
+Availablein = default
 Derive=ALICE_cf_c2tnb431r1
 PeerKey=MALICE_cf_c2tnb431r1_PUB
 Ctrl=ecdh_cofactor_mode:1
 Result=DERIVE_ERROR
 Reason=point at infinity
 
-Title=prime192v1 curve tests
-
-PrivateKey=ALICE_cf_prime192v1
------BEGIN PRIVATE KEY-----
-MDkCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQEEHzAdAgEBBBhQFYLaobJ47BVWWZv/ByY8Ti69m/U9
-TeI=
------END PRIVATE KEY-----
-
-PublicKey=ALICE_cf_prime192v1_PUB
------BEGIN PUBLIC KEY-----
-MEkwEwYHKoZIzj0CAQYIKoZIzj0DAQEDMgAEHYbt14KzucSpmKMrlDx1IGz/a28nDs21OjKgx3BK
-PZ78UrllIr69kgrYUKsRg4sd
------END PUBLIC KEY-----
-
-PrivPubKeyPair=ALICE_cf_prime192v1:ALICE_cf_prime192v1_PUB
-
-PrivateKey=BOB_cf_prime192v1
------BEGIN PRIVATE KEY-----
-MDkCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQEEHzAdAgEBBBhsbmKHAtygIqirkmUXSbniDJOx0/fI
-CWM=
------END PRIVATE KEY-----
-
-PublicKey=BOB_cf_prime192v1_PUB
------BEGIN PUBLIC KEY-----
-MEkwEwYHKoZIzj0CAQYIKoZIzj0DAQEDMgAEJA+FQcXq5Axzv8pLDslxq1QVt1hjN2i0TgoO6Yxp
-bAekMot69VorE8ibSzgJixXJ
------END PUBLIC KEY-----
-
-PrivPubKeyPair=BOB_cf_prime192v1:BOB_cf_prime192v1_PUB
-
-# ECDH Alice with Bob peer
-Derive=ALICE_cf_prime192v1
-PeerKey=BOB_cf_prime192v1_PUB
-SharedSecret=e36cad3b0f8d00f60f090440a76df47896713ae61421c354
-
-# ECDH Bob with Alice peer
-Derive=BOB_cf_prime192v1
-PeerKey=ALICE_cf_prime192v1_PUB
-SharedSecret=e36cad3b0f8d00f60f090440a76df47896713ae61421c354
-
 Title=prime192v2 curve tests
 
 PrivateKey=ALICE_cf_prime192v2
@@ -1235,11 +1291,13 @@ Y6OU1aHkkspZTC1uUVWjchy5
 PrivPubKeyPair=BOB_cf_prime192v2:BOB_cf_prime192v2_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_prime192v2
 PeerKey=BOB_cf_prime192v2_PUB
 SharedSecret=ae2ff9f1f9f24e6d281dc78993d9f71913e1e105965000a1
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_prime192v2
 PeerKey=ALICE_cf_prime192v2_PUB
 SharedSecret=ae2ff9f1f9f24e6d281dc78993d9f71913e1e105965000a1
@@ -1275,11 +1333,13 @@ vMWAgEeLhzar86BUlS7dZwS7
 PrivPubKeyPair=BOB_cf_prime192v3:BOB_cf_prime192v3_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_prime192v3
 PeerKey=BOB_cf_prime192v3_PUB
 SharedSecret=9e562ecbe29c510a13b0daea822ec864c2a9684d2a382812
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_prime192v3
 PeerKey=ALICE_cf_prime192v3_PUB
 SharedSecret=9e562ecbe29c510a13b0daea822ec864c2a9684d2a382812
@@ -1315,11 +1375,13 @@ L2U4hkT6xUeRu9QC4KOz7KUVH+nBbQASL4XQg/3C
 PrivPubKeyPair=BOB_cf_prime239v1:BOB_cf_prime239v1_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_prime239v1
 PeerKey=BOB_cf_prime239v1_PUB
 SharedSecret=196b1d0206d4f87c313c266bfb12c90dd1f1f64b89bfc16518086b9801b8
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_prime239v1
 PeerKey=ALICE_cf_prime239v1_PUB
 SharedSecret=196b1d0206d4f87c313c266bfb12c90dd1f1f64b89bfc16518086b9801b8
@@ -1355,11 +1417,13 @@ dcJ8a9a+mAQKhb1OZVEq1n4nQsgRiI1rPxugVERM
 PrivPubKeyPair=BOB_cf_prime239v2:BOB_cf_prime239v2_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_prime239v2
 PeerKey=BOB_cf_prime239v2_PUB
 SharedSecret=1d18ca6366bceba3c1477daa0e08202088abcf14fc2b8fbf98ba95858fcf
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_prime239v2
 PeerKey=ALICE_cf_prime239v2_PUB
 SharedSecret=1d18ca6366bceba3c1477daa0e08202088abcf14fc2b8fbf98ba95858fcf
@@ -1395,55 +1459,17 @@ LaIWdsNM7GJVP9xpdSwm/L+Dip/oH4E59f3SiOAd
 PrivPubKeyPair=BOB_cf_prime239v3:BOB_cf_prime239v3_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_prime239v3
 PeerKey=BOB_cf_prime239v3_PUB
 SharedSecret=4dcc2c67c5993162ed71ebb33077bbb85395b0d3eec2311aa404e45901a0
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_prime239v3
 PeerKey=ALICE_cf_prime239v3_PUB
 SharedSecret=4dcc2c67c5993162ed71ebb33077bbb85395b0d3eec2311aa404e45901a0
 
-Title=prime256v1 curve tests
-
-PrivateKey=ALICE_cf_prime256v1
------BEGIN PRIVATE KEY-----
-MEECAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQcEJzAlAgEBBCDZE0NZiGAFJX6JQxumKTFRT+XFCQqJ
-gHCUxmU2fRcn9Q==
------END PRIVATE KEY-----
-
-PublicKey=ALICE_cf_prime256v1_PUB
------BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE5kDOrX6kmk1/jHfEdMBluFos6dyCbzKVOX3v2aa2
-y5IhlhTKtCJdydX+XWLDXWW9sbtIRNP94R3iOOpRPBqpGg==
------END PUBLIC KEY-----
-
-PrivPubKeyPair=ALICE_cf_prime256v1:ALICE_cf_prime256v1_PUB
-
-PrivateKey=BOB_cf_prime256v1
------BEGIN PRIVATE KEY-----
-MEECAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQcEJzAlAgEBBCAxJgV1dLJw/o2Dmh1fIY1KpBd88WCP
-23wZzR8DzhyCrA==
------END PRIVATE KEY-----
-
-PublicKey=BOB_cf_prime256v1_PUB
------BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE5J6yA+j0zrGi6RilUhjrcL7OUMzYTwpnw5DdRXr0
-creHgE03EFV//7xqadB4BDwFIGM9MV2sE6qREEomWhZFeg==
------END PUBLIC KEY-----
-
-PrivPubKeyPair=BOB_cf_prime256v1:BOB_cf_prime256v1_PUB
-
-# ECDH Alice with Bob peer
-Derive=ALICE_cf_prime256v1
-PeerKey=BOB_cf_prime256v1_PUB
-SharedSecret=ee63690b553dcd9bccb066137725f0489395a83f4d280f309339d606c969734a
-
-# ECDH Bob with Alice peer
-Derive=BOB_cf_prime256v1
-PeerKey=ALICE_cf_prime256v1_PUB
-SharedSecret=ee63690b553dcd9bccb066137725f0489395a83f4d280f309339d606c969734a
-
 Title=secp112r1 curve tests
 
 PrivateKey=ALICE_cf_secp112r1
@@ -1471,11 +1497,13 @@ MDIwEAYHKoZIzj0CAQYFK4EEAAYDHgAEchh3iQdPN1rrzrpdZRQ95G6tvdwEBQ+gfu1tvA==
 PrivPubKeyPair=BOB_cf_secp112r1:BOB_cf_secp112r1_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_secp112r1
 PeerKey=BOB_cf_secp112r1_PUB
 SharedSecret=4ddd1d504b444d4be67ba2e4610a
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_secp112r1
 PeerKey=ALICE_cf_secp112r1_PUB
 SharedSecret=4ddd1d504b444d4be67ba2e4610a
@@ -1507,22 +1535,26 @@ MDIwEAYHKoZIzj0CAQYFK4EEAAcDHgAEUzBLNQupqUpGgmZl9JVjKBpwusl52rFg5OVFJA==
 PrivPubKeyPair=BOB_cf_secp112r2:BOB_cf_secp112r2_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_secp112r2
 PeerKey=BOB_cf_secp112r2_PUB
 SharedSecret=a6d05c7ba5128a9685c705b5030b
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_secp112r2
 PeerKey=ALICE_cf_secp112r2_PUB
 SharedSecret=a6d05c7ba5128a9685c705b5030b
 
 # ECC CDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_secp112r2
 PeerKey=BOB_cf_secp112r2_PUB
 Ctrl=ecdh_cofactor_mode:1
 SharedSecret=04f3280e92c269d794aa779efcef
 
 # ECC CDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_secp112r2
 PeerKey=ALICE_cf_secp112r2_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -1534,6 +1566,7 @@ MDIwEAYHKoZIzj0CAQYFK4EEAAcDHgAEsf2N4SfUZWtXPrUTmEyr71I/JSn8VtzQsFHuqQ==
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
+Availablein = default
 Derive=BOB_cf_secp112r2
 PeerKey=MALICE_cf_secp112r2_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -1541,6 +1574,7 @@ Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
+Availablein = default
 Derive=ALICE_cf_secp112r2
 PeerKey=MALICE_cf_secp112r2_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -1574,11 +1608,13 @@ MDYwEAYHKoZIzj0CAQYFK4EEABwDIgAE82nknsOS+u8mybP0KJqQhvm83gbPNTZOcvm0ZDVR5sU=
 PrivPubKeyPair=BOB_cf_secp128r1:BOB_cf_secp128r1_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_secp128r1
 PeerKey=BOB_cf_secp128r1_PUB
 SharedSecret=5020f1b759da1f737a61a29a268d7669
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_secp128r1
 PeerKey=ALICE_cf_secp128r1_PUB
 SharedSecret=5020f1b759da1f737a61a29a268d7669
@@ -1610,22 +1646,26 @@ MDYwEAYHKoZIzj0CAQYFK4EEAB0DIgAELph7h27BYjIINC2EddcpIOxKbdz8Xe7h3Az1ZuR9bAI=
 PrivPubKeyPair=BOB_cf_secp128r2:BOB_cf_secp128r2_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_secp128r2
 PeerKey=BOB_cf_secp128r2_PUB
 SharedSecret=8f4d8c75141e9b084328222440eb5dfa
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_secp128r2
 PeerKey=ALICE_cf_secp128r2_PUB
 SharedSecret=8f4d8c75141e9b084328222440eb5dfa
 
 # ECC CDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_secp128r2
 PeerKey=BOB_cf_secp128r2_PUB
 Ctrl=ecdh_cofactor_mode:1
 SharedSecret=baaa0c16e16eef291001475d638e4830
 
 # ECC CDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_secp128r2
 PeerKey=ALICE_cf_secp128r2_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -1637,6 +1677,7 @@ MDYwEAYHKoZIzj0CAQYFK4EEAB0DIgAE6h6RzJIp6HLR6RDOPtyzGDurkuE9aAaZqHosPTnkLxQ=
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
+Availablein = default
 Derive=BOB_cf_secp128r2
 PeerKey=MALICE_cf_secp128r2_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -1644,6 +1685,7 @@ Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
+Availablein = default
 Derive=ALICE_cf_secp128r2
 PeerKey=MALICE_cf_secp128r2_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -1679,11 +1721,13 @@ bxT/CqEkyw==
 PrivPubKeyPair=BOB_cf_secp160k1:BOB_cf_secp160k1_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_secp160k1
 PeerKey=BOB_cf_secp160k1_PUB
 SharedSecret=b738a0bf17f3271a9a155bfdfe2f0f1d51494d42
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_secp160k1
 PeerKey=ALICE_cf_secp160k1_PUB
 SharedSecret=b738a0bf17f3271a9a155bfdfe2f0f1d51494d42
@@ -1717,11 +1761,13 @@ Jwy17FaNNg==
 PrivPubKeyPair=BOB_cf_secp160r1:BOB_cf_secp160r1_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_secp160r1
 PeerKey=BOB_cf_secp160r1_PUB
 SharedSecret=1912ea7b9bb1de5b8d3cef83e7a6e7a917816541
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_secp160r1
 PeerKey=ALICE_cf_secp160r1_PUB
 SharedSecret=1912ea7b9bb1de5b8d3cef83e7a6e7a917816541
@@ -1755,11 +1801,13 @@ nN+SfWr6aQ==
 PrivPubKeyPair=BOB_cf_secp160r2:BOB_cf_secp160r2_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_secp160r2
 PeerKey=BOB_cf_secp160r2_PUB
 SharedSecret=ccb9cae5c9487ff60c487bd1b39a62eb4680e9b6
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_secp160r2
 PeerKey=ALICE_cf_secp160r2_PUB
 SharedSecret=ccb9cae5c9487ff60c487bd1b39a62eb4680e9b6
@@ -1793,11 +1841,13 @@ OZ2oFMP0Kfcr7HbI7a5j
 PrivPubKeyPair=BOB_cf_secp192k1:BOB_cf_secp192k1_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_secp192k1
 PeerKey=BOB_cf_secp192k1_PUB
 SharedSecret=a46a6bfb279d4dc30cffac585d1fbec905dbe46aca5e3c9d
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_secp192k1
 PeerKey=ALICE_cf_secp192k1_PUB
 SharedSecret=a46a6bfb279d4dc30cffac585d1fbec905dbe46aca5e3c9d
@@ -1833,55 +1883,17 @@ KpJM5sGILrTkkgxqtt5pBeYE1NC1QUQ=
 PrivPubKeyPair=BOB_cf_secp224k1:BOB_cf_secp224k1_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_secp224k1
 PeerKey=BOB_cf_secp224k1_PUB
 SharedSecret=6f7b9d16c9c1d3a5c84b6028f2a4fed9ae8e02455e678a27243bcc48
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_secp224k1
 PeerKey=ALICE_cf_secp224k1_PUB
 SharedSecret=6f7b9d16c9c1d3a5c84b6028f2a4fed9ae8e02455e678a27243bcc48
 
-Title=secp224r1 curve tests
-
-PrivateKey=ALICE_cf_secp224r1
------BEGIN PRIVATE KEY-----
-MDoCAQAwEAYHKoZIzj0CAQYFK4EEACEEIzAhAgEBBBzeo7Y0HMfrIqKNm3r997jcfVAa4osa0AR2
-JA28
------END PRIVATE KEY-----
-
-PublicKey=ALICE_cf_secp224r1_PUB
------BEGIN PUBLIC KEY-----
-ME4wEAYHKoZIzj0CAQYFK4EEACEDOgAExZc6o84XjBGLOosGj2t0QctgiyzF3NcVgy+DeW7stkVs
-yS2tRzMPBpwnApRzoRsdJR99sb3eM2s=
------END PUBLIC KEY-----
-
-PrivPubKeyPair=ALICE_cf_secp224r1:ALICE_cf_secp224r1_PUB
-
-PrivateKey=BOB_cf_secp224r1
------BEGIN PRIVATE KEY-----
-MDoCAQAwEAYHKoZIzj0CAQYFK4EEACEEIzAhAgEBBBy2LsqxHhdlSiAmMYKQAEmjJWT22T42GYKo
-ZvXM
------END PRIVATE KEY-----
-
-PublicKey=BOB_cf_secp224r1_PUB
------BEGIN PUBLIC KEY-----
-ME4wEAYHKoZIzj0CAQYFK4EEACEDOgAE71Eh6hwTKUrmyl2PdkY787GwxiohIcaqB4eK2Mwg6tU4
-LeJHWcgY18CgPKCaeldUgnkMcJzKj20=
------END PUBLIC KEY-----
-
-PrivPubKeyPair=BOB_cf_secp224r1:BOB_cf_secp224r1_PUB
-
-# ECDH Alice with Bob peer
-Derive=ALICE_cf_secp224r1
-PeerKey=BOB_cf_secp224r1_PUB
-SharedSecret=29d8b75934d74d5153bbb94e0370437c63ecc30bf3d2800ed1cb7eb5
-
-# ECDH Bob with Alice peer
-Derive=BOB_cf_secp224r1
-PeerKey=ALICE_cf_secp224r1_PUB
-SharedSecret=29d8b75934d74d5153bbb94e0370437c63ecc30bf3d2800ed1cb7eb5
-
 Title=secp256k1 curve tests
 
 PrivateKey=ALICE_cf_secp256k1
@@ -1913,99 +1925,17 @@ MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAE2BQeSJOa7kJAQsAPUbLseHjHhMe3tUOAl3bqoDqtrfO+
 PrivPubKeyPair=BOB_cf_secp256k1:BOB_cf_secp256k1_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_secp256k1
 PeerKey=BOB_cf_secp256k1_PUB
 SharedSecret=a4745cc4d19cabb9e5cb0abdd5c604cab2846a4638ad844ed9175f3cadda2da1
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_secp256k1
 PeerKey=ALICE_cf_secp256k1_PUB
 SharedSecret=a4745cc4d19cabb9e5cb0abdd5c604cab2846a4638ad844ed9175f3cadda2da1
 
-Title=secp384r1 curve tests
-
-PrivateKey=ALICE_cf_secp384r1
------BEGIN PRIVATE KEY-----
-ME4CAQAwEAYHKoZIzj0CAQYFK4EEACIENzA1AgEBBDAp1ErG6wVjuJs90qVbUBxNpQK1wtV4ieX1
-bIU/4HssZK6WjOOTyYguyEBCOf/rUnw=
------END PRIVATE KEY-----
-
-PublicKey=ALICE_cf_secp384r1_PUB
------BEGIN PUBLIC KEY-----
-MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEx5rt+yujIuPoIXpHGmExKSi/P+58sGYoqgdpdOJUXzn2
-Rc4alCpSxVJeC55xvwaFHc3pzNyRGwnhPmN6oU/KMP6XjBvR4wq35mr/Sym5s0B2blAzkJU37idq
-nTi3xGHx
------END PUBLIC KEY-----
-
-PrivPubKeyPair=ALICE_cf_secp384r1:ALICE_cf_secp384r1_PUB
-
-PrivateKey=BOB_cf_secp384r1
------BEGIN PRIVATE KEY-----
-ME4CAQAwEAYHKoZIzj0CAQYFK4EEACIENzA1AgEBBDAUjVgPpiI+xXye0nfRhc8+12hLdWY4fpsO
-Jq2MCp+W85xJwtXsEPrHj1XFnKVpM4c=
------END PRIVATE KEY-----
-
-PublicKey=BOB_cf_secp384r1_PUB
------BEGIN PUBLIC KEY-----
-MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE+JUBXRSHixH0TrcvYvIzep7+/WNpEhWdCPsLMygigW5j
-pzP30MF41GnQYgfJu5wI/gu1C/jFTv1X6Dgmla3JxBYlPeD+1L0lEMT3evmHKMM/BFe3WKBuXyhP
-ilrNtfee
------END PUBLIC KEY-----
-
-PrivPubKeyPair=BOB_cf_secp384r1:BOB_cf_secp384r1_PUB
-
-# ECDH Alice with Bob peer
-Derive=ALICE_cf_secp384r1
-PeerKey=BOB_cf_secp384r1_PUB
-SharedSecret=b3cfe488126e2731fb7c19f82e94fcc05e1dd303649a9257e858030b795c2d344a054b0c44a24fd7f5821f531a9b8cfb
-
-# ECDH Bob with Alice peer
-Derive=BOB_cf_secp384r1
-PeerKey=ALICE_cf_secp384r1_PUB
-SharedSecret=b3cfe488126e2731fb7c19f82e94fcc05e1dd303649a9257e858030b795c2d344a054b0c44a24fd7f5821f531a9b8cfb
-
-Title=secp521r1 curve tests
-
-PrivateKey=ALICE_cf_secp521r1
------BEGIN PRIVATE KEY-----
-MGACAQAwEAYHKoZIzj0CAQYFK4EEACMESTBHAgEBBEIBsYIcUKeN2evB626LCdYWH/xzUiEDCdRP
-rEENsC8//dowKnOCtlLtawh0DXTIZ/HhpUREuaoffdsmYb6+Oq1TRjc=
------END PRIVATE KEY-----
-
-PublicKey=ALICE_cf_secp521r1_PUB
------BEGIN PUBLIC KEY-----
-MIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQBufYxJf/4Ds6g7LlFRVS62ljm3xApV2T79hfWH8Lv
-iroIaCFjLBIfOVDF8jvj2PO1ar3yCLiSA2RiLZz1Y+tv/tcATHE0nS7l3SfGiGmEnVycEnhgqlKM
-UM3kpdd7eNkQn5/GO8KAPQqA/sOnvTavg5S01t0ub+PY/w0Y6oBgthaUAW0=
------END PUBLIC KEY-----
-
-PrivPubKeyPair=ALICE_cf_secp521r1:ALICE_cf_secp521r1_PUB
-
-PrivateKey=BOB_cf_secp521r1
------BEGIN PRIVATE KEY-----
-MGACAQAwEAYHKoZIzj0CAQYFK4EEACMESTBHAgEBBEIB+3/adZnNwr6GFUzZpi8So7pC/5FYQ0+0
-lMmoUjGvy8DNADcHaPpW68hX/M+z7LrK0Jpnonb9JSEXlgjOPVe4Ea8=
------END PRIVATE KEY-----
-
-PublicKey=BOB_cf_secp521r1_PUB
------BEGIN PUBLIC KEY-----
-MIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQBLq2fjyCalnvr24tjaz87ijIWlLMoCH7Hmyq1t2l8
-PFbyBIZbngDC0gwFM5ZI582QSWlW79G3clJP9VxlJOsms50BYBYgd6o2JF4w8AnShVXxFSJU1py4
-klCDNhTFybRHFXpujfuUeNnFxAGIUb4edJ0fAqqc7kkERhYe8EPEZYMKp3Q=
------END PUBLIC KEY-----
-
-PrivPubKeyPair=BOB_cf_secp521r1:BOB_cf_secp521r1_PUB
-
-# ECDH Alice with Bob peer
-Derive=ALICE_cf_secp521r1
-PeerKey=BOB_cf_secp521r1_PUB
-SharedSecret=01dd4aa9037bb4ad298b420998dcd32b3a9af1cda8b7919e372aeb4e54ccfb4d2409a340ed896bfbc5dd462f8d96b8784bc17b29db3ca04700e6ec752f9bec777695
-
-# ECDH Bob with Alice peer
-Derive=BOB_cf_secp521r1
-PeerKey=ALICE_cf_secp521r1_PUB
-SharedSecret=01dd4aa9037bb4ad298b420998dcd32b3a9af1cda8b7919e372aeb4e54ccfb4d2409a340ed896bfbc5dd462f8d96b8784bc17b29db3ca04700e6ec752f9bec777695
-
 Title=sect113r1 curve tests
 
 PrivateKey=ALICE_cf_sect113r1
@@ -2033,22 +1963,26 @@ MDQwEAYHKoZIzj0CAQYFK4EEAAQDIAAEATykaf/cvJzLOUto1EbbAEz/3++nut6q0dcJOQeV
 PrivPubKeyPair=BOB_cf_sect113r1:BOB_cf_sect113r1_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_sect113r1
 PeerKey=BOB_cf_sect113r1_PUB
 SharedSecret=01ed16f1948dcb368a54004237842d
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_sect113r1
 PeerKey=ALICE_cf_sect113r1_PUB
 SharedSecret=01ed16f1948dcb368a54004237842d
 
 # ECC CDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_sect113r1
 PeerKey=BOB_cf_sect113r1_PUB
 Ctrl=ecdh_cofactor_mode:1
 SharedSecret=012e5f3e348c2a8a88d9590a639219
 
 # ECC CDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_sect113r1
 PeerKey=ALICE_cf_sect113r1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -2060,6 +1994,7 @@ MDQwEAYHKoZIzj0CAQYFK4EEAAQDIAAEAAAAAAAAAAAAAAAAAAAAAd+TqiBXnTd/lyA/OFsR
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
+Availablein = default
 Derive=BOB_cf_sect113r1
 PeerKey=MALICE_cf_sect113r1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -2067,6 +2002,7 @@ Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
+Availablein = default
 Derive=ALICE_cf_sect113r1
 PeerKey=MALICE_cf_sect113r1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -2100,22 +2036,26 @@ MDQwEAYHKoZIzj0CAQYFK4EEAAUDIAAEAUoS3of8y28meYu/NoI5AVdhJZCuDjMqFHTriWY4
 PrivPubKeyPair=BOB_cf_sect113r2:BOB_cf_sect113r2_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_sect113r2
 PeerKey=BOB_cf_sect113r2_PUB
 SharedSecret=0057a287ba1ea05cb4735e673647e1
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_sect113r2
 PeerKey=ALICE_cf_sect113r2_PUB
 SharedSecret=0057a287ba1ea05cb4735e673647e1
 
 # ECC CDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_sect113r2
 PeerKey=BOB_cf_sect113r2_PUB
 Ctrl=ecdh_cofactor_mode:1
 SharedSecret=00fec2454e46732aca42b22b6d4f13
 
 # ECC CDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_sect113r2
 PeerKey=ALICE_cf_sect113r2_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -2127,6 +2067,7 @@ MDQwEAYHKoZIzj0CAQYFK4EEAAUDIAAEAAAAAAAAAAAAAAAAAAAAAR3dbPHrhFekzJ7Azskr
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
+Availablein = default
 Derive=BOB_cf_sect113r2
 PeerKey=MALICE_cf_sect113r2_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -2134,6 +2075,7 @@ Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
+Availablein = default
 Derive=ALICE_cf_sect113r2
 PeerKey=MALICE_cf_sect113r2_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -2169,22 +2111,26 @@ MDgwEAYHKoZIzj0CAQYFK4EEABYDJAAEB8vGy3OQXwWKcJUSSJbCtpMBjFgJeZxzAaI420+B1B+1
 PrivPubKeyPair=BOB_cf_sect131r1:BOB_cf_sect131r1_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_sect131r1
 PeerKey=BOB_cf_sect131r1_PUB
 SharedSecret=05346248f77f81fff50cc656e119976871
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_sect131r1
 PeerKey=ALICE_cf_sect131r1_PUB
 SharedSecret=05346248f77f81fff50cc656e119976871
 
 # ECC CDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_sect131r1
 PeerKey=BOB_cf_sect131r1_PUB
 Ctrl=ecdh_cofactor_mode:1
 SharedSecret=01f151ae26efa507acc2597356baf7e8ab
 
 # ECC CDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_sect131r1
 PeerKey=ALICE_cf_sect131r1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -2197,6 +2143,7 @@ zw==
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
+Availablein = default
 Derive=BOB_cf_sect131r1
 PeerKey=MALICE_cf_sect131r1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -2204,6 +2151,7 @@ Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
+Availablein = default
 Derive=ALICE_cf_sect131r1
 PeerKey=MALICE_cf_sect131r1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -2239,22 +2187,26 @@ pA==
 PrivPubKeyPair=BOB_cf_sect131r2:BOB_cf_sect131r2_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_sect131r2
 PeerKey=BOB_cf_sect131r2_PUB
 SharedSecret=058d8a8be33068ed8c1dc9f551ef2c3f3c
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_sect131r2
 PeerKey=ALICE_cf_sect131r2_PUB
 SharedSecret=058d8a8be33068ed8c1dc9f551ef2c3f3c
 
 # ECC CDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_sect131r2
 PeerKey=BOB_cf_sect131r2_PUB
 Ctrl=ecdh_cofactor_mode:1
 SharedSecret=037b16d85f27c2c878ef96c79a536f89a5
 
 # ECC CDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_sect131r2
 PeerKey=ALICE_cf_sect131r2_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -2267,6 +2219,7 @@ MDgwEAYHKoZIzj0CAQYFK4EEABcDJAAEAAAAAAAAAAAAAAAAAAAAAAAGG5fiIbgziwBZHVzTYqCY
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
+Availablein = default
 Derive=BOB_cf_sect131r2
 PeerKey=MALICE_cf_sect131r2_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -2274,139 +2227,75 @@ Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
+Availablein = default
 Derive=ALICE_cf_sect131r2
 PeerKey=MALICE_cf_sect131r2_PUB
 Ctrl=ecdh_cofactor_mode:1
 Result=DERIVE_ERROR
 Reason=point at infinity
 
-Title=sect163k1 curve tests
+Title=sect163r1 curve tests
 
-PrivateKey=ALICE_cf_sect163k1
+PrivateKey=ALICE_cf_sect163r1
 -----BEGIN PRIVATE KEY-----
-MDMCAQAwEAYHKoZIzj0CAQYFK4EEAAEEHDAaAgEBBBUB905PYfmej8LzbzX6Bg51GJzXQjQ=
+MDMCAQAwEAYHKoZIzj0CAQYFK4EEAAIEHDAaAgEBBBUAlbn4x1UGJnAimsXufB/UvUaxU5U=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_cf_sect163k1_PUB
+PublicKey=ALICE_cf_sect163r1_PUB
 -----BEGIN PUBLIC KEY-----
-MEAwEAYHKoZIzj0CAQYFK4EEAAEDLAAEBfvs5A1hD8YySP9O2ub8GEUfotVuBpfRx4GIHdAfx8wV
-1UVeTRnyAlWU
+MEAwEAYHKoZIzj0CAQYFK4EEAAIDLAAEA0f195HCcD4D+7wWyl3QuPkRovG/ATy5l7fpMl4BNIg/
+sbtEXluCzANF
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=ALICE_cf_sect163k1:ALICE_cf_sect163k1_PUB
+PrivPubKeyPair=ALICE_cf_sect163r1:ALICE_cf_sect163r1_PUB
 
-PrivateKey=BOB_cf_sect163k1
+PrivateKey=BOB_cf_sect163r1
 -----BEGIN PRIVATE KEY-----
-MDMCAQAwEAYHKoZIzj0CAQYFK4EEAAEEHDAaAgEBBBUCHPtCjJ4/K8ylQBcLlb5VE0bkaUE=
+MDMCAQAwEAYHKoZIzj0CAQYFK4EEAAIEHDAaAgEBBBUAoStq6Fjb7nB2PNL6WrzKKqhCGdE=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_cf_sect163k1_PUB
+PublicKey=BOB_cf_sect163r1_PUB
 -----BEGIN PUBLIC KEY-----
-MEAwEAYHKoZIzj0CAQYFK4EEAAEDLAAEBvgfX1mTRlt6Z4TE1D1MNWo4loH4AoeYa6oowK104LKk
-nsdg7isQ8XBD
+MEAwEAYHKoZIzj0CAQYFK4EEAAIDLAAEAul/oBKr9B5MsPHWGF+q07j0JC+WAxj1JzfcIXR98n+r
+9FHWU5LC5pDM
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=BOB_cf_sect163k1:BOB_cf_sect163k1_PUB
+PrivPubKeyPair=BOB_cf_sect163r1:BOB_cf_sect163r1_PUB
 
 # ECDH Alice with Bob peer
-Derive=ALICE_cf_sect163k1
-PeerKey=BOB_cf_sect163k1_PUB
-SharedSecret=04d0e40788c5ce5220818055277cae53eac55c1e6b
+Availablein = default
+Derive=ALICE_cf_sect163r1
+PeerKey=BOB_cf_sect163r1_PUB
+SharedSecret=06135eef489fe613c0d8bd522a2a640ff7ae6fb73d
 
 # ECDH Bob with Alice peer
-Derive=BOB_cf_sect163k1
-PeerKey=ALICE_cf_sect163k1_PUB
-SharedSecret=04d0e40788c5ce5220818055277cae53eac55c1e6b
+Availablein = default
+Derive=BOB_cf_sect163r1
+PeerKey=ALICE_cf_sect163r1_PUB
+SharedSecret=06135eef489fe613c0d8bd522a2a640ff7ae6fb73d
 
 # ECC CDH Alice with Bob peer
-Derive=ALICE_cf_sect163k1
-PeerKey=BOB_cf_sect163k1_PUB
+Availablein = default
+Derive=ALICE_cf_sect163r1
+PeerKey=BOB_cf_sect163r1_PUB
 Ctrl=ecdh_cofactor_mode:1
-SharedSecret=04c902a91110244d89110034dd2b099c49cbab6c77
+SharedSecret=0580f5e8efb242a19ae1023acbcab8702c799751e7
 
 # ECC CDH Bob with Alice peer
-Derive=BOB_cf_sect163k1
-PeerKey=ALICE_cf_sect163k1_PUB
+Availablein = default
+Derive=BOB_cf_sect163r1
+PeerKey=ALICE_cf_sect163r1_PUB
 Ctrl=ecdh_cofactor_mode:1
-SharedSecret=04c902a91110244d89110034dd2b099c49cbab6c77
+SharedSecret=0580f5e8efb242a19ae1023acbcab8702c799751e7
 
-PublicKey=MALICE_cf_sect163k1_PUB
------BEGIN PUBLIC KEY-----
-MEAwEAYHKoZIzj0CAQYFK4EEAAEDLAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAB
------END PUBLIC KEY-----
-
-# ECC CDH Bob with Malice peer
-Derive=BOB_cf_sect163k1
-PeerKey=MALICE_cf_sect163k1_PUB
-Ctrl=ecdh_cofactor_mode:1
-Result=DERIVE_ERROR
-Reason=point at infinity
-
-# ECC CDH Alice with Malice peer
-Derive=ALICE_cf_sect163k1
-PeerKey=MALICE_cf_sect163k1_PUB
-Ctrl=ecdh_cofactor_mode:1
-Result=DERIVE_ERROR
-Reason=point at infinity
-
-Title=sect163r1 curve tests
-
-PrivateKey=ALICE_cf_sect163r1
------BEGIN PRIVATE KEY-----
-MDMCAQAwEAYHKoZIzj0CAQYFK4EEAAIEHDAaAgEBBBUAlbn4x1UGJnAimsXufB/UvUaxU5U=
------END PRIVATE KEY-----
-
-PublicKey=ALICE_cf_sect163r1_PUB
------BEGIN PUBLIC KEY-----
-MEAwEAYHKoZIzj0CAQYFK4EEAAIDLAAEA0f195HCcD4D+7wWyl3QuPkRovG/ATy5l7fpMl4BNIg/
-sbtEXluCzANF
------END PUBLIC KEY-----
-
-PrivPubKeyPair=ALICE_cf_sect163r1:ALICE_cf_sect163r1_PUB
-
-PrivateKey=BOB_cf_sect163r1
------BEGIN PRIVATE KEY-----
-MDMCAQAwEAYHKoZIzj0CAQYFK4EEAAIEHDAaAgEBBBUAoStq6Fjb7nB2PNL6WrzKKqhCGdE=
------END PRIVATE KEY-----
-
-PublicKey=BOB_cf_sect163r1_PUB
------BEGIN PUBLIC KEY-----
-MEAwEAYHKoZIzj0CAQYFK4EEAAIDLAAEAul/oBKr9B5MsPHWGF+q07j0JC+WAxj1JzfcIXR98n+r
-9FHWU5LC5pDM
------END PUBLIC KEY-----
-
-PrivPubKeyPair=BOB_cf_sect163r1:BOB_cf_sect163r1_PUB
-
-# ECDH Alice with Bob peer
-Derive=ALICE_cf_sect163r1
-PeerKey=BOB_cf_sect163r1_PUB
-SharedSecret=06135eef489fe613c0d8bd522a2a640ff7ae6fb73d
-
-# ECDH Bob with Alice peer
-Derive=BOB_cf_sect163r1
-PeerKey=ALICE_cf_sect163r1_PUB
-SharedSecret=06135eef489fe613c0d8bd522a2a640ff7ae6fb73d
-
-# ECC CDH Alice with Bob peer
-Derive=ALICE_cf_sect163r1
-PeerKey=BOB_cf_sect163r1_PUB
-Ctrl=ecdh_cofactor_mode:1
-SharedSecret=0580f5e8efb242a19ae1023acbcab8702c799751e7
-
-# ECC CDH Bob with Alice peer
-Derive=BOB_cf_sect163r1
-PeerKey=ALICE_cf_sect163r1_PUB
-Ctrl=ecdh_cofactor_mode:1
-SharedSecret=0580f5e8efb242a19ae1023acbcab8702c799751e7
-
-PublicKey=MALICE_cf_sect163r1_PUB
+PublicKey=MALICE_cf_sect163r1_PUB
 -----BEGIN PUBLIC KEY-----
 MEAwEAYHKoZIzj0CAQYFK4EEAAIDLAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJkXolVuGFa8fqmk
 cs0Bv7iJuVg1
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
+Availablein = default
 Derive=BOB_cf_sect163r1
 PeerKey=MALICE_cf_sect163r1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -2414,82 +2303,13 @@ Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
+Availablein = default
 Derive=ALICE_cf_sect163r1
 PeerKey=MALICE_cf_sect163r1_PUB
 Ctrl=ecdh_cofactor_mode:1
 Result=DERIVE_ERROR
 Reason=point at infinity
 
-Title=sect163r2 curve tests
-
-PrivateKey=ALICE_cf_sect163r2
------BEGIN PRIVATE KEY-----
-MDMCAQAwEAYHKoZIzj0CAQYFK4EEAA8EHDAaAgEBBBUBjCs/M3N31jsAueYrOq21vdETwAI=
------END PRIVATE KEY-----
-
-PublicKey=ALICE_cf_sect163r2_PUB
------BEGIN PUBLIC KEY-----
-MEAwEAYHKoZIzj0CAQYFK4EEAA8DLAAEBd8Z1/HpA+89hF4I98EST3svWns3BAEbhWmL/fgxk2uu
-YwVrmqhgqH/C
------END PUBLIC KEY-----
-
-PrivPubKeyPair=ALICE_cf_sect163r2:ALICE_cf_sect163r2_PUB
-
-PrivateKey=BOB_cf_sect163r2
------BEGIN PRIVATE KEY-----
-MDMCAQAwEAYHKoZIzj0CAQYFK4EEAA8EHDAaAgEBBBUBsiouT9Df+mwHWrpPg1JSrY9nqlI=
------END PRIVATE KEY-----
-
-PublicKey=BOB_cf_sect163r2_PUB
------BEGIN PUBLIC KEY-----
-MEAwEAYHKoZIzj0CAQYFK4EEAA8DLAAEBULqBZ+nhLhDEMYY8NEEzZ126MdxAcFXWv8zmPEH9505
-8vT5zU3aq6HV
------END PUBLIC KEY-----
-
-PrivPubKeyPair=BOB_cf_sect163r2:BOB_cf_sect163r2_PUB
-
-# ECDH Alice with Bob peer
-Derive=ALICE_cf_sect163r2
-PeerKey=BOB_cf_sect163r2_PUB
-SharedSecret=019f829a53c4e6544bdec1395a23082169efaf369d
-
-# ECDH Bob with Alice peer
-Derive=BOB_cf_sect163r2
-PeerKey=ALICE_cf_sect163r2_PUB
-SharedSecret=019f829a53c4e6544bdec1395a23082169efaf369d
-
-# ECC CDH Alice with Bob peer
-Derive=ALICE_cf_sect163r2
-PeerKey=BOB_cf_sect163r2_PUB
-Ctrl=ecdh_cofactor_mode:1
-SharedSecret=048870d39235ecbc16a000ee478833509b9318a53f
-
-# ECC CDH Bob with Alice peer
-Derive=BOB_cf_sect163r2
-PeerKey=ALICE_cf_sect163r2_PUB
-Ctrl=ecdh_cofactor_mode:1
-SharedSecret=048870d39235ecbc16a000ee478833509b9318a53f
-
-PublicKey=MALICE_cf_sect163r2_PUB
------BEGIN PUBLIC KEY-----
-MEAwEAYHKoZIzj0CAQYFK4EEAA8DLAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsJbhbrfiSdZPSHD
-ZtqJwDlp802l
------END PUBLIC KEY-----
-
-# ECC CDH Bob with Malice peer
-Derive=BOB_cf_sect163r2
-PeerKey=MALICE_cf_sect163r2_PUB
-Ctrl=ecdh_cofactor_mode:1
-Result=DERIVE_ERROR
-Reason=point at infinity
-
-# ECC CDH Alice with Malice peer
-Derive=ALICE_cf_sect163r2
-PeerKey=MALICE_cf_sect163r2_PUB
-Ctrl=ecdh_cofactor_mode:1
-Result=DERIVE_ERROR
-Reason=point at infinity
-
 Title=sect193r1 curve tests
 
 PrivateKey=ALICE_cf_sect193r1
@@ -2519,22 +2339,26 @@ f40zok8PJS6ratIcZwk/n20=
 PrivPubKeyPair=BOB_cf_sect193r1:BOB_cf_sect193r1_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_sect193r1
 PeerKey=BOB_cf_sect193r1_PUB
 SharedSecret=012b8849991814f8c7ed9d40cf9dc204c3a83e0b10675543a5
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_sect193r1
 PeerKey=ALICE_cf_sect193r1_PUB
 SharedSecret=012b8849991814f8c7ed9d40cf9dc204c3a83e0b10675543a5
 
 # ECC CDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_sect193r1
 PeerKey=BOB_cf_sect193r1_PUB
 Ctrl=ecdh_cofactor_mode:1
 SharedSecret=0110180a18844859c52f6f012909522a2d87b5ab143bc80a55
 
 # ECC CDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_sect193r1
 PeerKey=ALICE_cf_sect193r1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -2547,6 +2371,7 @@ zROUg6/STkLp1D+L51L9+wY=
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
+Availablein = default
 Derive=BOB_cf_sect193r1
 PeerKey=MALICE_cf_sect193r1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -2554,6 +2379,7 @@ Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
+Availablein = default
 Derive=ALICE_cf_sect193r1
 PeerKey=MALICE_cf_sect193r1_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -2589,22 +2415,26 @@ xiDevOQ/xE9SpMX25W7YqkU=
 PrivPubKeyPair=BOB_cf_sect193r2:BOB_cf_sect193r2_PUB
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_sect193r2
 PeerKey=BOB_cf_sect193r2_PUB
 SharedSecret=01e2f66a63c24c1de8a399c484228a5ad5b6d911c6e5e83ae3
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_sect193r2
 PeerKey=ALICE_cf_sect193r2_PUB
 SharedSecret=01e2f66a63c24c1de8a399c484228a5ad5b6d911c6e5e83ae3
 
 # ECC CDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_cf_sect193r2
 PeerKey=BOB_cf_sect193r2_PUB
 Ctrl=ecdh_cofactor_mode:1
 SharedSecret=00bc82d393bd74406683aea003977a86a109f444a833652e43
 
 # ECC CDH Bob with Alice peer
+Availablein = default
 Derive=BOB_cf_sect193r2
 PeerKey=ALICE_cf_sect193r2_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -2617,6 +2447,7 @@ Y7+6QpEvOay9A4MJCUZfZmI=
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
+Availablein = default
 Derive=BOB_cf_sect193r2
 PeerKey=MALICE_cf_sect193r2_PUB
 Ctrl=ecdh_cofactor_mode:1
@@ -2624,1513 +2455,1947 @@ Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
+Availablein = default
 Derive=ALICE_cf_sect193r2
 PeerKey=MALICE_cf_sect193r2_PUB
 Ctrl=ecdh_cofactor_mode:1
 Result=DERIVE_ERROR
 Reason=point at infinity
 
-Title=sect233k1 curve tests
+Title=sect239k1 curve tests
 
-PrivateKey=ALICE_cf_sect233k1
+PrivateKey=ALICE_cf_sect239k1
 -----BEGIN PRIVATE KEY-----
-MDsCAQAwEAYHKoZIzj0CAQYFK4EEABoEJDAiAgEBBB0z/3heNFjJL+2sAT/38yRsN3kt2iXz7u+y
-Gua8Kw==
+MDwCAQAwEAYHKoZIzj0CAQYFK4EEAAMEJTAjAgEBBB4G4nbQDUtTnkrPOvDGIlhH9XdjirUSbTI5
+5z6lf7o=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_cf_sect233k1_PUB
+PublicKey=ALICE_cf_sect239k1_PUB
 -----BEGIN PUBLIC KEY-----
-MFIwEAYHKoZIzj0CAQYFK4EEABoDPgAEALQyn0zJmOrHm4S2EIjxRe899PadBnfpYjLKWGvpAIzf
-MEG861Nv1IYJkmkO1xlfNHeeRtqFgsQVFKZh
+MFIwEAYHKoZIzj0CAQYFK4EEAAMDPgAEf5paOMjzcnpVAPMQnIkikE4K2jne3ubX2TD1P3aedknF
+lUr6tOU4BsiUQJACF90rQ9/KdeR5mYvYHzvI
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=ALICE_cf_sect233k1:ALICE_cf_sect233k1_PUB
+PrivPubKeyPair=ALICE_cf_sect239k1:ALICE_cf_sect239k1_PUB
 
-PrivateKey=BOB_cf_sect233k1
+PrivateKey=BOB_cf_sect239k1
 -----BEGIN PRIVATE KEY-----
-MDsCAQAwEAYHKoZIzj0CAQYFK4EEABoEJDAiAgEBBB1I0ucrC4d9i6Z+0cbar5r7uKpF5iiQkSJA
-DFMTUA==
+MDwCAQAwEAYHKoZIzj0CAQYFK4EEAAMEJTAjAgEBBB4e0F0NpepAF+iNrEtoZeo4TrQFspkUNLcx
+Ly4Klfg=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_cf_sect233k1_PUB
+PublicKey=BOB_cf_sect239k1_PUB
 -----BEGIN PUBLIC KEY-----
-MFIwEAYHKoZIzj0CAQYFK4EEABoDPgAEAatdqazxSghJ568CBFyMXhEvVeAiLewOY/jk9H5DAOB4
-ufNGbdd131KLaKPivB38a6n5Y+2BVSJangow
+MFIwEAYHKoZIzj0CAQYFK4EEAAMDPgAEKnjJ4RHe+EiElXMrF4ou7VGy1pn0ZiO17FouF31Zbvjc
+TcbhfE6ziXM8sekQJBwcwRKQ9+G/Qzq/2A9x
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=BOB_cf_sect233k1:BOB_cf_sect233k1_PUB
+PrivPubKeyPair=BOB_cf_sect239k1:BOB_cf_sect239k1_PUB
 
 # ECDH Alice with Bob peer
-Derive=ALICE_cf_sect233k1
-PeerKey=BOB_cf_sect233k1_PUB
-SharedSecret=012145026e8de65973c154e085456fc5539ba9e25663e7f5816abfcab310
+Availablein = default
+Derive=ALICE_cf_sect239k1
+PeerKey=BOB_cf_sect239k1_PUB
+SharedSecret=0ef54c7b7dbf55d4278e7a6924dc4833c63ec708e820d501cacdfb4935d5
 
 # ECDH Bob with Alice peer
-Derive=BOB_cf_sect233k1
-PeerKey=ALICE_cf_sect233k1_PUB
-SharedSecret=012145026e8de65973c154e085456fc5539ba9e25663e7f5816abfcab310
+Availablein = default
+Derive=BOB_cf_sect239k1
+PeerKey=ALICE_cf_sect239k1_PUB
+SharedSecret=0ef54c7b7dbf55d4278e7a6924dc4833c63ec708e820d501cacdfb4935d5
 
 # ECC CDH Alice with Bob peer
-Derive=ALICE_cf_sect233k1
-PeerKey=BOB_cf_sect233k1_PUB
+Availablein = default
+Derive=ALICE_cf_sect239k1
+PeerKey=BOB_cf_sect239k1_PUB
 Ctrl=ecdh_cofactor_mode:1
-SharedSecret=00ff7d6c6b80f39d2ae68fbd00adbcd75fa599ed0bc1aac0e3f49c1c164d
+SharedSecret=592e4b33ac99624fe7f2f879cf52f12a70f189c5d90785db26a12e0a46c0
 
 # ECC CDH Bob with Alice peer
-Derive=BOB_cf_sect233k1
-PeerKey=ALICE_cf_sect233k1_PUB
+Availablein = default
+Derive=BOB_cf_sect239k1
+PeerKey=ALICE_cf_sect239k1_PUB
 Ctrl=ecdh_cofactor_mode:1
-SharedSecret=00ff7d6c6b80f39d2ae68fbd00adbcd75fa599ed0bc1aac0e3f49c1c164d
+SharedSecret=592e4b33ac99624fe7f2f879cf52f12a70f189c5d90785db26a12e0a46c0
 
-PublicKey=MALICE_cf_sect233k1_PUB
+PublicKey=MALICE_cf_sect239k1_PUB
 -----BEGIN PUBLIC KEY-----
-MFIwEAYHKoZIzj0CAQYFK4EEABoDPgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+MFIwEAYHKoZIzj0CAQYFK4EEAAMDPgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
-Derive=BOB_cf_sect233k1
-PeerKey=MALICE_cf_sect233k1_PUB
+Availablein = default
+Derive=BOB_cf_sect239k1
+PeerKey=MALICE_cf_sect239k1_PUB
 Ctrl=ecdh_cofactor_mode:1
 Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
-Derive=ALICE_cf_sect233k1
-PeerKey=MALICE_cf_sect233k1_PUB
+Availablein = default
+Derive=ALICE_cf_sect239k1
+PeerKey=MALICE_cf_sect239k1_PUB
 Ctrl=ecdh_cofactor_mode:1
 Result=DERIVE_ERROR
 Reason=point at infinity
 
-Title=sect233r1 curve tests
+Title=wap-wsg-idm-ecid-wtls10 curve tests
 
-PrivateKey=ALICE_cf_sect233r1
+PrivateKey=ALICE_cf_wap-wsg-idm-ecid-wtls10
 -----BEGIN PRIVATE KEY-----
-MDwCAQAwEAYHKoZIzj0CAQYFK4EEABsEJTAjAgEBBB4ATcy7zVpIsJ9rl5EIDmzRz5wxjrDIQyDm
-HP3Pt8Y=
+MDsCAQAwEAYHKoZIzj0CAQYFZysBBAoEJDAiAgEBBB1zvDMHGgcytka5KvlvQvJzTA4l2ts2NzBp
+SJiGyw==
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_cf_sect233r1_PUB
+PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls10_PUB
 -----BEGIN PUBLIC KEY-----
-MFIwEAYHKoZIzj0CAQYFK4EEABsDPgAEAQMQHiJ44LiCnZkEg1zyww1h+idTbsw8E07P33WUAUfD
-NeQ4hWEhTXPnytIbEhFKpnd3j/FbyZnJqxh8
+MFIwEAYHKoZIzj0CAQYFZysBBAoDPgAEAZkrhWBz/Q4GB8DY4Ia114ew6H7Eg7ri2uxwxd3rAZs5
+/ShvunNyndjCt3Qaq8sulBM0nUyERSDakyD+
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=ALICE_cf_sect233r1:ALICE_cf_sect233r1_PUB
+PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls10:ALICE_cf_wap-wsg-idm-ecid-wtls10_PUB
 
-PrivateKey=BOB_cf_sect233r1
+PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls10
 -----BEGIN PRIVATE KEY-----
-MDwCAQAwEAYHKoZIzj0CAQYFK4EEABsEJTAjAgEBBB4ALpOlFn4OfiIAkRAZGOsn7L6W3XoQBSV8
-mQVC2pw=
+MDsCAQAwEAYHKoZIzj0CAQYFZysBBAoEJDAiAgEBBB1SowkHU79PqokOfgllN53rNS8a3h1wFBY0
+dKPkQg==
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_cf_sect233r1_PUB
+PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls10_PUB
 -----BEGIN PUBLIC KEY-----
-MFIwEAYHKoZIzj0CAQYFK4EEABsDPgAEAJQw+NWqFJXYw4dVMovzvw76OYnYOTaDaEPNW8ECAQbl
-TzzbBSTp5iqM13mP0/Bo4OO66NS3lA9e/GTO
+MFIwEAYHKoZIzj0CAQYFZysBBAoDPgAEAGavw4ChHCoWplAumMEBwJgJ2aYtw+utu4vhWnscAPIT
+IJ4IiIGj18rCFBap1sgVbpXjhEBLYg6Itwv2
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=BOB_cf_sect233r1:BOB_cf_sect233r1_PUB
+PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls10:BOB_cf_wap-wsg-idm-ecid-wtls10_PUB
 
 # ECDH Alice with Bob peer
-Derive=ALICE_cf_sect233r1
-PeerKey=BOB_cf_sect233r1_PUB
-SharedSecret=00209d2995a63f1e8b7a5c33dee5abb602e32e1835ae8bb57eb264d8d795
+Availablein = default
+Derive=ALICE_cf_wap-wsg-idm-ecid-wtls10
+PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls10_PUB
+SharedSecret=0194ef5d80fdfe9df366b2273b983c3dbd440faf76964fcfc06c509f289d
 
 # ECDH Bob with Alice peer
-Derive=BOB_cf_sect233r1
-PeerKey=ALICE_cf_sect233r1_PUB
-SharedSecret=00209d2995a63f1e8b7a5c33dee5abb602e32e1835ae8bb57eb264d8d795
+Availablein = default
+Derive=BOB_cf_wap-wsg-idm-ecid-wtls10
+PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls10_PUB
+SharedSecret=0194ef5d80fdfe9df366b2273b983c3dbd440faf76964fcfc06c509f289d
 
 # ECC CDH Alice with Bob peer
-Derive=ALICE_cf_sect233r1
-PeerKey=BOB_cf_sect233r1_PUB
+Availablein = default
+Derive=ALICE_cf_wap-wsg-idm-ecid-wtls10
+PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls10_PUB
 Ctrl=ecdh_cofactor_mode:1
-SharedSecret=00c3cd1d38a65f5e421399409a76cec1136bc84149f054a7f55e7980c612
+SharedSecret=01bedc5cdf63fbf18c3e2bc9765e12f7990c0c0c64f0267ae7c37b9f49f0
 
 # ECC CDH Bob with Alice peer
-Derive=BOB_cf_sect233r1
-PeerKey=ALICE_cf_sect233r1_PUB
+Availablein = default
+Derive=BOB_cf_wap-wsg-idm-ecid-wtls10
+PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls10_PUB
 Ctrl=ecdh_cofactor_mode:1
-SharedSecret=00c3cd1d38a65f5e421399409a76cec1136bc84149f054a7f55e7980c612
+SharedSecret=01bedc5cdf63fbf18c3e2bc9765e12f7990c0c0c64f0267ae7c37b9f49f0
 
-PublicKey=MALICE_cf_sect233r1_PUB
+PublicKey=MALICE_cf_wap-wsg-idm-ecid-wtls10_PUB
 -----BEGIN PUBLIC KEY-----
-MFIwEAYHKoZIzj0CAQYFK4EEABsDPgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYf4
-Vie5eHTnR+4x4G1xyq7qUvISU+X5RtBh2pE4
+MFIwEAYHKoZIzj0CAQYFZysBBAoDPgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
-Derive=BOB_cf_sect233r1
-PeerKey=MALICE_cf_sect233r1_PUB
+Availablein = default
+Derive=BOB_cf_wap-wsg-idm-ecid-wtls10
+PeerKey=MALICE_cf_wap-wsg-idm-ecid-wtls10_PUB
 Ctrl=ecdh_cofactor_mode:1
 Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
-Derive=ALICE_cf_sect233r1
-PeerKey=MALICE_cf_sect233r1_PUB
+Availablein = default
+Derive=ALICE_cf_wap-wsg-idm-ecid-wtls10
+PeerKey=MALICE_cf_wap-wsg-idm-ecid-wtls10_PUB
 Ctrl=ecdh_cofactor_mode:1
 Result=DERIVE_ERROR
 Reason=point at infinity
 
-Title=sect239k1 curve tests
+Title=wap-wsg-idm-ecid-wtls11 curve tests
 
-PrivateKey=ALICE_cf_sect239k1
+PrivateKey=ALICE_cf_wap-wsg-idm-ecid-wtls11
 -----BEGIN PRIVATE KEY-----
-MDwCAQAwEAYHKoZIzj0CAQYFK4EEAAMEJTAjAgEBBB4G4nbQDUtTnkrPOvDGIlhH9XdjirUSbTI5
-5z6lf7o=
+MDwCAQAwEAYHKoZIzj0CAQYFZysBBAsEJTAjAgEBBB4AkzS3zoqHNCLug/nwoYMQW3UigmZ9t56k
+5jp+FiY=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_cf_sect239k1_PUB
+PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls11_PUB
 -----BEGIN PUBLIC KEY-----
-MFIwEAYHKoZIzj0CAQYFK4EEAAMDPgAEf5paOMjzcnpVAPMQnIkikE4K2jne3ubX2TD1P3aedknF
-lUr6tOU4BsiUQJACF90rQ9/KdeR5mYvYHzvI
+MFIwEAYHKoZIzj0CAQYFZysBBAsDPgAEABttgKKYeGZRmcH/5UZR56lOSgbU4TH2AuIhvj88AL6H
+zTCX9elzXpck+u22bnmkuvL2A8XKB5+fabMR
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=ALICE_cf_sect239k1:ALICE_cf_sect239k1_PUB
+PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls11:ALICE_cf_wap-wsg-idm-ecid-wtls11_PUB
 
-PrivateKey=BOB_cf_sect239k1
+PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls11
 -----BEGIN PRIVATE KEY-----
-MDwCAQAwEAYHKoZIzj0CAQYFK4EEAAMEJTAjAgEBBB4e0F0NpepAF+iNrEtoZeo4TrQFspkUNLcx
-Ly4Klfg=
+MDwCAQAwEAYHKoZIzj0CAQYFZysBBAsEJTAjAgEBBB4AWU05mbqPxsB749llNON1//l0w8RJJ3z5
+h/kzfNM=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_cf_sect239k1_PUB
+PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls11_PUB
 -----BEGIN PUBLIC KEY-----
-MFIwEAYHKoZIzj0CAQYFK4EEAAMDPgAEKnjJ4RHe+EiElXMrF4ou7VGy1pn0ZiO17FouF31Zbvjc
-TcbhfE6ziXM8sekQJBwcwRKQ9+G/Qzq/2A9x
+MFIwEAYHKoZIzj0CAQYFZysBBAsDPgAEAL6Xj/KCmXAQAAo847t0bl0wqBrteWRg93OvIJsPAAOE
+ehdIgJyruc3KsH0RFlipu5QD8pnGSIXvif19
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=BOB_cf_sect239k1:BOB_cf_sect239k1_PUB
+PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls11:BOB_cf_wap-wsg-idm-ecid-wtls11_PUB
 
 # ECDH Alice with Bob peer
-Derive=ALICE_cf_sect239k1
-PeerKey=BOB_cf_sect239k1_PUB
-SharedSecret=0ef54c7b7dbf55d4278e7a6924dc4833c63ec708e820d501cacdfb4935d5
+Availablein = default
+Derive=ALICE_cf_wap-wsg-idm-ecid-wtls11
+PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls11_PUB
+SharedSecret=01ac8a23ddeeafb4d3bb243fe409f2f9c8b1a3fc11d4690da583f2e21637
 
 # ECDH Bob with Alice peer
-Derive=BOB_cf_sect239k1
-PeerKey=ALICE_cf_sect239k1_PUB
-SharedSecret=0ef54c7b7dbf55d4278e7a6924dc4833c63ec708e820d501cacdfb4935d5
+Availablein = default
+Derive=BOB_cf_wap-wsg-idm-ecid-wtls11
+PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls11_PUB
+SharedSecret=01ac8a23ddeeafb4d3bb243fe409f2f9c8b1a3fc11d4690da583f2e21637
 
 # ECC CDH Alice with Bob peer
-Derive=ALICE_cf_sect239k1
-PeerKey=BOB_cf_sect239k1_PUB
+Availablein = default
+Derive=ALICE_cf_wap-wsg-idm-ecid-wtls11
+PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls11_PUB
 Ctrl=ecdh_cofactor_mode:1
-SharedSecret=592e4b33ac99624fe7f2f879cf52f12a70f189c5d90785db26a12e0a46c0
+SharedSecret=01b9992992572d3a59d424f8c9cc195576461ed6c1dadf6fb523717fab19
 
 # ECC CDH Bob with Alice peer
-Derive=BOB_cf_sect239k1
-PeerKey=ALICE_cf_sect239k1_PUB
+Availablein = default
+Derive=BOB_cf_wap-wsg-idm-ecid-wtls11
+PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls11_PUB
 Ctrl=ecdh_cofactor_mode:1
-SharedSecret=592e4b33ac99624fe7f2f879cf52f12a70f189c5d90785db26a12e0a46c0
+SharedSecret=01b9992992572d3a59d424f8c9cc195576461ed6c1dadf6fb523717fab19
 
-PublicKey=MALICE_cf_sect239k1_PUB
+PublicKey=MALICE_cf_wap-wsg-idm-ecid-wtls11_PUB
 -----BEGIN PUBLIC KEY-----
-MFIwEAYHKoZIzj0CAQYFK4EEAAMDPgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB
+MFIwEAYHKoZIzj0CAQYFZysBBAsDPgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYf4
+Vie5eHTnR+4x4G1xyq7qUvISU+X5RtBh2pE4
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
-Derive=BOB_cf_sect239k1
-PeerKey=MALICE_cf_sect239k1_PUB
+Availablein = default
+Derive=BOB_cf_wap-wsg-idm-ecid-wtls11
+PeerKey=MALICE_cf_wap-wsg-idm-ecid-wtls11_PUB
 Ctrl=ecdh_cofactor_mode:1
 Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
-Derive=ALICE_cf_sect239k1
-PeerKey=MALICE_cf_sect239k1_PUB
+Availablein = default
+Derive=ALICE_cf_wap-wsg-idm-ecid-wtls11
+PeerKey=MALICE_cf_wap-wsg-idm-ecid-wtls11_PUB
 Ctrl=ecdh_cofactor_mode:1
 Result=DERIVE_ERROR
 Reason=point at infinity
 
-Title=sect283k1 curve tests
+Title=wap-wsg-idm-ecid-wtls12 curve tests
 
-PrivateKey=ALICE_cf_sect283k1
+PrivateKey=ALICE_cf_wap-wsg-idm-ecid-wtls12
 -----BEGIN PRIVATE KEY-----
-MEICAQAwEAYHKoZIzj0CAQYFK4EEABAEKzApAgEBBCQAY1Mi9rST7PiP1t03qYRczV/kSZ+VjQu8
-5EFCgxyvkaLManw=
+MDoCAQAwEAYHKoZIzj0CAQYFZysBBAwEIzAhAgEBBBxwvll9Eb9mm2Xadq1evIi1zIK+6u0Nv8bP
+LI9a
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_cf_sect283k1_PUB
+PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls12_PUB
 -----BEGIN PUBLIC KEY-----
-MF4wEAYHKoZIzj0CAQYFK4EEABADSgAEBMjBO8WoxHS/vz8po52WZGxS+RK5yolrUe6tfbAMA3Sd
-5/JjBDVjOz95vM4gUnqzUWHN5nKBQtj6HiU9Q/R+zqg98OiQKTyA
+ME4wEAYHKoZIzj0CAQYFZysBBAwDOgAE0t0WqG/pFsiCt6agmebw3FCEWAzf9BpNLuzoCkPEe0Li
+bqn5udrckL6s3stwCTVFaZUfY2qS9QE=
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=ALICE_cf_sect283k1:ALICE_cf_sect283k1_PUB
+PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls12:ALICE_cf_wap-wsg-idm-ecid-wtls12_PUB
 
-PrivateKey=BOB_cf_sect283k1
+PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls12
 -----BEGIN PRIVATE KEY-----
-MEICAQAwEAYHKoZIzj0CAQYFK4EEABAEKzApAgEBBCQBCZC8Is+YSjgXJBBDioEl6gu14QpGHllD
-1J6957vBTPSQdH0=
+MDoCAQAwEAYHKoZIzj0CAQYFZysBBAwEIzAhAgEBBBz+5P6gpqXxbeXvvaD5W9Ft69BTxcn7zc6q
+K3Ax
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_cf_sect283k1_PUB
+PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls12_PUB
 -----BEGIN PUBLIC KEY-----
-MF4wEAYHKoZIzj0CAQYFK4EEABADSgAEAGEQKZVHYAlvtjHrFyZVm12qUb5j+T5/WNoC962+kwUM
-QkBYA5BpuG8Knlugq1iB31whPAgRCZfdLKHpHRPJSfXvKyUIdeUm
+ME4wEAYHKoZIzj0CAQYFZysBBAwDOgAEvyxedqaWkoAOMjaV5W3/tJpheiHAR0zV6BlIeUuGP2mx
++xsOK9/QB7hzipq9cXx1K/dXu58EoSY=
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=BOB_cf_sect283k1:BOB_cf_sect283k1_PUB
+PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls12:BOB_cf_wap-wsg-idm-ecid-wtls12_PUB
 
 # ECDH Alice with Bob peer
-Derive=ALICE_cf_sect283k1
-PeerKey=BOB_cf_sect283k1_PUB
-SharedSecret=03f67c88bdc230b43773d17fdb4d0a980556d074ceccee726932160e4ed965e3be72803c
+Availablein = default
+Derive=ALICE_cf_wap-wsg-idm-ecid-wtls12
+PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls12_PUB
+SharedSecret=a3b3f20af8c33a0f5c246b4b9d9dda1cd40c294d1f53365d18a8b54b
 
 # ECDH Bob with Alice peer
-Derive=BOB_cf_sect283k1
-PeerKey=ALICE_cf_sect283k1_PUB
-SharedSecret=03f67c88bdc230b43773d17fdb4d0a980556d074ceccee726932160e4ed965e3be72803c
-
-# ECC CDH Alice with Bob peer
-Derive=ALICE_cf_sect283k1
-PeerKey=BOB_cf_sect283k1_PUB
-Ctrl=ecdh_cofactor_mode:1
-SharedSecret=0677ba01c84d139609ca145cb5b6079fc9ca67f59c9c913e47cad1073f1d1dfaddde0169
-
-# ECC CDH Bob with Alice peer
-Derive=BOB_cf_sect283k1
-PeerKey=ALICE_cf_sect283k1_PUB
-Ctrl=ecdh_cofactor_mode:1
-SharedSecret=0677ba01c84d139609ca145cb5b6079fc9ca67f59c9c913e47cad1073f1d1dfaddde0169
-
-PublicKey=MALICE_cf_sect283k1_PUB
------BEGIN PUBLIC KEY-----
-MF4wEAYHKoZIzj0CAQYFK4EEABADSgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB
------END PUBLIC KEY-----
-
-# ECC CDH Bob with Malice peer
-Derive=BOB_cf_sect283k1
-PeerKey=MALICE_cf_sect283k1_PUB
-Ctrl=ecdh_cofactor_mode:1
-Result=DERIVE_ERROR
-Reason=point at infinity
-
-# ECC CDH Alice with Malice peer
-Derive=ALICE_cf_sect283k1
-PeerKey=MALICE_cf_sect283k1_PUB
-Ctrl=ecdh_cofactor_mode:1
-Result=DERIVE_ERROR
-Reason=point at infinity
+Availablein = default
+Derive=BOB_cf_wap-wsg-idm-ecid-wtls12
+PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls12_PUB
+SharedSecret=a3b3f20af8c33a0f5c246b4b9d9dda1cd40c294d1f53365d18a8b54b
 
-Title=sect283r1 curve tests
+Title=wap-wsg-idm-ecid-wtls1 curve tests
 
-PrivateKey=ALICE_cf_sect283r1
+PrivateKey=ALICE_cf_wap-wsg-idm-ecid-wtls1
 -----BEGIN PRIVATE KEY-----
-MEICAQAwEAYHKoZIzj0CAQYFK4EEABEEKzApAgEBBCQCQ5pqKvPxDysd1pi2Bv8Z11cFhsRZfuaf
-4Pi0hpGr4ubZcHE=
+MCwCAQAwEAYHKoZIzj0CAQYFZysBBAEEFTATAgEBBA5ZNASTt4/g6XPQwRiQ0Q==
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_cf_sect283r1_PUB
+PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls1_PUB
 -----BEGIN PUBLIC KEY-----
-MF4wEAYHKoZIzj0CAQYFK4EEABEDSgAEBcsrGDgO7pbGybQX/00gRHtQq3+X9XrGb7Uzv9Nabwc/
-kntnBMF0I2KU+aaTjQx1GVtmNf7CvFwPLEBnfKjJAjekjsGyIqoq
+MDQwEAYHKoZIzj0CAQYFZysBBAEDIAAEACBNPI48xxsPVQBy07jRAAcWzbIkMo8BQotxpfGJ
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=ALICE_cf_sect283r1:ALICE_cf_sect283r1_PUB
+PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls1:ALICE_cf_wap-wsg-idm-ecid-wtls1_PUB
 
-PrivateKey=BOB_cf_sect283r1
+PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls1
 -----BEGIN PRIVATE KEY-----
-MEICAQAwEAYHKoZIzj0CAQYFK4EEABEEKzApAgEBBCQDxItnY3cDCrX/jGnVuAKDPaySZCr3E83Q
-UdFnP6YIykt7+Pg=
+MCwCAQAwEAYHKoZIzj0CAQYFZysBBAEEFTATAgEBBA6+0x9qk0NIKHSRvlTemQ==
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_cf_sect283r1_PUB
+PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls1_PUB
 -----BEGIN PUBLIC KEY-----
-MF4wEAYHKoZIzj0CAQYFK4EEABEDSgAEBJ2C9BCkX0YRfs2ufgUKvreUXFWp2AGK+iHlZB4N3LqO
-PKpmAkrAeCMty6mw2mEnOR5HA1d4Ee+z7/NJgJJ80Ra9bFnreOW3
+MDQwEAYHKoZIzj0CAQYFZysBBAEDIAAEAEeHMSBTx/EtOu+bjBinALHSkQuJyiP3mg1tu+I2
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=BOB_cf_sect283r1:BOB_cf_sect283r1_PUB
+PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls1:BOB_cf_wap-wsg-idm-ecid-wtls1_PUB
 
 # ECDH Alice with Bob peer
-Derive=ALICE_cf_sect283r1
-PeerKey=BOB_cf_sect283r1_PUB
-SharedSecret=0424259cf09727574fb863cab7c27d8fe3835e96433110a45a951f94347fc81939ec4773
+Availablein = default
+Derive=ALICE_cf_wap-wsg-idm-ecid-wtls1
+PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls1_PUB
+SharedSecret=0040ba2fadc1da97c973e5e59ade31
 
 # ECDH Bob with Alice peer
-Derive=BOB_cf_sect283r1
-PeerKey=ALICE_cf_sect283r1_PUB
-SharedSecret=0424259cf09727574fb863cab7c27d8fe3835e96433110a45a951f94347fc81939ec4773
+Availablein = default
+Derive=BOB_cf_wap-wsg-idm-ecid-wtls1
+PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls1_PUB
+SharedSecret=0040ba2fadc1da97c973e5e59ade31
 
 # ECC CDH Alice with Bob peer
-Derive=ALICE_cf_sect283r1
-PeerKey=BOB_cf_sect283r1_PUB
+Availablein = default
+Derive=ALICE_cf_wap-wsg-idm-ecid-wtls1
+PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls1_PUB
 Ctrl=ecdh_cofactor_mode:1
-SharedSecret=01c2a542654ce85b17456ed75b6bca6b6eb761580913670debc426a3525f236df0e875c8
+SharedSecret=008919696215a89e03d6c4c9265d6b
 
 # ECC CDH Bob with Alice peer
-Derive=BOB_cf_sect283r1
-PeerKey=ALICE_cf_sect283r1_PUB
+Availablein = default
+Derive=BOB_cf_wap-wsg-idm-ecid-wtls1
+PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls1_PUB
 Ctrl=ecdh_cofactor_mode:1
-SharedSecret=01c2a542654ce85b17456ed75b6bca6b6eb761580913670debc426a3525f236df0e875c8
+SharedSecret=008919696215a89e03d6c4c9265d6b
 
-PublicKey=MALICE_cf_sect283r1_PUB
+PublicKey=MALICE_cf_wap-wsg-idm-ecid-wtls1_PUB
 -----BEGIN PUBLIC KEY-----
-MF4wEAYHKoZIzj0CAQYFK4EEABEDSgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAByvMnFeSsevoGYMIn7b4NaL9IgowRCTKF8CCrhdEKu3pubP2
+MDQwEAYHKoZIzj0CAQYFZysBBAEDIAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
-Derive=BOB_cf_sect283r1
-PeerKey=MALICE_cf_sect283r1_PUB
+Availablein = default
+Derive=BOB_cf_wap-wsg-idm-ecid-wtls1
+PeerKey=MALICE_cf_wap-wsg-idm-ecid-wtls1_PUB
 Ctrl=ecdh_cofactor_mode:1
 Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
-Derive=ALICE_cf_sect283r1
-PeerKey=MALICE_cf_sect283r1_PUB
+Availablein = default
+Derive=ALICE_cf_wap-wsg-idm-ecid-wtls1
+PeerKey=MALICE_cf_wap-wsg-idm-ecid-wtls1_PUB
 Ctrl=ecdh_cofactor_mode:1
 Result=DERIVE_ERROR
 Reason=point at infinity
 
-Title=sect409k1 curve tests
+Title=wap-wsg-idm-ecid-wtls3 curve tests
 
-PrivateKey=ALICE_cf_sect409k1
+PrivateKey=ALICE_cf_wap-wsg-idm-ecid-wtls3
 -----BEGIN PRIVATE KEY-----
-MFECAQAwEAYHKoZIzj0CAQYFK4EEACQEOjA4AgEBBDMOthcLahkXFgM0wjOzm767D1A72sFRGlhb
-bVH+EB7z2WpIcPX4OD+M4Y1pf/a7wSaoSAo=
+MDMCAQAwEAYHKoZIzj0CAQYFZysBBAMEHDAaAgEBBBUDO2cHbqQBUxuJBl6UT9UrasuRVrI=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_cf_sect409k1_PUB
+PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls3_PUB
 -----BEGIN PUBLIC KEY-----
-MH4wEAYHKoZIzj0CAQYFK4EEACQDagAEAbiYYpeFgCMsZFMzQaiwMJDrC+mCMT7KmhYtD5EMMgLW
-5OvhaqYdpRf49A8LOtVcRT7J5gGcMrXQgmQeS3FenA5owWnB2NIgrTNf5d8AAEtrOupsJ4c3kL6e
-aAzayZ1+UCEj8skbC9U=
+MEAwEAYHKoZIzj0CAQYFZysBBAMDLAAEBRIzvK9o7eO2NGmtPFV/zo9/1mlvBwjG7+e6hbPG1KdI
+01f8oGBuXMQH
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=ALICE_cf_sect409k1:ALICE_cf_sect409k1_PUB
+PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls3:ALICE_cf_wap-wsg-idm-ecid-wtls3_PUB
 
-PrivateKey=BOB_cf_sect409k1
+PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls3
 -----BEGIN PRIVATE KEY-----
-MFECAQAwEAYHKoZIzj0CAQYFK4EEACQEOjA4AgEBBDMO43ldQllTewdZwffH4OEXdzBrLwabKsn4
-6/hjgIAaYda/pt4yCEQLMp18QgtfMey5ENI=
+MDMCAQAwEAYHKoZIzj0CAQYFZysBBAMEHDAaAgEBBBUAhZv9WZ00bDnU9MOaqEegP771nes=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_cf_sect409k1_PUB
+PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls3_PUB
 -----BEGIN PUBLIC KEY-----
-MH4wEAYHKoZIzj0CAQYFK4EEACQDagAEAVTQj6hRizVmOx4Z6vroN/zMkmAY+QhkQ0CnFeJ0AydY
-Fv+f+/420vMC1Mhqsc9VzPMmIAH6ZrgGKDsd4Ce9JUtYE0rVhGeiG2RaN1U5RlhVK4avkWhFlyQ5
-vuu4aApQiWE3yQd9v/I=
+MEAwEAYHKoZIzj0CAQYFZysBBAMDLAAEAYOspjEbzyZw61jCtUrxARr+w66nBH+73QIvlaRVSG/4
+hlBUf5kmG4Yn
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=BOB_cf_sect409k1:BOB_cf_sect409k1_PUB
+PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls3:BOB_cf_wap-wsg-idm-ecid-wtls3_PUB
 
 # ECDH Alice with Bob peer
-Derive=ALICE_cf_sect409k1
-PeerKey=BOB_cf_sect409k1_PUB
-SharedSecret=01fbe13188588c9d1ac3a8a2680ea9a009b28e4b7d7fa4efcb1a22553876fb7973616819fd87c75e5b8ce6e3628595e4ce12edb0
+Availablein = default
+Derive=ALICE_cf_wap-wsg-idm-ecid-wtls3
+PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls3_PUB
+SharedSecret=0311924428a839b7dcada662722945e62bf1131f4f
 
 # ECDH Bob with Alice peer
-Derive=BOB_cf_sect409k1
-PeerKey=ALICE_cf_sect409k1_PUB
-SharedSecret=01fbe13188588c9d1ac3a8a2680ea9a009b28e4b7d7fa4efcb1a22553876fb7973616819fd87c75e5b8ce6e3628595e4ce12edb0
+Availablein = default
+Derive=BOB_cf_wap-wsg-idm-ecid-wtls3
+PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls3_PUB
+SharedSecret=0311924428a839b7dcada662722945e62bf1131f4f
 
 # ECC CDH Alice with Bob peer
-Derive=ALICE_cf_sect409k1
-PeerKey=BOB_cf_sect409k1_PUB
+Availablein = default
+Derive=ALICE_cf_wap-wsg-idm-ecid-wtls3
+PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls3_PUB
 Ctrl=ecdh_cofactor_mode:1
-SharedSecret=007e9485f7234bb2255bb40e51f4be867cb0ef31f8e489a697b31b51c4d5346daaee51e96ae6f9636e6e3af56095fe28755325ee
+SharedSecret=047f1aee6a1a1d7c9c1f0e8dce4349429f737aa658
 
 # ECC CDH Bob with Alice peer
-Derive=BOB_cf_sect409k1
-PeerKey=ALICE_cf_sect409k1_PUB
+Availablein = default
+Derive=BOB_cf_wap-wsg-idm-ecid-wtls3
+PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls3_PUB
 Ctrl=ecdh_cofactor_mode:1
-SharedSecret=007e9485f7234bb2255bb40e51f4be867cb0ef31f8e489a697b31b51c4d5346daaee51e96ae6f9636e6e3af56095fe28755325ee
+SharedSecret=047f1aee6a1a1d7c9c1f0e8dce4349429f737aa658
 
-PublicKey=MALICE_cf_sect409k1_PUB
+PublicKey=MALICE_cf_wap-wsg-idm-ecid-wtls3_PUB
 -----BEGIN PUBLIC KEY-----
-MH4wEAYHKoZIzj0CAQYFK4EEACQDagAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAA=
+MEAwEAYHKoZIzj0CAQYFZysBBAMDLAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAB
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
-Derive=BOB_cf_sect409k1
-PeerKey=MALICE_cf_sect409k1_PUB
+Availablein = default
+Derive=BOB_cf_wap-wsg-idm-ecid-wtls3
+PeerKey=MALICE_cf_wap-wsg-idm-ecid-wtls3_PUB
 Ctrl=ecdh_cofactor_mode:1
 Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
-Derive=ALICE_cf_sect409k1
-PeerKey=MALICE_cf_sect409k1_PUB
+Availablein = default
+Derive=ALICE_cf_wap-wsg-idm-ecid-wtls3
+PeerKey=MALICE_cf_wap-wsg-idm-ecid-wtls3_PUB
 Ctrl=ecdh_cofactor_mode:1
 Result=DERIVE_ERROR
 Reason=point at infinity
 
-Title=sect409r1 curve tests
+Title=wap-wsg-idm-ecid-wtls4 curve tests
 
-PrivateKey=ALICE_cf_sect409r1
+PrivateKey=ALICE_cf_wap-wsg-idm-ecid-wtls4
 -----BEGIN PRIVATE KEY-----
-MFICAQAwEAYHKoZIzj0CAQYFK4EEACUEOzA5AgEBBDQAxSC9lST5dtfXQI1Ug9VMMoue3GGni5ON
-+gieyXK2KKbd29KAPs4/AOd8kX2wQDsZPO7E
+MC0CAQAwEAYHKoZIzj0CAQYFZysBBAQEFjAUAgEBBA8ACFOrBbOh5LjNtJQCuEE=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_cf_sect409r1_PUB
+PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls4_PUB
 -----BEGIN PUBLIC KEY-----
-MH4wEAYHKoZIzj0CAQYFK4EEACUDagAEASAvXAM15DJerAu1JttpBuMJK1/fEfFohu2iEpt3r7Ui
-iQoER6HUsWiw1hhcJyTv7WzpJQHFWrOlJMe/KjmQa/CygSc65YHDzG27oUL+KGdQUGc79ZRSwl/q
-fGZqa3D+bDVMwrhmZto=
+MDQwEAYHKoZIzj0CAQYFZysBBAQDIAAEAW3K4Mus5+KAJVGLzEYrAYuCJSEYXFTo17aW0TwN
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=ALICE_cf_sect409r1:ALICE_cf_sect409r1_PUB
+PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls4:ALICE_cf_wap-wsg-idm-ecid-wtls4_PUB
 
-PrivateKey=BOB_cf_sect409r1
+PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls4
 -----BEGIN PRIVATE KEY-----
-MFICAQAwEAYHKoZIzj0CAQYFK4EEACUEOzA5AgEBBDQARen+1P3JQzBgOv0pUYwsZTPRVLpqqDAU
-7mKL2lk9eH7zSGmtNoMvP2m1S2dBnXxFY/bV
+MC0CAQAwEAYHKoZIzj0CAQYFZysBBAQEFjAUAgEBBA8Auz4XRc3Rg0bNcbrray8=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_cf_sect409r1_PUB
+PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls4_PUB
 -----BEGIN PUBLIC KEY-----
-MH4wEAYHKoZIzj0CAQYFK4EEACUDagAEAbDUw066TtdfOpDvrlKosEyqUNEG7rY+AKvDqKw+HOzf
-sUTYee6cEf71oqJ1sCKPQiYzlwCu/HLQeWPxISE6Uo+53kkeJml2xpMBwoE25Gq/DSS61dR7SRTZ
-+sUmumbIuGzbrjtMRmw=
+MDQwEAYHKoZIzj0CAQYFZysBBAQDIAAEAI0F7ixGqOhnYpsuR80nAdTdSXM+YbcUbLe/U/xG
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=BOB_cf_sect409r1:BOB_cf_sect409r1_PUB
+PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls4:BOB_cf_wap-wsg-idm-ecid-wtls4_PUB
 
 # ECDH Alice with Bob peer
-Derive=ALICE_cf_sect409r1
-PeerKey=BOB_cf_sect409r1_PUB
-SharedSecret=00a751259cdb3b445ce71a40a01a2189dfce70226111190505fc6eabe4e5a05bff7af55f2015e1ffcab6aea7ea9a6e74905da2a1
+Availablein = default
+Derive=ALICE_cf_wap-wsg-idm-ecid-wtls4
+PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls4_PUB
+SharedSecret=0077378ddfdadff704a0b6646949e7
 
 # ECDH Bob with Alice peer
-Derive=BOB_cf_sect409r1
-PeerKey=ALICE_cf_sect409r1_PUB
-SharedSecret=00a751259cdb3b445ce71a40a01a2189dfce70226111190505fc6eabe4e5a05bff7af55f2015e1ffcab6aea7ea9a6e74905da2a1
+Availablein = default
+Derive=BOB_cf_wap-wsg-idm-ecid-wtls4
+PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls4_PUB
+SharedSecret=0077378ddfdadff704a0b6646949e7
 
 # ECC CDH Alice with Bob peer
-Derive=ALICE_cf_sect409r1
-PeerKey=BOB_cf_sect409r1_PUB
+Availablein = default
+Derive=ALICE_cf_wap-wsg-idm-ecid-wtls4
+PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls4_PUB
 Ctrl=ecdh_cofactor_mode:1
-SharedSecret=0115a31aed416c5089d74a263ec300aff13a5329c6ad27de950ae0b0917b40a3464fccf5691ac9633a51e5177a82b15cfc434aad
+SharedSecret=008f3713fe1ff1fa5d5041899817d1
 
 # ECC CDH Bob with Alice peer
-Derive=BOB_cf_sect409r1
-PeerKey=ALICE_cf_sect409r1_PUB
+Availablein = default
+Derive=BOB_cf_wap-wsg-idm-ecid-wtls4
+PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls4_PUB
 Ctrl=ecdh_cofactor_mode:1
-SharedSecret=0115a31aed416c5089d74a263ec300aff13a5329c6ad27de950ae0b0917b40a3464fccf5691ac9633a51e5177a82b15cfc434aad
+SharedSecret=008f3713fe1ff1fa5d5041899817d1
 
-PublicKey=MALICE_cf_sect409r1_PUB
+PublicKey=MALICE_cf_wap-wsg-idm-ecid-wtls4_PUB
 -----BEGIN PUBLIC KEY-----
-MH4wEAYHKoZIzj0CAQYFK4EEACUDagAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAACZNffkdo7i7yL5tKKfU8tdk6su0K185XwbJkn96JWVDPZXZ3My
-bFKKSOJ7hyrM8Lwl1e8=
+MDQwEAYHKoZIzj0CAQYFZysBBAQDIAAEAAAAAAAAAAAAAAAAAAAAAd+TqiBXnTd/lyA/OFsR
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
-Derive=BOB_cf_sect409r1
-PeerKey=MALICE_cf_sect409r1_PUB
+Availablein = default
+Derive=BOB_cf_wap-wsg-idm-ecid-wtls4
+PeerKey=MALICE_cf_wap-wsg-idm-ecid-wtls4_PUB
 Ctrl=ecdh_cofactor_mode:1
 Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
-Derive=ALICE_cf_sect409r1
-PeerKey=MALICE_cf_sect409r1_PUB
+Availablein = default
+Derive=ALICE_cf_wap-wsg-idm-ecid-wtls4
+PeerKey=MALICE_cf_wap-wsg-idm-ecid-wtls4_PUB
 Ctrl=ecdh_cofactor_mode:1
 Result=DERIVE_ERROR
 Reason=point at infinity
 
-Title=sect571k1 curve tests
+Title=wap-wsg-idm-ecid-wtls5 curve tests
 
-PrivateKey=ALICE_cf_sect571k1
+PrivateKey=ALICE_cf_wap-wsg-idm-ecid-wtls5
 -----BEGIN PRIVATE KEY-----
-MGYCAQAwEAYHKoZIzj0CAQYFK4EEACYETzBNAgEBBEgB4agvk7Qdf9bVb9aMVdtXL0MuVw6dTleB
-zrpPMYty/piI5GWkQEGVp4OJSjF1BGgWmtYSYlV0oI8jJ7hfWTjVGfVWix4ipb8=
+MDMCAQAwEAYHKoZIzj0CAQYFZysBBAUEHDAaAgEBBBUD9gVh3zbLTA7BuRVVi9T8QKZ1uco=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_cf_sect571k1_PUB
+PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls5_PUB
 -----BEGIN PUBLIC KEY-----
-MIGnMBAGByqGSM49AgEGBSuBBAAmA4GSAAQDUZq0ZrgYpTXNpOptjExaur0K9FAYHv1j9cvAptwX
-dcmQf3VqekMkGZCfNdqNeqCajG3QHRkBHe4FZhWr3FXi8whvvr463lUDf+t46un1kE6FTYfhILGa
-sBZm7OdfkarYd9TXBbmnkFA+XkyPlkM1+6daM3/WmnegK+TYghFDXLgwiyF8s0ElllF7z38Gmc4=
+MEAwEAYHKoZIzj0CAQYFZysBBAUDLAAEAH5xyUrvbuN+tWmRhwqrQfFHPHNUBKtAGvJuvSFVwTKk
+uFzn9fPvIDe6
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=ALICE_cf_sect571k1:ALICE_cf_sect571k1_PUB
+PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls5:ALICE_cf_wap-wsg-idm-ecid-wtls5_PUB
 
-PrivateKey=BOB_cf_sect571k1
+PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls5
 -----BEGIN PRIVATE KEY-----
-MGYCAQAwEAYHKoZIzj0CAQYFK4EEACYETzBNAgEBBEgA3pINxGOI7L9M+Mil+bm/udPwI4xu7ubJ
-p3aoOepTXW94laf8wjFLcQnRUwH87Vbq9VLQEfCAFvr2vZoBc+5asnNuDhRNNeQ=
+MDMCAQAwEAYHKoZIzj0CAQYFZysBBAUEHDAaAgEBBBUAr9ZlmuO7bNfqB42xUivJXyVHKNI=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_cf_sect571k1_PUB
+PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls5_PUB
 -----BEGIN PUBLIC KEY-----
-MIGnMBAGByqGSM49AgEGBSuBBAAmA4GSAAQDZRr5GCSq2uzGxmWNB+bED7zye18Rr/KehwXrbn1r
-rKtR8fe+dg2V15FieC3qZe/wCpMtyp79VmEabGi6iGLlAN/rUE81URsA/K7GVpmklslV5gmwryR0
-3E7jGKPFesun9iNtmpgM18P9y3aJd4Qr4hMlwW2Nyw187l6QB/W2e/i+8vKXFTLHlz5WLAyAcpA=
+MEAwEAYHKoZIzj0CAQYFZysBBAUDLAAEBdXxEk0L2XAVzRNLPcnMxGXXyDfZAoA1Qw2XpOfVWIVR
+jdoMGRgUuJmO
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=BOB_cf_sect571k1:BOB_cf_sect571k1_PUB
+PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls5:BOB_cf_wap-wsg-idm-ecid-wtls5_PUB
 
 # ECDH Alice with Bob peer
-Derive=ALICE_cf_sect571k1
-PeerKey=BOB_cf_sect571k1_PUB
-SharedSecret=02b79c92cee50dc5b9fdddce36d4fa2e28d7d178cd74e575961f39429496305b38815c840c2e66327435c044ed885ec964068531251a2112717602532e8b6d5411db2fe05c1ac18c
+Availablein = default
+Derive=ALICE_cf_wap-wsg-idm-ecid-wtls5
+PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls5_PUB
+SharedSecret=0190c68d80e94fbe9f193ae7d9a156bf0b8d097c23
 
 # ECDH Bob with Alice peer
-Derive=BOB_cf_sect571k1
-PeerKey=ALICE_cf_sect571k1_PUB
-SharedSecret=02b79c92cee50dc5b9fdddce36d4fa2e28d7d178cd74e575961f39429496305b38815c840c2e66327435c044ed885ec964068531251a2112717602532e8b6d5411db2fe05c1ac18c
+Availablein = default
+Derive=BOB_cf_wap-wsg-idm-ecid-wtls5
+PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls5_PUB
+SharedSecret=0190c68d80e94fbe9f193ae7d9a156bf0b8d097c23
 
 # ECC CDH Alice with Bob peer
-Derive=ALICE_cf_sect571k1
-PeerKey=BOB_cf_sect571k1_PUB
+Availablein = default
+Derive=ALICE_cf_wap-wsg-idm-ecid-wtls5
+PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls5_PUB
 Ctrl=ecdh_cofactor_mode:1
-SharedSecret=063aea789492c9727a5a6b7f24e8d3d377c70ee8e86b13664e191a53b1905e90e78b85960b1881db5160c7c5cacca0d686d9e104140d565eeeec17426f93d3a7ba639ecd716b43d2
+SharedSecret=00aabc9b45c200e41294aa922ab06da6655731e0ea
 
 # ECC CDH Bob with Alice peer
-Derive=BOB_cf_sect571k1
-PeerKey=ALICE_cf_sect571k1_PUB
+Availablein = default
+Derive=BOB_cf_wap-wsg-idm-ecid-wtls5
+PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls5_PUB
 Ctrl=ecdh_cofactor_mode:1
-SharedSecret=063aea789492c9727a5a6b7f24e8d3d377c70ee8e86b13664e191a53b1905e90e78b85960b1881db5160c7c5cacca0d686d9e104140d565eeeec17426f93d3a7ba639ecd716b43d2
+SharedSecret=00aabc9b45c200e41294aa922ab06da6655731e0ea
 
-PublicKey=MALICE_cf_sect571k1_PUB
+PublicKey=MALICE_cf_wap-wsg-idm-ecid-wtls5_PUB
 -----BEGIN PUBLIC KEY-----
-MIGnMBAGByqGSM49AgEGBSuBBAAmA4GSAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=
+MEAwEAYHKoZIzj0CAQYFZysBBAUDLAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC8JxepS05nN/piK
+dhDD3dDKXUih
 -----END PUBLIC KEY-----
 
 # ECC CDH Bob with Malice peer
-Derive=BOB_cf_sect571k1
-PeerKey=MALICE_cf_sect571k1_PUB
+Availablein = default
+Derive=BOB_cf_wap-wsg-idm-ecid-wtls5
+PeerKey=MALICE_cf_wap-wsg-idm-ecid-wtls5_PUB
 Ctrl=ecdh_cofactor_mode:1
 Result=DERIVE_ERROR
 Reason=point at infinity
 
 # ECC CDH Alice with Malice peer
-Derive=ALICE_cf_sect571k1
-PeerKey=MALICE_cf_sect571k1_PUB
+Availablein = default
+Derive=ALICE_cf_wap-wsg-idm-ecid-wtls5
+PeerKey=MALICE_cf_wap-wsg-idm-ecid-wtls5_PUB
 Ctrl=ecdh_cofactor_mode:1
 Result=DERIVE_ERROR
 Reason=point at infinity
 
-Title=sect571r1 curve tests
+Title=wap-wsg-idm-ecid-wtls6 curve tests
 
-PrivateKey=ALICE_cf_sect571r1
+PrivateKey=ALICE_cf_wap-wsg-idm-ecid-wtls6
 -----BEGIN PRIVATE KEY-----
-MGYCAQAwEAYHKoZIzj0CAQYFK4EEACcETzBNAgEBBEgAxfL2/gUsmJonvDMR95Azq1ySgXMlKSRk
-+PL+WaS92ZyOo45HaC7RpH5sdkf4b948u6y1BXOxGZuORXy6lgbgZ1Zx2UgL3cI=
+MCwCAQAwEAYHKoZIzj0CAQYFZysBBAYEFTATAgEBBA4ayMbswPbvYMwpwo80jA==
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_cf_sect571r1_PUB
+PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls6_PUB
 -----BEGIN PUBLIC KEY-----
-MIGnMBAGByqGSM49AgEGBSuBBAAnA4GSAAQBK5L9ccIWacU2A1srZ35opPu6kcbEOsBPmvj/rlMS
-fFrdMOcagOYfcD0/ouYHPhvkHbr9k87IlQJfnV6ZNRA4PmWSp/FjkNwETm/fqTCUQHti/qqnKH7R
-Ed4fYROLFGvz+PX6E20SryOt1vrmoRyC7Z5FVmgMVOQQ1AaBNAHi3+IPtKx41YdXdbqHJxuI5jE=
+MDIwEAYHKoZIzj0CAQYFZysBBAYDHgAERPw/8Ip/RrXr0gMgLGRQeiQ4Qd6W+Li0ylGKzg==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=ALICE_cf_sect571r1:ALICE_cf_sect571r1_PUB
+PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls6:ALICE_cf_wap-wsg-idm-ecid-wtls6_PUB
 
-PrivateKey=BOB_cf_sect571r1
+PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls6
 -----BEGIN PRIVATE KEY-----
-MGYCAQAwEAYHKoZIzj0CAQYFK4EEACcETzBNAgEBBEgAzcRvASPpWi0ybpOGlj0Lozz01C2a5oDA
-G5alib1EmZKcpVULxJXn75FQlTKpkUEuWUgA4yk5X5DTiScUuh4LDhaF3AFhsEY=
+MCwCAQAwEAYHKoZIzj0CAQYFZysBBAYEFTATAgEBBA6kbCpFt3tX2hYBQHMXbg==
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_cf_sect571r1_PUB
+PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls6_PUB
 -----BEGIN PUBLIC KEY-----
-MIGnMBAGByqGSM49AgEGBSuBBAAnA4GSAAQH3dnL22NajtqDWTX6qD14w1BOlpHFBUPTr24VySlh
-kiiBlOF95u7hFr/hSb7gm/3f+IVKyE18Sh2kR4KaxWcPWKY5xKTiqiICT7hCistuzNRt8gR+kNOT
-c1rETMV6ZruZinwzEWWWjwJf6612oy2HG3CX3B8Rm+a3sS0q6IzowEwqmDv6v9bMTFk8bsCv0Fk=
+MDIwEAYHKoZIzj0CAQYFZysBBAYDHgAEhJXqpYGxE/l1X/LiBeyRbIcyzqPxUP5Tkv3U3w==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=BOB_cf_sect571r1:BOB_cf_sect571r1_PUB
+PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls6:BOB_cf_wap-wsg-idm-ecid-wtls6_PUB
 
 # ECDH Alice with Bob peer
-Derive=ALICE_cf_sect571r1
-PeerKey=BOB_cf_sect571r1_PUB
-SharedSecret=0031f9879fa75b8c67ba81ee861be634e2b53aa79f834e9a8ca4df7f4461bcb02f083d9fa5b4767f881a710caa6524b58eb626623ba394961d46535204c26d165089e7d4f7be1827
+Availablein = default
+Derive=ALICE_cf_wap-wsg-idm-ecid-wtls6
+PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls6_PUB
+SharedSecret=b4cae255268f11a1e46fecad04c2
 
 # ECDH Bob with Alice peer
-Derive=BOB_cf_sect571r1
-PeerKey=ALICE_cf_sect571r1_PUB
-SharedSecret=0031f9879fa75b8c67ba81ee861be634e2b53aa79f834e9a8ca4df7f4461bcb02f083d9fa5b4767f881a710caa6524b58eb626623ba394961d46535204c26d165089e7d4f7be1827
+Availablein = default
+Derive=BOB_cf_wap-wsg-idm-ecid-wtls6
+PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls6_PUB
+SharedSecret=b4cae255268f11a1e46fecad04c2
 
-# ECC CDH Alice with Bob peer
-Derive=ALICE_cf_sect571r1
-PeerKey=BOB_cf_sect571r1_PUB
-Ctrl=ecdh_cofactor_mode:1
-SharedSecret=012e8c2c1554988fe20c5ae7d11cdcfe15c7c6e8d2b6f46a43a45d724bfc7b415ea7594d5c16f770a95d6e65bbcb1f34619db95e89f4fecbcb0bc6a3f92d52df6a49b0e7773e0ac0
+Title=wap-wsg-idm-ecid-wtls7 curve tests
 
-# ECC CDH Bob with Alice peer
-Derive=BOB_cf_sect571r1
-PeerKey=ALICE_cf_sect571r1_PUB
-Ctrl=ecdh_cofactor_mode:1
-SharedSecret=012e8c2c1554988fe20c5ae7d11cdcfe15c7c6e8d2b6f46a43a45d724bfc7b415ea7594d5c16f770a95d6e65bbcb1f34619db95e89f4fecbcb0bc6a3f92d52df6a49b0e7773e0ac0
+PrivateKey=ALICE_cf_wap-wsg-idm-ecid-wtls7
+-----BEGIN PRIVATE KEY-----
+MDMCAQAwEAYHKoZIzj0CAQYFZysBBAcEHDAaAgEBBBUABcyzh4ot9ck/j4/3ehK0aYngYoM=
+-----END PRIVATE KEY-----
 
-PublicKey=MALICE_cf_sect571r1_PUB
+PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls7_PUB
 -----BEGIN PUBLIC KEY-----
-MIGnMBAGByqGSM49AgEGBSuBBAAnA4GSAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHMtVWZAwgtd1zmgWN/9WC
-aNQcWRNUKesEHXqhJVkC5jYsSACodKsLYFNrWEYM0gwG8DQONZSn93G+38EM45tkaZsIRDt2HEM=
+MD4wEAYHKoZIzj0CAQYFZysBBAcDKgAEwQLnZ70n45RLqRtAGNzEa3Rl/9nwyjqYUtw2eeHhnNLT
+feGY4CNH0w==
 -----END PUBLIC KEY-----
 
-# ECC CDH Bob with Malice peer
-Derive=BOB_cf_sect571r1
-PeerKey=MALICE_cf_sect571r1_PUB
-Ctrl=ecdh_cofactor_mode:1
-Result=DERIVE_ERROR
-Reason=point at infinity
-
-# ECC CDH Alice with Malice peer
-Derive=ALICE_cf_sect571r1
-PeerKey=MALICE_cf_sect571r1_PUB
-Ctrl=ecdh_cofactor_mode:1
-Result=DERIVE_ERROR
-Reason=point at infinity
-
-Title=wap-wsg-idm-ecid-wtls10 curve tests
+PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls7:ALICE_cf_wap-wsg-idm-ecid-wtls7_PUB
 
-PrivateKey=ALICE_cf_wap-wsg-idm-ecid-wtls10
+PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls7
 -----BEGIN PRIVATE KEY-----
-MDsCAQAwEAYHKoZIzj0CAQYFZysBBAoEJDAiAgEBBB1zvDMHGgcytka5KvlvQvJzTA4l2ts2NzBp
-SJiGyw==
+MDMCAQAwEAYHKoZIzj0CAQYFZysBBAcEHDAaAgEBBBUAPyrGRY1SR13hKQswS6yXs8w8PUQ=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls10_PUB
+PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls7_PUB
 -----BEGIN PUBLIC KEY-----
-MFIwEAYHKoZIzj0CAQYFZysBBAoDPgAEAZkrhWBz/Q4GB8DY4Ia114ew6H7Eg7ri2uxwxd3rAZs5
-/ShvunNyndjCt3Qaq8sulBM0nUyERSDakyD+
+MD4wEAYHKoZIzj0CAQYFZysBBAcDKgAEZGN44YbN5r3zcNtOHrvbQLt8/lE7BHp4D/9eKLmwFDn1
+QneRu3xwPA==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls10:ALICE_cf_wap-wsg-idm-ecid-wtls10_PUB
+PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls7:BOB_cf_wap-wsg-idm-ecid-wtls7_PUB
 
-PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls10
+# ECDH Alice with Bob peer
+Availablein = default
+Derive=ALICE_cf_wap-wsg-idm-ecid-wtls7
+PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls7_PUB
+SharedSecret=ae9f5bcc6457c0422866bf855921eabc42b7121a
+
+# ECDH Bob with Alice peer
+Availablein = default
+Derive=BOB_cf_wap-wsg-idm-ecid-wtls7
+PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls7_PUB
+SharedSecret=ae9f5bcc6457c0422866bf855921eabc42b7121a
+
+Title=wap-wsg-idm-ecid-wtls8 curve tests
+
+PrivateKey=ALICE_cf_wap-wsg-idm-ecid-wtls8
 -----BEGIN PRIVATE KEY-----
-MDsCAQAwEAYHKoZIzj0CAQYFZysBBAoEJDAiAgEBBB1SowkHU79PqokOfgllN53rNS8a3h1wFBY0
-dKPkQg==
+MC0CAQAwEAYHKoZIzj0CAQYFZysBBAgEFjAUAgEBBA8AnkC18b3pH2O5TIYIqAQ=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls10_PUB
+PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls8_PUB
 -----BEGIN PUBLIC KEY-----
-MFIwEAYHKoZIzj0CAQYFZysBBAoDPgAEAGavw4ChHCoWplAumMEBwJgJ2aYtw+utu4vhWnscAPIT
-IJ4IiIGj18rCFBap1sgVbpXjhEBLYg6Itwv2
+MDIwEAYHKoZIzj0CAQYFZysBBAgDHgAEJD0h4HEfchwxqhp9eMHh9gczQKHX4MtWVoAxKQ==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls10:BOB_cf_wap-wsg-idm-ecid-wtls10_PUB
-
-# ECDH Alice with Bob peer
-Derive=ALICE_cf_wap-wsg-idm-ecid-wtls10
-PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls10_PUB
-SharedSecret=0194ef5d80fdfe9df366b2273b983c3dbd440faf76964fcfc06c509f289d
-
-# ECDH Bob with Alice peer
-Derive=BOB_cf_wap-wsg-idm-ecid-wtls10
-PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls10_PUB
-SharedSecret=0194ef5d80fdfe9df366b2273b983c3dbd440faf76964fcfc06c509f289d
-
-# ECC CDH Alice with Bob peer
-Derive=ALICE_cf_wap-wsg-idm-ecid-wtls10
-PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls10_PUB
-Ctrl=ecdh_cofactor_mode:1
-SharedSecret=01bedc5cdf63fbf18c3e2bc9765e12f7990c0c0c64f0267ae7c37b9f49f0
+PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls8:ALICE_cf_wap-wsg-idm-ecid-wtls8_PUB
 
-# ECC CDH Bob with Alice peer
-Derive=BOB_cf_wap-wsg-idm-ecid-wtls10
-PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls10_PUB
-Ctrl=ecdh_cofactor_mode:1
-SharedSecret=01bedc5cdf63fbf18c3e2bc9765e12f7990c0c0c64f0267ae7c37b9f49f0
+PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls8
+-----BEGIN PRIVATE KEY-----
+MC0CAQAwEAYHKoZIzj0CAQYFZysBBAgEFjAUAgEBBA8AXxPMnqbl3rOuIM5nsvc=
+-----END PRIVATE KEY-----
 
-PublicKey=MALICE_cf_wap-wsg-idm-ecid-wtls10_PUB
+PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls8_PUB
 -----BEGIN PUBLIC KEY-----
-MFIwEAYHKoZIzj0CAQYFZysBBAoDPgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB
+MDIwEAYHKoZIzj0CAQYFZysBBAgDHgAEZawmRmzr9P+jihImUi6ykOzaSH484JhMKNdrgw==
 -----END PUBLIC KEY-----
 
-# ECC CDH Bob with Malice peer
-Derive=BOB_cf_wap-wsg-idm-ecid-wtls10
-PeerKey=MALICE_cf_wap-wsg-idm-ecid-wtls10_PUB
-Ctrl=ecdh_cofactor_mode:1
-Result=DERIVE_ERROR
-Reason=point at infinity
+PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls8:BOB_cf_wap-wsg-idm-ecid-wtls8_PUB
 
-# ECC CDH Alice with Malice peer
-Derive=ALICE_cf_wap-wsg-idm-ecid-wtls10
-PeerKey=MALICE_cf_wap-wsg-idm-ecid-wtls10_PUB
-Ctrl=ecdh_cofactor_mode:1
-Result=DERIVE_ERROR
-Reason=point at infinity
+# ECDH Alice with Bob peer
+Availablein = default
+Derive=ALICE_cf_wap-wsg-idm-ecid-wtls8
+PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls8_PUB
+SharedSecret=48baf4f1f5e8a0eb5dae28ef6290
 
-Title=wap-wsg-idm-ecid-wtls11 curve tests
+# ECDH Bob with Alice peer
+Availablein = default
+Derive=BOB_cf_wap-wsg-idm-ecid-wtls8
+PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls8_PUB
+SharedSecret=48baf4f1f5e8a0eb5dae28ef6290
 
-PrivateKey=ALICE_cf_wap-wsg-idm-ecid-wtls11
+Title=wap-wsg-idm-ecid-wtls9 curve tests
+
+PrivateKey=ALICE_cf_wap-wsg-idm-ecid-wtls9
 -----BEGIN PRIVATE KEY-----
-MDwCAQAwEAYHKoZIzj0CAQYFZysBBAsEJTAjAgEBBB4AkzS3zoqHNCLug/nwoYMQW3UigmZ9t56k
-5jp+FiY=
+MDMCAQAwEAYHKoZIzj0CAQYFZysBBAkEHDAaAgEBBBUALwvuKs3RLthMAsChbqKjXw6vTYo=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls11_PUB
+PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls9_PUB
 -----BEGIN PUBLIC KEY-----
-MFIwEAYHKoZIzj0CAQYFZysBBAsDPgAEABttgKKYeGZRmcH/5UZR56lOSgbU4TH2AuIhvj88AL6H
-zTCX9elzXpck+u22bnmkuvL2A8XKB5+fabMR
+MD4wEAYHKoZIzj0CAQYFZysBBAkDKgAET0ppOvd9DU4v+tkKDQ5wRBrN1FwD9+F9t5l3Im+mz3rw
+DB/RYdZuUg==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls11:ALICE_cf_wap-wsg-idm-ecid-wtls11_PUB
+PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls9:ALICE_cf_wap-wsg-idm-ecid-wtls9_PUB
 
-PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls11
+PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls9
 -----BEGIN PRIVATE KEY-----
-MDwCAQAwEAYHKoZIzj0CAQYFZysBBAsEJTAjAgEBBB4AWU05mbqPxsB749llNON1//l0w8RJJ3z5
-h/kzfNM=
+MDMCAQAwEAYHKoZIzj0CAQYFZysBBAkEHDAaAgEBBBUAgeb/vqEM7X5AAAxyBu3M+C8pWLM=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls11_PUB
+PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls9_PUB
 -----BEGIN PUBLIC KEY-----
-MFIwEAYHKoZIzj0CAQYFZysBBAsDPgAEAL6Xj/KCmXAQAAo847t0bl0wqBrteWRg93OvIJsPAAOE
-ehdIgJyruc3KsH0RFlipu5QD8pnGSIXvif19
+MD4wEAYHKoZIzj0CAQYFZysBBAkDKgAEWc37LGt6lt90iF4lhtDYNFdjAqoczebuNgzGff/Uq8ov
+a3EVJ9yK1A==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls11:BOB_cf_wap-wsg-idm-ecid-wtls11_PUB
+PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls9:BOB_cf_wap-wsg-idm-ecid-wtls9_PUB
 
 # ECDH Alice with Bob peer
-Derive=ALICE_cf_wap-wsg-idm-ecid-wtls11
-PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls11_PUB
-SharedSecret=01ac8a23ddeeafb4d3bb243fe409f2f9c8b1a3fc11d4690da583f2e21637
+Availablein = default
+Derive=ALICE_cf_wap-wsg-idm-ecid-wtls9
+PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls9_PUB
+SharedSecret=948d3030e95cead39a1bb3d8a01c2be178517ba7
 
 # ECDH Bob with Alice peer
-Derive=BOB_cf_wap-wsg-idm-ecid-wtls11
-PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls11_PUB
-SharedSecret=01ac8a23ddeeafb4d3bb243fe409f2f9c8b1a3fc11d4690da583f2e21637
+Availablein = default
+Derive=BOB_cf_wap-wsg-idm-ecid-wtls9
+PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls9_PUB
+SharedSecret=948d3030e95cead39a1bb3d8a01c2be178517ba7
 
-# ECC CDH Alice with Bob peer
-Derive=ALICE_cf_wap-wsg-idm-ecid-wtls11
-PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls11_PUB
-Ctrl=ecdh_cofactor_mode:1
-SharedSecret=01b9992992572d3a59d424f8c9cc195576461ed6c1dadf6fb523717fab19
+# tests: 484
 
-# ECC CDH Bob with Alice peer
-Derive=BOB_cf_wap-wsg-idm-ecid-wtls11
-PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls11_PUB
-Ctrl=ecdh_cofactor_mode:1
-SharedSecret=01b9992992572d3a59d424f8c9cc195576461ed6c1dadf6fb523717fab19
+Title=zero x-coord regression tests
 
-PublicKey=MALICE_cf_wap-wsg-idm-ecid-wtls11_PUB
+PrivateKey=ALICE_zero_prime192v1
+-----BEGIN PRIVATE KEY-----
+MDkCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQEEHzAdAgEBBBhaPNk8jG5hSG6y8tUqUoOaNNsZ3APU
+pps=
+-----END PRIVATE KEY-----
+
+PublicKey=BOB_zero_prime192v1_PUB
 -----BEGIN PUBLIC KEY-----
-MFIwEAYHKoZIzj0CAQYFZysBBAsDPgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYf4
-Vie5eHTnR+4x4G1xyq7qUvISU+X5RtBh2pE4
+MEkwEwYHKoZIzj0CAQYIKoZIzj0DAQEDMgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAe2hWBe5g
+DLNj216pEvK7XjoKLg5gNg8S
 -----END PUBLIC KEY-----
 
-# ECC CDH Bob with Malice peer
-Derive=BOB_cf_wap-wsg-idm-ecid-wtls11
-PeerKey=MALICE_cf_wap-wsg-idm-ecid-wtls11_PUB
-Ctrl=ecdh_cofactor_mode:1
-Result=DERIVE_ERROR
-Reason=point at infinity
-
-# ECC CDH Alice with Malice peer
-Derive=ALICE_cf_wap-wsg-idm-ecid-wtls11
-PeerKey=MALICE_cf_wap-wsg-idm-ecid-wtls11_PUB
-Ctrl=ecdh_cofactor_mode:1
-Result=DERIVE_ERROR
-Reason=point at infinity
-
-Title=wap-wsg-idm-ecid-wtls12 curve tests
+# ECDH Alice with Bob peer
+Availablein = default
+Derive=ALICE_zero_prime192v1
+PeerKey=BOB_zero_prime192v1_PUB
+SharedSecret=baaffd49a8399d2ad52cbbe24d47b67afb4b3cf436f1cd65
 
-PrivateKey=ALICE_cf_wap-wsg-idm-ecid-wtls12
+PrivateKey=ALICE_zero_prime192v2
 -----BEGIN PRIVATE KEY-----
-MDoCAQAwEAYHKoZIzj0CAQYFZysBBAwEIzAhAgEBBBxwvll9Eb9mm2Xadq1evIi1zIK+6u0Nv8bP
-LI9a
+MDkCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQIEHzAdAgEBBBj1AIQMJ7jqYIKCvxYAS+qKMmKmH0to
+41k=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls12_PUB
+PublicKey=BOB_zero_prime192v2_PUB
 -----BEGIN PUBLIC KEY-----
-ME4wEAYHKoZIzj0CAQYFZysBBAwDOgAE0t0WqG/pFsiCt6agmebw3FCEWAzf9BpNLuzoCkPEe0Li
-bqn5udrckL6s3stwCTVFaZUfY2qS9QE=
+MEkwEwYHKoZIzj0CAQYIKoZIzj0DAQIDMgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4Gj7Qqt
+2wx/jwFlKgvE4rnd50LspdMk
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls12:ALICE_cf_wap-wsg-idm-ecid-wtls12_PUB
+# ECDH Alice with Bob peer
+Availablein = default
+Derive=ALICE_zero_prime192v2
+PeerKey=BOB_zero_prime192v2_PUB
+SharedSecret=b8f200a4b87064f2e8600685ca3e69b8e661a117aabc770b
 
-PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls12
+PrivateKey=ALICE_zero_prime192v3
 -----BEGIN PRIVATE KEY-----
-MDoCAQAwEAYHKoZIzj0CAQYFZysBBAwEIzAhAgEBBBz+5P6gpqXxbeXvvaD5W9Ft69BTxcn7zc6q
-K3Ax
+MDkCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQMEHzAdAgEBBBh/maLQMSlea9BfLqGy5NPuK0YAH/cz
+GqI=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls12_PUB
+PublicKey=BOB_zero_prime192v3_PUB
 -----BEGIN PUBLIC KEY-----
-ME4wEAYHKoZIzj0CAQYFZysBBAwDOgAEvyxedqaWkoAOMjaV5W3/tJpheiHAR0zV6BlIeUuGP2mx
-+xsOK9/QB7hzipq9cXx1K/dXu58EoSY=
+MEkwEwYHKoZIzj0CAQYIKoZIzj0DAQMDMgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZEzb63e2
+3MKatRLR9Y1M5JEdI9jwMocI
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls12:BOB_cf_wap-wsg-idm-ecid-wtls12_PUB
-
 # ECDH Alice with Bob peer
-Derive=ALICE_cf_wap-wsg-idm-ecid-wtls12
-PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls12_PUB
-SharedSecret=a3b3f20af8c33a0f5c246b4b9d9dda1cd40c294d1f53365d18a8b54b
-
-# ECDH Bob with Alice peer
-Derive=BOB_cf_wap-wsg-idm-ecid-wtls12
-PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls12_PUB
-SharedSecret=a3b3f20af8c33a0f5c246b4b9d9dda1cd40c294d1f53365d18a8b54b
-
-Title=wap-wsg-idm-ecid-wtls1 curve tests
+Availablein = default
+Derive=ALICE_zero_prime192v3
+PeerKey=BOB_zero_prime192v3_PUB
+SharedSecret=b5de857d355bc5b9e270a4c290ea9728d764d8b243ff5d8d
 
-PrivateKey=ALICE_cf_wap-wsg-idm-ecid-wtls1
+PrivateKey=ALICE_zero_prime239v1
 -----BEGIN PRIVATE KEY-----
-MCwCAQAwEAYHKoZIzj0CAQYFZysBBAEEFTATAgEBBA5ZNASTt4/g6XPQwRiQ0Q==
+MD8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQQEJTAjAgEBBB5pYWzRYI+c6O7NXCt0H2kw8XRL3rhe
+4MrJT8j++CI=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls1_PUB
+PublicKey=BOB_zero_prime239v1_PUB
 -----BEGIN PUBLIC KEY-----
-MDQwEAYHKoZIzj0CAQYFZysBBAEDIAAEACBNPI48xxsPVQBy07jRAAcWzbIkMo8BQotxpfGJ
+MFUwEwYHKoZIzj0CAQYIKoZIzj0DAQQDPgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+Ox02uwNNLFuvDRn5ip8TxvW0W22R7UzJa9Av6/nh
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls1:ALICE_cf_wap-wsg-idm-ecid-wtls1_PUB
+# ECDH Alice with Bob peer
+Availablein = default
+Derive=ALICE_zero_prime239v1
+PeerKey=BOB_zero_prime239v1_PUB
+SharedSecret=6b6206408bd05d42daa2cd224c401a1230b44e184f17b82f385f22dac215
 
-PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls1
+PrivateKey=ALICE_zero_prime239v2
 -----BEGIN PRIVATE KEY-----
-MCwCAQAwEAYHKoZIzj0CAQYFZysBBAEEFTATAgEBBA6+0x9qk0NIKHSRvlTemQ==
+MD8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQUEJTAjAgEBBB5l8bB7Cpmr7vyx9FiOT2wEF3YOFbDG
+bmRr3Vi/xr4=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls1_PUB
+PublicKey=BOB_zero_prime239v2_PUB
 -----BEGIN PUBLIC KEY-----
-MDQwEAYHKoZIzj0CAQYFZysBBAEDIAAEAEeHMSBTx/EtOu+bjBinALHSkQuJyiP3mg1tu+I2
+MFUwEwYHKoZIzj0CAQYIKoZIzj0DAQUDPgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+IOg3VJGQ89d1GWg4Igxcj5xpDmJiP8tv+e4mxt5U
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls1:BOB_cf_wap-wsg-idm-ecid-wtls1_PUB
-
 # ECDH Alice with Bob peer
-Derive=ALICE_cf_wap-wsg-idm-ecid-wtls1
-PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls1_PUB
-SharedSecret=0040ba2fadc1da97c973e5e59ade31
+Availablein = default
+Derive=ALICE_zero_prime239v2
+PeerKey=BOB_zero_prime239v2_PUB
+SharedSecret=772c2819c960c78f28f21f6542b7409294fad1f84567c44c4b7678dc0e42
 
-# ECDH Bob with Alice peer
-Derive=BOB_cf_wap-wsg-idm-ecid-wtls1
-PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls1_PUB
-SharedSecret=0040ba2fadc1da97c973e5e59ade31
+PrivateKey=ALICE_zero_prime239v3
+-----BEGIN PRIVATE KEY-----
+MD8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQYEJTAjAgEBBB5HF5FABzUOTYMZg9UdZTx/oRERm/fU
+M/+otKzpLjA=
+-----END PRIVATE KEY-----
 
-# ECC CDH Alice with Bob peer
-Derive=ALICE_cf_wap-wsg-idm-ecid-wtls1
-PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls1_PUB
-Ctrl=ecdh_cofactor_mode:1
-SharedSecret=008919696215a89e03d6c4c9265d6b
-
-# ECC CDH Bob with Alice peer
-Derive=BOB_cf_wap-wsg-idm-ecid-wtls1
-PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls1_PUB
-Ctrl=ecdh_cofactor_mode:1
-SharedSecret=008919696215a89e03d6c4c9265d6b
-
-PublicKey=MALICE_cf_wap-wsg-idm-ecid-wtls1_PUB
+PublicKey=BOB_zero_prime239v3_PUB
 -----BEGIN PUBLIC KEY-----
-MDQwEAYHKoZIzj0CAQYFZysBBAEDIAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB
+MFUwEwYHKoZIzj0CAQYIKoZIzj0DAQYDPgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AsZ4u6r3qQI78EYBpiSgWjqNpoeShjr5piecMBWj
 -----END PUBLIC KEY-----
 
-# ECC CDH Bob with Malice peer
-Derive=BOB_cf_wap-wsg-idm-ecid-wtls1
-PeerKey=MALICE_cf_wap-wsg-idm-ecid-wtls1_PUB
-Ctrl=ecdh_cofactor_mode:1
-Result=DERIVE_ERROR
-Reason=point at infinity
-
-# ECC CDH Alice with Malice peer
-Derive=ALICE_cf_wap-wsg-idm-ecid-wtls1
-PeerKey=MALICE_cf_wap-wsg-idm-ecid-wtls1_PUB
-Ctrl=ecdh_cofactor_mode:1
-Result=DERIVE_ERROR
-Reason=point at infinity
-
-Title=wap-wsg-idm-ecid-wtls3 curve tests
+# ECDH Alice with Bob peer
+Availablein = default
+Derive=ALICE_zero_prime239v3
+PeerKey=BOB_zero_prime239v3_PUB
+SharedSecret=56a71f5dd1611e8032c3e2d8224d86e5e8c2fc6480d74c0e282282decd43
 
-PrivateKey=ALICE_cf_wap-wsg-idm-ecid-wtls3
+PrivateKey=ALICE_zero_prime256v1
 -----BEGIN PRIVATE KEY-----
-MDMCAQAwEAYHKoZIzj0CAQYFZysBBAMEHDAaAgEBBBUDO2cHbqQBUxuJBl6UT9UrasuRVrI=
+MEECAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQcEJzAlAgEBBCDXhMb6aR4JR2+l2tmgYqP0r8S4jtym
+yH++awvF2nGhhg==
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls3_PUB
+PublicKey=BOB_zero_prime256v1_PUB
 -----BEGIN PUBLIC KEY-----
-MEAwEAYHKoZIzj0CAQYFZysBBAMDLAAEBRIzvK9o7eO2NGmtPFV/zo9/1mlvBwjG7+e6hbPG1KdI
-01f8oGBuXMQH
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AABmSFx4Di+D1yQzvV2EoGu2VBwq8x2uhxcov4VqF0+T9A==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls3:ALICE_cf_wap-wsg-idm-ecid-wtls3_PUB
+# ECDH Alice with Bob peer
+Availablein = default
+Derive=ALICE_zero_prime256v1
+PeerKey=BOB_zero_prime256v1_PUB
+SharedSecret=c4f5607deb8501f1a4ba23fce4122a4343a17ada2c86a9c8e0d03d92d4a4c84c
 
-PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls3
+PrivateKey=ALICE_zero_secp112r2
 -----BEGIN PRIVATE KEY-----
-MDMCAQAwEAYHKoZIzj0CAQYFZysBBAMEHDAaAgEBBBUAhZv9WZ00bDnU9MOaqEegP771nes=
+MCwCAQAwEAYHKoZIzj0CAQYFK4EEAAcEFTATAgEBBA4hh3tRkG3tnA0496ffMw==
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls3_PUB
+PublicKey=BOB_zero_secp112r2_PUB
 -----BEGIN PUBLIC KEY-----
-MEAwEAYHKoZIzj0CAQYFZysBBAMDLAAEAYOspjEbzyZw61jCtUrxARr+w66nBH+73QIvlaRVSG/4
-hlBUf5kmG4Yn
+MDIwEAYHKoZIzj0CAQYFK4EEAAcDHgAEAAAAAAAAAAAAAAAAAAAS5eEOWDV/Wk7w4djyDQ==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls3:BOB_cf_wap-wsg-idm-ecid-wtls3_PUB
-
 # ECDH Alice with Bob peer
-Derive=ALICE_cf_wap-wsg-idm-ecid-wtls3
-PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls3_PUB
-SharedSecret=0311924428a839b7dcada662722945e62bf1131f4f
-
-# ECDH Bob with Alice peer
-Derive=BOB_cf_wap-wsg-idm-ecid-wtls3
-PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls3_PUB
-SharedSecret=0311924428a839b7dcada662722945e62bf1131f4f
-
-# ECC CDH Alice with Bob peer
-Derive=ALICE_cf_wap-wsg-idm-ecid-wtls3
-PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls3_PUB
-Ctrl=ecdh_cofactor_mode:1
-SharedSecret=047f1aee6a1a1d7c9c1f0e8dce4349429f737aa658
+Availablein = default
+Derive=ALICE_zero_secp112r2
+PeerKey=BOB_zero_secp112r2_PUB
+SharedSecret=958cc1cb425713678830a4d7d95e
 
-# ECC CDH Bob with Alice peer
-Derive=BOB_cf_wap-wsg-idm-ecid-wtls3
-PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls3_PUB
-Ctrl=ecdh_cofactor_mode:1
-SharedSecret=047f1aee6a1a1d7c9c1f0e8dce4349429f737aa658
+PrivateKey=ALICE_zero_secp128r1
+-----BEGIN PRIVATE KEY-----
+MC4CAQAwEAYHKoZIzj0CAQYFK4EEABwEFzAVAgEBBBCykSzic/h3T2K6SkSP1SGt
+-----END PRIVATE KEY-----
 
-PublicKey=MALICE_cf_wap-wsg-idm-ecid-wtls3_PUB
+PublicKey=BOB_zero_secp128r1_PUB
 -----BEGIN PUBLIC KEY-----
-MEAwEAYHKoZIzj0CAQYFZysBBAMDLAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAB
+MDYwEAYHKoZIzj0CAQYFK4EEABwDIgAEAAAAAAAAAAAAAAAAAAAAAABya8M5aeOpNG3z799IdHc=
 -----END PUBLIC KEY-----
 
-# ECC CDH Bob with Malice peer
-Derive=BOB_cf_wap-wsg-idm-ecid-wtls3
-PeerKey=MALICE_cf_wap-wsg-idm-ecid-wtls3_PUB
-Ctrl=ecdh_cofactor_mode:1
-Result=DERIVE_ERROR
-Reason=point at infinity
+# ECDH Alice with Bob peer
+Availablein = default
+Derive=ALICE_zero_secp128r1
+PeerKey=BOB_zero_secp128r1_PUB
+SharedSecret=5235d452066f126cd7e99eea00fd3068
 
-# ECC CDH Alice with Malice peer
-Derive=ALICE_cf_wap-wsg-idm-ecid-wtls3
-PeerKey=MALICE_cf_wap-wsg-idm-ecid-wtls3_PUB
-Ctrl=ecdh_cofactor_mode:1
-Result=DERIVE_ERROR
-Reason=point at infinity
+PrivateKey=ALICE_zero_secp160r1
+-----BEGIN PRIVATE KEY-----
+MDMCAQAwEAYHKoZIzj0CAQYFK4EEAAgEHDAaAgEBBBUACoRnbig69XLlh5VcRexpbbn5zwA=
+-----END PRIVATE KEY-----
 
-Title=wap-wsg-idm-ecid-wtls4 curve tests
+PublicKey=BOB_zero_secp160r1_PUB
+-----BEGIN PUBLIC KEY-----
+MD4wEAYHKoZIzj0CAQYFK4EEAAgDKgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAG/w1po29wYlxlygXs
+MGfbiGg5ng==
+-----END PUBLIC KEY-----
 
-PrivateKey=ALICE_cf_wap-wsg-idm-ecid-wtls4
+# ECDH Alice with Bob peer
+Availablein = default
+Derive=ALICE_zero_secp160r1
+PeerKey=BOB_zero_secp160r1_PUB
+SharedSecret=9ccd0ab8d093b6acdb3fe14c3736a0dfe61a4666
+
+PrivateKey=ALICE_zero_secp160r2
 -----BEGIN PRIVATE KEY-----
-MC0CAQAwEAYHKoZIzj0CAQYFZysBBAQEFjAUAgEBBA8ACFOrBbOh5LjNtJQCuEE=
+MDMCAQAwEAYHKoZIzj0CAQYFK4EEAB4EHDAaAgEBBBUAQFGxInSw1eAvd45E9TUdbXtJGnA=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls4_PUB
+PublicKey=BOB_zero_secp160r2_PUB
 -----BEGIN PUBLIC KEY-----
-MDQwEAYHKoZIzj0CAQYFZysBBAQDIAAEAW3K4Mus5+KAJVGLzEYrAYuCJSEYXFTo17aW0TwN
+MD4wEAYHKoZIzj0CAQYFK4EEAB4DKgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAZtSBSZqfmXp47v5z2
+ZZZl2JFxDg==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls4:ALICE_cf_wap-wsg-idm-ecid-wtls4_PUB
+# ECDH Alice with Bob peer
+Availablein = default
+Derive=ALICE_zero_secp160r2
+PeerKey=BOB_zero_secp160r2_PUB
+SharedSecret=303e0a282ac86f463fe834cb51b0057be42ed5ab
 
-PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls4
+PrivateKey=ALICE_zero_secp384r1
 -----BEGIN PRIVATE KEY-----
-MC0CAQAwEAYHKoZIzj0CAQYFZysBBAQEFjAUAgEBBA8Auz4XRc3Rg0bNcbrray8=
+ME4CAQAwEAYHKoZIzj0CAQYFK4EEACIENzA1AgEBBDD6kgzKbg28zbQyVTdC0IdHbm0UCQt2Rdbi
+VVHJeYRSnNpFOiFLaOsGOmwoeZzj6jc=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls4_PUB
+PublicKey=BOB_zero_secp384r1_PUB
 -----BEGIN PUBLIC KEY-----
-MDQwEAYHKoZIzj0CAQYFZysBBAQDIAAEAI0F7ixGqOhnYpsuR80nAdTdSXM+YbcUbLe/U/xG
+MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAPPme8E9RpepjC6P5+WDdWToUyb45/SvSFdO0sIqq+Gu/kn8sRuUqsG+3
+QriFDlIe
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls4:BOB_cf_wap-wsg-idm-ecid-wtls4_PUB
-
 # ECDH Alice with Bob peer
-Derive=ALICE_cf_wap-wsg-idm-ecid-wtls4
-PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls4_PUB
-SharedSecret=0077378ddfdadff704a0b6646949e7
+Availablein = default
+Derive=ALICE_zero_secp384r1
+PeerKey=BOB_zero_secp384r1_PUB
+SharedSecret=b1cfeaeef51dfd487d3a8b2849f1592e04d63f2d2c88b310a6290ebfe5399f5ffe954eabd0619231393e56c35b242986
 
-# ECDH Bob with Alice peer
-Derive=BOB_cf_wap-wsg-idm-ecid-wtls4
-PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls4_PUB
-SharedSecret=0077378ddfdadff704a0b6646949e7
+PrivateKey=ALICE_zero_secp521r1
+-----BEGIN PRIVATE KEY-----
+MGACAQAwEAYHKoZIzj0CAQYFK4EEACMESTBHAgEBBEIAbddDLMUWbAsY7l3vbNDmntXuAUcDYPg5
+w/cgUwSCIvrV9MBeSG8AWqT16riHmHlsn+XI5PAJM6eij3JDahnu9Mo=
+-----END PRIVATE KEY-----
 
-# ECC CDH Alice with Bob peer
-Derive=ALICE_cf_wap-wsg-idm-ecid-wtls4
-PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls4_PUB
-Ctrl=ecdh_cofactor_mode:1
-SharedSecret=008f3713fe1ff1fa5d5041899817d1
+PublicKey=BOB_zero_secp521r1_PUB
+-----BEGIN PUBLIC KEY-----
+MIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0g7J/qa1d8ENJsobtEb0CymeZIsa
+1Qiq0GiJb+4/jmFLxjBU1Xcr8Bpl1BLgvKqOll0vXTMtfzn4RtRArgAfT4c=
+-----END PUBLIC KEY-----
 
-# ECC CDH Bob with Alice peer
-Derive=BOB_cf_wap-wsg-idm-ecid-wtls4
-PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls4_PUB
-Ctrl=ecdh_cofactor_mode:1
-SharedSecret=008f3713fe1ff1fa5d5041899817d1
+# ECDH Alice with Bob peer
+Availablein = default
+Derive=ALICE_zero_secp521r1
+PeerKey=BOB_zero_secp521r1_PUB
+SharedSecret=003fc3028f61db94b20c7cd177923b6e73f12f0ab067c9ce8866755e3c82abb39c9863cde74fa80b32520bd7dd0eb156c30c08911503b67b2661f1264d09bb231423
 
-PublicKey=MALICE_cf_wap-wsg-idm-ecid-wtls4_PUB
+PrivateKey=ALICE_zero_wap-wsg-idm-ecid-wtls7
+-----BEGIN PRIVATE KEY-----
+MDMCAQAwEAYHKoZIzj0CAQYFZysBBAcEHDAaAgEBBBUAoGng7WzYr4P9vtdc3BS/UiNWmc0=
+-----END PRIVATE KEY-----
+
+PublicKey=BOB_zero_wap-wsg-idm-ecid-wtls7_PUB
 -----BEGIN PUBLIC KEY-----
-MDQwEAYHKoZIzj0CAQYFZysBBAQDIAAEAAAAAAAAAAAAAAAAAAAAAd+TqiBXnTd/lyA/OFsR
+MD4wEAYHKoZIzj0CAQYFZysBBAcDKgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAZtSBSZqfmXp47v5z2
+ZZZl2JFxDg==
 -----END PUBLIC KEY-----
 
-# ECC CDH Bob with Malice peer
-Derive=BOB_cf_wap-wsg-idm-ecid-wtls4
-PeerKey=MALICE_cf_wap-wsg-idm-ecid-wtls4_PUB
-Ctrl=ecdh_cofactor_mode:1
-Result=DERIVE_ERROR
-Reason=point at infinity
+# ECDH Alice with Bob peer
+Availablein = default
+Derive=ALICE_zero_wap-wsg-idm-ecid-wtls7
+PeerKey=BOB_zero_wap-wsg-idm-ecid-wtls7_PUB
+SharedSecret=6582fc03bbb340fcf24a5fe8fcdf722655efa8b9
 
-# ECC CDH Alice with Malice peer
-Derive=ALICE_cf_wap-wsg-idm-ecid-wtls4
-PeerKey=MALICE_cf_wap-wsg-idm-ecid-wtls4_PUB
-Ctrl=ecdh_cofactor_mode:1
-Result=DERIVE_ERROR
-Reason=point at infinity
+# tests: 14
 
-Title=wap-wsg-idm-ecid-wtls5 curve tests
+Title=prime192v1 curve tests
 
-PrivateKey=ALICE_cf_wap-wsg-idm-ecid-wtls5
+PrivateKey=ALICE_cf_prime192v1
 -----BEGIN PRIVATE KEY-----
-MDMCAQAwEAYHKoZIzj0CAQYFZysBBAUEHDAaAgEBBBUD9gVh3zbLTA7BuRVVi9T8QKZ1uco=
+MDkCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQEEHzAdAgEBBBhQFYLaobJ47BVWWZv/ByY8Ti69m/U9
+TeI=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls5_PUB
+PublicKey=ALICE_cf_prime192v1_PUB
 -----BEGIN PUBLIC KEY-----
-MEAwEAYHKoZIzj0CAQYFZysBBAUDLAAEAH5xyUrvbuN+tWmRhwqrQfFHPHNUBKtAGvJuvSFVwTKk
-uFzn9fPvIDe6
+MEkwEwYHKoZIzj0CAQYIKoZIzj0DAQEDMgAEHYbt14KzucSpmKMrlDx1IGz/a28nDs21OjKgx3BK
+PZ78UrllIr69kgrYUKsRg4sd
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls5:ALICE_cf_wap-wsg-idm-ecid-wtls5_PUB
+PrivPubKeyPair=ALICE_cf_prime192v1:ALICE_cf_prime192v1_PUB
 
-PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls5
+PrivateKey=BOB_cf_prime192v1
 -----BEGIN PRIVATE KEY-----
-MDMCAQAwEAYHKoZIzj0CAQYFZysBBAUEHDAaAgEBBBUAr9ZlmuO7bNfqB42xUivJXyVHKNI=
+MDkCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQEEHzAdAgEBBBhsbmKHAtygIqirkmUXSbniDJOx0/fI
+CWM=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls5_PUB
+PublicKey=BOB_cf_prime192v1_PUB
 -----BEGIN PUBLIC KEY-----
-MEAwEAYHKoZIzj0CAQYFZysBBAUDLAAEBdXxEk0L2XAVzRNLPcnMxGXXyDfZAoA1Qw2XpOfVWIVR
-jdoMGRgUuJmO
+MEkwEwYHKoZIzj0CAQYIKoZIzj0DAQEDMgAEJA+FQcXq5Axzv8pLDslxq1QVt1hjN2i0TgoO6Yxp
+bAekMot69VorE8ibSzgJixXJ
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls5:BOB_cf_wap-wsg-idm-ecid-wtls5_PUB
+PrivPubKeyPair=BOB_cf_prime192v1:BOB_cf_prime192v1_PUB
 
 # ECDH Alice with Bob peer
-Derive=ALICE_cf_wap-wsg-idm-ecid-wtls5
-PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls5_PUB
-SharedSecret=0190c68d80e94fbe9f193ae7d9a156bf0b8d097c23
+Availablein = default
+Derive=ALICE_cf_prime192v1
+PeerKey=BOB_cf_prime192v1_PUB
+SharedSecret=e36cad3b0f8d00f60f090440a76df47896713ae61421c354
 
 # ECDH Bob with Alice peer
-Derive=BOB_cf_wap-wsg-idm-ecid-wtls5
-PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls5_PUB
-SharedSecret=0190c68d80e94fbe9f193ae7d9a156bf0b8d097c23
+Availablein = default
+Derive=BOB_cf_prime192v1
+PeerKey=ALICE_cf_prime192v1_PUB
+SharedSecret=e36cad3b0f8d00f60f090440a76df47896713ae61421c354
 
-# ECC CDH Alice with Bob peer
-Derive=ALICE_cf_wap-wsg-idm-ecid-wtls5
-PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls5_PUB
-Ctrl=ecdh_cofactor_mode:1
-SharedSecret=00aabc9b45c200e41294aa922ab06da6655731e0ea
-
-# ECC CDH Bob with Alice peer
-Derive=BOB_cf_wap-wsg-idm-ecid-wtls5
-PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls5_PUB
-Ctrl=ecdh_cofactor_mode:1
-SharedSecret=00aabc9b45c200e41294aa922ab06da6655731e0ea
-
-PublicKey=MALICE_cf_wap-wsg-idm-ecid-wtls5_PUB
------BEGIN PUBLIC KEY-----
-MEAwEAYHKoZIzj0CAQYFZysBBAUDLAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC8JxepS05nN/piK
-dhDD3dDKXUih
------END PUBLIC KEY-----
-
-# ECC CDH Bob with Malice peer
-Derive=BOB_cf_wap-wsg-idm-ecid-wtls5
-PeerKey=MALICE_cf_wap-wsg-idm-ecid-wtls5_PUB
-Ctrl=ecdh_cofactor_mode:1
-Result=DERIVE_ERROR
-Reason=point at infinity
-
-# ECC CDH Alice with Malice peer
-Derive=ALICE_cf_wap-wsg-idm-ecid-wtls5
-PeerKey=MALICE_cf_wap-wsg-idm-ecid-wtls5_PUB
-Ctrl=ecdh_cofactor_mode:1
-Result=DERIVE_ERROR
-Reason=point at infinity
+# ECDH Bob with Alice peer : curves with less than 112 bits of strength cannot
+# be used for Key agreement in fips mode
+Availablein = fips
+Derive=BOB_cf_prime192v1
+Securitycheck = 1
+PeerKey=ALICE_cf_prime192v1_PUB
+SharedSecret=e36cad3b0f8d00f60f090440a76df47896713ae61421c354
+Result = DERIVE_SET_PEER_ERROR
 
-Title=wap-wsg-idm-ecid-wtls6 curve tests
+Title=prime256v1 curve tests
 
-PrivateKey=ALICE_cf_wap-wsg-idm-ecid-wtls6
+PrivateKey=ALICE_cf_prime256v1
 -----BEGIN PRIVATE KEY-----
-MCwCAQAwEAYHKoZIzj0CAQYFZysBBAYEFTATAgEBBA4ayMbswPbvYMwpwo80jA==
+MEECAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQcEJzAlAgEBBCDZE0NZiGAFJX6JQxumKTFRT+XFCQqJ
+gHCUxmU2fRcn9Q==
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls6_PUB
+PublicKey=ALICE_cf_prime256v1_PUB
 -----BEGIN PUBLIC KEY-----
-MDIwEAYHKoZIzj0CAQYFZysBBAYDHgAERPw/8Ip/RrXr0gMgLGRQeiQ4Qd6W+Li0ylGKzg==
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE5kDOrX6kmk1/jHfEdMBluFos6dyCbzKVOX3v2aa2
+y5IhlhTKtCJdydX+XWLDXWW9sbtIRNP94R3iOOpRPBqpGg==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls6:ALICE_cf_wap-wsg-idm-ecid-wtls6_PUB
+PrivPubKeyPair=ALICE_cf_prime256v1:ALICE_cf_prime256v1_PUB
 
-PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls6
+PrivateKey=BOB_cf_prime256v1
 -----BEGIN PRIVATE KEY-----
-MCwCAQAwEAYHKoZIzj0CAQYFZysBBAYEFTATAgEBBA6kbCpFt3tX2hYBQHMXbg==
+MEECAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQcEJzAlAgEBBCAxJgV1dLJw/o2Dmh1fIY1KpBd88WCP
+23wZzR8DzhyCrA==
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls6_PUB
+PublicKey=BOB_cf_prime256v1_PUB
 -----BEGIN PUBLIC KEY-----
-MDIwEAYHKoZIzj0CAQYFZysBBAYDHgAEhJXqpYGxE/l1X/LiBeyRbIcyzqPxUP5Tkv3U3w==
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE5J6yA+j0zrGi6RilUhjrcL7OUMzYTwpnw5DdRXr0
+creHgE03EFV//7xqadB4BDwFIGM9MV2sE6qREEomWhZFeg==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls6:BOB_cf_wap-wsg-idm-ecid-wtls6_PUB
+PrivPubKeyPair=BOB_cf_prime256v1:BOB_cf_prime256v1_PUB
 
 # ECDH Alice with Bob peer
-Derive=ALICE_cf_wap-wsg-idm-ecid-wtls6
-PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls6_PUB
-SharedSecret=b4cae255268f11a1e46fecad04c2
+Derive=ALICE_cf_prime256v1
+PeerKey=BOB_cf_prime256v1_PUB
+SharedSecret=ee63690b553dcd9bccb066137725f0489395a83f4d280f309339d606c969734a
 
 # ECDH Bob with Alice peer
-Derive=BOB_cf_wap-wsg-idm-ecid-wtls6
-PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls6_PUB
-SharedSecret=b4cae255268f11a1e46fecad04c2
+Derive=BOB_cf_prime256v1
+PeerKey=ALICE_cf_prime256v1_PUB
+SharedSecret=ee63690b553dcd9bccb066137725f0489395a83f4d280f309339d606c969734a
 
-Title=wap-wsg-idm-ecid-wtls7 curve tests
+Title=secp224r1 curve tests
 
-PrivateKey=ALICE_cf_wap-wsg-idm-ecid-wtls7
+PrivateKey=ALICE_cf_secp224r1
 -----BEGIN PRIVATE KEY-----
-MDMCAQAwEAYHKoZIzj0CAQYFZysBBAcEHDAaAgEBBBUABcyzh4ot9ck/j4/3ehK0aYngYoM=
+MDoCAQAwEAYHKoZIzj0CAQYFK4EEACEEIzAhAgEBBBzeo7Y0HMfrIqKNm3r997jcfVAa4osa0AR2
+JA28
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls7_PUB
+PublicKey=ALICE_cf_secp224r1_PUB
 -----BEGIN PUBLIC KEY-----
-MD4wEAYHKoZIzj0CAQYFZysBBAcDKgAEwQLnZ70n45RLqRtAGNzEa3Rl/9nwyjqYUtw2eeHhnNLT
-feGY4CNH0w==
+ME4wEAYHKoZIzj0CAQYFK4EEACEDOgAExZc6o84XjBGLOosGj2t0QctgiyzF3NcVgy+DeW7stkVs
+yS2tRzMPBpwnApRzoRsdJR99sb3eM2s=
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls7:ALICE_cf_wap-wsg-idm-ecid-wtls7_PUB
+PrivPubKeyPair=ALICE_cf_secp224r1:ALICE_cf_secp224r1_PUB
 
-PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls7
+PrivateKey=BOB_cf_secp224r1
 -----BEGIN PRIVATE KEY-----
-MDMCAQAwEAYHKoZIzj0CAQYFZysBBAcEHDAaAgEBBBUAPyrGRY1SR13hKQswS6yXs8w8PUQ=
+MDoCAQAwEAYHKoZIzj0CAQYFK4EEACEEIzAhAgEBBBy2LsqxHhdlSiAmMYKQAEmjJWT22T42GYKo
+ZvXM
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls7_PUB
+PublicKey=BOB_cf_secp224r1_PUB
 -----BEGIN PUBLIC KEY-----
-MD4wEAYHKoZIzj0CAQYFZysBBAcDKgAEZGN44YbN5r3zcNtOHrvbQLt8/lE7BHp4D/9eKLmwFDn1
-QneRu3xwPA==
+ME4wEAYHKoZIzj0CAQYFK4EEACEDOgAE71Eh6hwTKUrmyl2PdkY787GwxiohIcaqB4eK2Mwg6tU4
+LeJHWcgY18CgPKCaeldUgnkMcJzKj20=
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls7:BOB_cf_wap-wsg-idm-ecid-wtls7_PUB
+PrivPubKeyPair=BOB_cf_secp224r1:BOB_cf_secp224r1_PUB
 
 # ECDH Alice with Bob peer
-Derive=ALICE_cf_wap-wsg-idm-ecid-wtls7
-PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls7_PUB
-SharedSecret=ae9f5bcc6457c0422866bf855921eabc42b7121a
+Derive=ALICE_cf_secp224r1
+PeerKey=BOB_cf_secp224r1_PUB
+SharedSecret=29d8b75934d74d5153bbb94e0370437c63ecc30bf3d2800ed1cb7eb5
 
 # ECDH Bob with Alice peer
-Derive=BOB_cf_wap-wsg-idm-ecid-wtls7
-PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls7_PUB
-SharedSecret=ae9f5bcc6457c0422866bf855921eabc42b7121a
+Derive=BOB_cf_secp224r1
+PeerKey=ALICE_cf_secp224r1_PUB
+SharedSecret=29d8b75934d74d5153bbb94e0370437c63ecc30bf3d2800ed1cb7eb5
 
-Title=wap-wsg-idm-ecid-wtls8 curve tests
+Title=secp384r1 curve tests
 
-PrivateKey=ALICE_cf_wap-wsg-idm-ecid-wtls8
+PrivateKey=ALICE_cf_secp384r1
 -----BEGIN PRIVATE KEY-----
-MC0CAQAwEAYHKoZIzj0CAQYFZysBBAgEFjAUAgEBBA8AnkC18b3pH2O5TIYIqAQ=
+ME4CAQAwEAYHKoZIzj0CAQYFK4EEACIENzA1AgEBBDAp1ErG6wVjuJs90qVbUBxNpQK1wtV4ieX1
+bIU/4HssZK6WjOOTyYguyEBCOf/rUnw=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls8_PUB
+PublicKey=ALICE_cf_secp384r1_PUB
 -----BEGIN PUBLIC KEY-----
-MDIwEAYHKoZIzj0CAQYFZysBBAgDHgAEJD0h4HEfchwxqhp9eMHh9gczQKHX4MtWVoAxKQ==
+MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEx5rt+yujIuPoIXpHGmExKSi/P+58sGYoqgdpdOJUXzn2
+Rc4alCpSxVJeC55xvwaFHc3pzNyRGwnhPmN6oU/KMP6XjBvR4wq35mr/Sym5s0B2blAzkJU37idq
+nTi3xGHx
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls8:ALICE_cf_wap-wsg-idm-ecid-wtls8_PUB
+PrivPubKeyPair=ALICE_cf_secp384r1:ALICE_cf_secp384r1_PUB
 
-PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls8
+PrivateKey=BOB_cf_secp384r1
 -----BEGIN PRIVATE KEY-----
-MC0CAQAwEAYHKoZIzj0CAQYFZysBBAgEFjAUAgEBBA8AXxPMnqbl3rOuIM5nsvc=
+ME4CAQAwEAYHKoZIzj0CAQYFK4EEACIENzA1AgEBBDAUjVgPpiI+xXye0nfRhc8+12hLdWY4fpsO
+Jq2MCp+W85xJwtXsEPrHj1XFnKVpM4c=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls8_PUB
+PublicKey=BOB_cf_secp384r1_PUB
 -----BEGIN PUBLIC KEY-----
-MDIwEAYHKoZIzj0CAQYFZysBBAgDHgAEZawmRmzr9P+jihImUi6ykOzaSH484JhMKNdrgw==
+MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE+JUBXRSHixH0TrcvYvIzep7+/WNpEhWdCPsLMygigW5j
+pzP30MF41GnQYgfJu5wI/gu1C/jFTv1X6Dgmla3JxBYlPeD+1L0lEMT3evmHKMM/BFe3WKBuXyhP
+ilrNtfee
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls8:BOB_cf_wap-wsg-idm-ecid-wtls8_PUB
+PrivPubKeyPair=BOB_cf_secp384r1:BOB_cf_secp384r1_PUB
 
 # ECDH Alice with Bob peer
-Derive=ALICE_cf_wap-wsg-idm-ecid-wtls8
-PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls8_PUB
-SharedSecret=48baf4f1f5e8a0eb5dae28ef6290
+Derive=ALICE_cf_secp384r1
+PeerKey=BOB_cf_secp384r1_PUB
+SharedSecret=b3cfe488126e2731fb7c19f82e94fcc05e1dd303649a9257e858030b795c2d344a054b0c44a24fd7f5821f531a9b8cfb
 
 # ECDH Bob with Alice peer
-Derive=BOB_cf_wap-wsg-idm-ecid-wtls8
-PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls8_PUB
-SharedSecret=48baf4f1f5e8a0eb5dae28ef6290
+Derive=BOB_cf_secp384r1
+PeerKey=ALICE_cf_secp384r1_PUB
+SharedSecret=b3cfe488126e2731fb7c19f82e94fcc05e1dd303649a9257e858030b795c2d344a054b0c44a24fd7f5821f531a9b8cfb
 
-Title=wap-wsg-idm-ecid-wtls9 curve tests
+Title=secp521r1 curve tests
 
-PrivateKey=ALICE_cf_wap-wsg-idm-ecid-wtls9
+PrivateKey=ALICE_cf_secp521r1
 -----BEGIN PRIVATE KEY-----
-MDMCAQAwEAYHKoZIzj0CAQYFZysBBAkEHDAaAgEBBBUALwvuKs3RLthMAsChbqKjXw6vTYo=
+MGACAQAwEAYHKoZIzj0CAQYFK4EEACMESTBHAgEBBEIBsYIcUKeN2evB626LCdYWH/xzUiEDCdRP
+rEENsC8//dowKnOCtlLtawh0DXTIZ/HhpUREuaoffdsmYb6+Oq1TRjc=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_cf_wap-wsg-idm-ecid-wtls9_PUB
+PublicKey=ALICE_cf_secp521r1_PUB
 -----BEGIN PUBLIC KEY-----
-MD4wEAYHKoZIzj0CAQYFZysBBAkDKgAET0ppOvd9DU4v+tkKDQ5wRBrN1FwD9+F9t5l3Im+mz3rw
-DB/RYdZuUg==
+MIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQBufYxJf/4Ds6g7LlFRVS62ljm3xApV2T79hfWH8Lv
+iroIaCFjLBIfOVDF8jvj2PO1ar3yCLiSA2RiLZz1Y+tv/tcATHE0nS7l3SfGiGmEnVycEnhgqlKM
+UM3kpdd7eNkQn5/GO8KAPQqA/sOnvTavg5S01t0ub+PY/w0Y6oBgthaUAW0=
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=ALICE_cf_wap-wsg-idm-ecid-wtls9:ALICE_cf_wap-wsg-idm-ecid-wtls9_PUB
+PrivPubKeyPair=ALICE_cf_secp521r1:ALICE_cf_secp521r1_PUB
 
-PrivateKey=BOB_cf_wap-wsg-idm-ecid-wtls9
+PrivateKey=BOB_cf_secp521r1
 -----BEGIN PRIVATE KEY-----
-MDMCAQAwEAYHKoZIzj0CAQYFZysBBAkEHDAaAgEBBBUAgeb/vqEM7X5AAAxyBu3M+C8pWLM=
+MGACAQAwEAYHKoZIzj0CAQYFK4EEACMESTBHAgEBBEIB+3/adZnNwr6GFUzZpi8So7pC/5FYQ0+0
+lMmoUjGvy8DNADcHaPpW68hX/M+z7LrK0Jpnonb9JSEXlgjOPVe4Ea8=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_cf_wap-wsg-idm-ecid-wtls9_PUB
+PublicKey=BOB_cf_secp521r1_PUB
 -----BEGIN PUBLIC KEY-----
-MD4wEAYHKoZIzj0CAQYFZysBBAkDKgAEWc37LGt6lt90iF4lhtDYNFdjAqoczebuNgzGff/Uq8ov
-a3EVJ9yK1A==
+MIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQBLq2fjyCalnvr24tjaz87ijIWlLMoCH7Hmyq1t2l8
+PFbyBIZbngDC0gwFM5ZI582QSWlW79G3clJP9VxlJOsms50BYBYgd6o2JF4w8AnShVXxFSJU1py4
+klCDNhTFybRHFXpujfuUeNnFxAGIUb4edJ0fAqqc7kkERhYe8EPEZYMKp3Q=
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair=BOB_cf_wap-wsg-idm-ecid-wtls9:BOB_cf_wap-wsg-idm-ecid-wtls9_PUB
+PrivPubKeyPair=BOB_cf_secp521r1:BOB_cf_secp521r1_PUB
 
 # ECDH Alice with Bob peer
-Derive=ALICE_cf_wap-wsg-idm-ecid-wtls9
-PeerKey=BOB_cf_wap-wsg-idm-ecid-wtls9_PUB
-SharedSecret=948d3030e95cead39a1bb3d8a01c2be178517ba7
+Derive=ALICE_cf_secp521r1
+PeerKey=BOB_cf_secp521r1_PUB
+SharedSecret=01dd4aa9037bb4ad298b420998dcd32b3a9af1cda8b7919e372aeb4e54ccfb4d2409a340ed896bfbc5dd462f8d96b8784bc17b29db3ca04700e6ec752f9bec777695
 
 # ECDH Bob with Alice peer
-Derive=BOB_cf_wap-wsg-idm-ecid-wtls9
-PeerKey=ALICE_cf_wap-wsg-idm-ecid-wtls9_PUB
-SharedSecret=948d3030e95cead39a1bb3d8a01c2be178517ba7
-
-# tests: 484
+Derive=BOB_cf_secp521r1
+PeerKey=ALICE_cf_secp521r1_PUB
+SharedSecret=01dd4aa9037bb4ad298b420998dcd32b3a9af1cda8b7919e372aeb4e54ccfb4d2409a340ed896bfbc5dd462f8d96b8784bc17b29db3ca04700e6ec752f9bec777695
 
-Title=zero x-coord regression tests
+Title=sect163k1 curve tests
 
-PrivateKey=ALICE_zero_prime192v1
+PrivateKey=ALICE_cf_sect163k1
 -----BEGIN PRIVATE KEY-----
-MDkCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQEEHzAdAgEBBBhaPNk8jG5hSG6y8tUqUoOaNNsZ3APU
-pps=
+MDMCAQAwEAYHKoZIzj0CAQYFK4EEAAEEHDAaAgEBBBUB905PYfmej8LzbzX6Bg51GJzXQjQ=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_zero_prime192v1_PUB
+PublicKey=ALICE_cf_sect163k1_PUB
 -----BEGIN PUBLIC KEY-----
-MEkwEwYHKoZIzj0CAQYIKoZIzj0DAQEDMgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAe2hWBe5g
-DLNj216pEvK7XjoKLg5gNg8S
+MEAwEAYHKoZIzj0CAQYFK4EEAAEDLAAEBfvs5A1hD8YySP9O2ub8GEUfotVuBpfRx4GIHdAfx8wV
+1UVeTRnyAlWU
 -----END PUBLIC KEY-----
 
-# ECDH Alice with Bob peer
-Derive=ALICE_zero_prime192v1
-PeerKey=BOB_zero_prime192v1_PUB
-SharedSecret=baaffd49a8399d2ad52cbbe24d47b67afb4b3cf436f1cd65
+PrivPubKeyPair=ALICE_cf_sect163k1:ALICE_cf_sect163k1_PUB
 
-PrivateKey=ALICE_zero_prime192v2
+PrivateKey=BOB_cf_sect163k1
 -----BEGIN PRIVATE KEY-----
-MDkCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQIEHzAdAgEBBBj1AIQMJ7jqYIKCvxYAS+qKMmKmH0to
-41k=
+MDMCAQAwEAYHKoZIzj0CAQYFK4EEAAEEHDAaAgEBBBUCHPtCjJ4/K8ylQBcLlb5VE0bkaUE=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_zero_prime192v2_PUB
+PublicKey=BOB_cf_sect163k1_PUB
 -----BEGIN PUBLIC KEY-----
-MEkwEwYHKoZIzj0CAQYIKoZIzj0DAQIDMgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4Gj7Qqt
-2wx/jwFlKgvE4rnd50LspdMk
+MEAwEAYHKoZIzj0CAQYFK4EEAAEDLAAEBvgfX1mTRlt6Z4TE1D1MNWo4loH4AoeYa6oowK104LKk
+nsdg7isQ8XBD
 -----END PUBLIC KEY-----
 
+PrivPubKeyPair=BOB_cf_sect163k1:BOB_cf_sect163k1_PUB
+
 # ECDH Alice with Bob peer
-Derive=ALICE_zero_prime192v2
-PeerKey=BOB_zero_prime192v2_PUB
-SharedSecret=b8f200a4b87064f2e8600685ca3e69b8e661a117aabc770b
+Availablein = default
+Derive=ALICE_cf_sect163k1
+PeerKey=BOB_cf_sect163k1_PUB
+SharedSecret=04d0e40788c5ce5220818055277cae53eac55c1e6b
 
-PrivateKey=ALICE_zero_prime192v3
------BEGIN PRIVATE KEY-----
-MDkCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQMEHzAdAgEBBBh/maLQMSlea9BfLqGy5NPuK0YAH/cz
-GqI=
------END PRIVATE KEY-----
+# ECDH Bob with Alice peer
+Availablein = default
+Derive=BOB_cf_sect163k1
+PeerKey=ALICE_cf_sect163k1_PUB
+SharedSecret=04d0e40788c5ce5220818055277cae53eac55c1e6b
 
-PublicKey=BOB_zero_prime192v3_PUB
+# ECC CDH Alice with Bob peer
+Availablein = default
+Derive=ALICE_cf_sect163k1
+PeerKey=BOB_cf_sect163k1_PUB
+Ctrl=ecdh_cofactor_mode:1
+SharedSecret=04c902a91110244d89110034dd2b099c49cbab6c77
+
+# ECC CDH Bob with Alice peer
+Availablein = default
+Derive=BOB_cf_sect163k1
+PeerKey=ALICE_cf_sect163k1_PUB
+Ctrl=ecdh_cofactor_mode:1
+SharedSecret=04c902a91110244d89110034dd2b099c49cbab6c77
+
+PublicKey=MALICE_cf_sect163k1_PUB
 -----BEGIN PUBLIC KEY-----
-MEkwEwYHKoZIzj0CAQYIKoZIzj0DAQMDMgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZEzb63e2
-3MKatRLR9Y1M5JEdI9jwMocI
+MEAwEAYHKoZIzj0CAQYFK4EEAAEDLAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAB
 -----END PUBLIC KEY-----
 
-# ECDH Alice with Bob peer
-Derive=ALICE_zero_prime192v3
-PeerKey=BOB_zero_prime192v3_PUB
-SharedSecret=b5de857d355bc5b9e270a4c290ea9728d764d8b243ff5d8d
+# ECC CDH Bob with Malice peer
+Availablein = default
+Derive=BOB_cf_sect163k1
+PeerKey=MALICE_cf_sect163k1_PUB
+Ctrl=ecdh_cofactor_mode:1
+Result=DERIVE_ERROR
+Reason=point at infinity
 
-PrivateKey=ALICE_zero_prime239v1
+# ECC CDH Alice with Malice peer
+Availablein = default
+Derive=ALICE_cf_sect163k1
+PeerKey=MALICE_cf_sect163k1_PUB
+Ctrl=ecdh_cofactor_mode:1
+Result=DERIVE_ERROR
+Reason=point at infinity
+
+Title=sect163r2 curve tests
+
+PrivateKey=ALICE_cf_sect163r2
 -----BEGIN PRIVATE KEY-----
-MD8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQQEJTAjAgEBBB5pYWzRYI+c6O7NXCt0H2kw8XRL3rhe
-4MrJT8j++CI=
+MDMCAQAwEAYHKoZIzj0CAQYFK4EEAA8EHDAaAgEBBBUBjCs/M3N31jsAueYrOq21vdETwAI=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_zero_prime239v1_PUB
+PublicKey=ALICE_cf_sect163r2_PUB
 -----BEGIN PUBLIC KEY-----
-MFUwEwYHKoZIzj0CAQYIKoZIzj0DAQQDPgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-Ox02uwNNLFuvDRn5ip8TxvW0W22R7UzJa9Av6/nh
+MEAwEAYHKoZIzj0CAQYFK4EEAA8DLAAEBd8Z1/HpA+89hF4I98EST3svWns3BAEbhWmL/fgxk2uu
+YwVrmqhgqH/C
 -----END PUBLIC KEY-----
 
+PrivPubKeyPair=ALICE_cf_sect163r2:ALICE_cf_sect163r2_PUB
+
+PrivateKey=BOB_cf_sect163r2
+-----BEGIN PRIVATE KEY-----
+MDMCAQAwEAYHKoZIzj0CAQYFK4EEAA8EHDAaAgEBBBUBsiouT9Df+mwHWrpPg1JSrY9nqlI=
+-----END PRIVATE KEY-----
+
+PublicKey=BOB_cf_sect163r2_PUB
+-----BEGIN PUBLIC KEY-----
+MEAwEAYHKoZIzj0CAQYFK4EEAA8DLAAEBULqBZ+nhLhDEMYY8NEEzZ126MdxAcFXWv8zmPEH9505
+8vT5zU3aq6HV
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair=BOB_cf_sect163r2:BOB_cf_sect163r2_PUB
+
 # ECDH Alice with Bob peer
-Derive=ALICE_zero_prime239v1
-PeerKey=BOB_zero_prime239v1_PUB
-SharedSecret=6b6206408bd05d42daa2cd224c401a1230b44e184f17b82f385f22dac215
+Availablein = default
+Derive=ALICE_cf_sect163r2
+PeerKey=BOB_cf_sect163r2_PUB
+SharedSecret=019f829a53c4e6544bdec1395a23082169efaf369d
 
-PrivateKey=ALICE_zero_prime239v2
+# ECDH Bob with Alice peer
+Availablein = default
+Derive=BOB_cf_sect163r2
+PeerKey=ALICE_cf_sect163r2_PUB
+SharedSecret=019f829a53c4e6544bdec1395a23082169efaf369d
+
+# ECC CDH Alice with Bob peer
+Availablein = default
+Derive=ALICE_cf_sect163r2
+PeerKey=BOB_cf_sect163r2_PUB
+Ctrl=ecdh_cofactor_mode:1
+SharedSecret=048870d39235ecbc16a000ee478833509b9318a53f
+
+# ECC CDH Bob with Alice peer
+Availablein = default
+Derive=BOB_cf_sect163r2
+PeerKey=ALICE_cf_sect163r2_PUB
+Ctrl=ecdh_cofactor_mode:1
+SharedSecret=048870d39235ecbc16a000ee478833509b9318a53f
+
+PublicKey=MALICE_cf_sect163r2_PUB
+-----BEGIN PUBLIC KEY-----
+MEAwEAYHKoZIzj0CAQYFK4EEAA8DLAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsJbhbrfiSdZPSHD
+ZtqJwDlp802l
+-----END PUBLIC KEY-----
+
+# ECC CDH Bob with Malice peer
+Availablein = default
+Derive=BOB_cf_sect163r2
+PeerKey=MALICE_cf_sect163r2_PUB
+Ctrl=ecdh_cofactor_mode:1
+Result=DERIVE_ERROR
+Reason=point at infinity
+
+# ECC CDH Alice with Malice peer
+Availablein = default
+Derive=ALICE_cf_sect163r2
+PeerKey=MALICE_cf_sect163r2_PUB
+Ctrl=ecdh_cofactor_mode:1
+Result=DERIVE_ERROR
+Reason=point at infinity
+
+Title=sect233k1 curve tests
+
+PrivateKey=ALICE_cf_sect233k1
 -----BEGIN PRIVATE KEY-----
-MD8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQUEJTAjAgEBBB5l8bB7Cpmr7vyx9FiOT2wEF3YOFbDG
-bmRr3Vi/xr4=
+MDsCAQAwEAYHKoZIzj0CAQYFK4EEABoEJDAiAgEBBB0z/3heNFjJL+2sAT/38yRsN3kt2iXz7u+y
+Gua8Kw==
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_zero_prime239v2_PUB
+PublicKey=ALICE_cf_sect233k1_PUB
 -----BEGIN PUBLIC KEY-----
-MFUwEwYHKoZIzj0CAQYIKoZIzj0DAQUDPgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-IOg3VJGQ89d1GWg4Igxcj5xpDmJiP8tv+e4mxt5U
+MFIwEAYHKoZIzj0CAQYFK4EEABoDPgAEALQyn0zJmOrHm4S2EIjxRe899PadBnfpYjLKWGvpAIzf
+MEG861Nv1IYJkmkO1xlfNHeeRtqFgsQVFKZh
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair=ALICE_cf_sect233k1:ALICE_cf_sect233k1_PUB
+
+PrivateKey=BOB_cf_sect233k1
+-----BEGIN PRIVATE KEY-----
+MDsCAQAwEAYHKoZIzj0CAQYFK4EEABoEJDAiAgEBBB1I0ucrC4d9i6Z+0cbar5r7uKpF5iiQkSJA
+DFMTUA==
+-----END PRIVATE KEY-----
+
+PublicKey=BOB_cf_sect233k1_PUB
+-----BEGIN PUBLIC KEY-----
+MFIwEAYHKoZIzj0CAQYFK4EEABoDPgAEAatdqazxSghJ568CBFyMXhEvVeAiLewOY/jk9H5DAOB4
+ufNGbdd131KLaKPivB38a6n5Y+2BVSJangow
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair=BOB_cf_sect233k1:BOB_cf_sect233k1_PUB
+
+# ECDH Alice with Bob peer
+Derive=ALICE_cf_sect233k1
+PeerKey=BOB_cf_sect233k1_PUB
+SharedSecret=012145026e8de65973c154e085456fc5539ba9e25663e7f5816abfcab310
+
+# ECDH Bob with Alice peer
+Derive=BOB_cf_sect233k1
+PeerKey=ALICE_cf_sect233k1_PUB
+SharedSecret=012145026e8de65973c154e085456fc5539ba9e25663e7f5816abfcab310
+
+# ECC CDH Alice with Bob peer
+Derive=ALICE_cf_sect233k1
+PeerKey=BOB_cf_sect233k1_PUB
+Ctrl=ecdh_cofactor_mode:1
+SharedSecret=00ff7d6c6b80f39d2ae68fbd00adbcd75fa599ed0bc1aac0e3f49c1c164d
+
+# ECC CDH Bob with Alice peer
+Derive=BOB_cf_sect233k1
+PeerKey=ALICE_cf_sect233k1_PUB
+Ctrl=ecdh_cofactor_mode:1
+SharedSecret=00ff7d6c6b80f39d2ae68fbd00adbcd75fa599ed0bc1aac0e3f49c1c164d
+
+PublicKey=MALICE_cf_sect233k1_PUB
+-----BEGIN PUBLIC KEY-----
+MFIwEAYHKoZIzj0CAQYFK4EEABoDPgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+-----END PUBLIC KEY-----
+
+# ECC CDH Bob with Malice peer
+Derive=BOB_cf_sect233k1
+PeerKey=MALICE_cf_sect233k1_PUB
+Ctrl=ecdh_cofactor_mode:1
+Result=DERIVE_ERROR
+Reason=point at infinity
+
+# ECC CDH Alice with Malice peer
+Derive=ALICE_cf_sect233k1
+PeerKey=MALICE_cf_sect233k1_PUB
+Ctrl=ecdh_cofactor_mode:1
+Result=DERIVE_ERROR
+Reason=point at infinity
+
+Title=sect233r1 curve tests
+
+PrivateKey=ALICE_cf_sect233r1
+-----BEGIN PRIVATE KEY-----
+MDwCAQAwEAYHKoZIzj0CAQYFK4EEABsEJTAjAgEBBB4ATcy7zVpIsJ9rl5EIDmzRz5wxjrDIQyDm
+HP3Pt8Y=
+-----END PRIVATE KEY-----
+
+PublicKey=ALICE_cf_sect233r1_PUB
+-----BEGIN PUBLIC KEY-----
+MFIwEAYHKoZIzj0CAQYFK4EEABsDPgAEAQMQHiJ44LiCnZkEg1zyww1h+idTbsw8E07P33WUAUfD
+NeQ4hWEhTXPnytIbEhFKpnd3j/FbyZnJqxh8
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair=ALICE_cf_sect233r1:ALICE_cf_sect233r1_PUB
+
+PrivateKey=BOB_cf_sect233r1
+-----BEGIN PRIVATE KEY-----
+MDwCAQAwEAYHKoZIzj0CAQYFK4EEABsEJTAjAgEBBB4ALpOlFn4OfiIAkRAZGOsn7L6W3XoQBSV8
+mQVC2pw=
+-----END PRIVATE KEY-----
+
+PublicKey=BOB_cf_sect233r1_PUB
+-----BEGIN PUBLIC KEY-----
+MFIwEAYHKoZIzj0CAQYFK4EEABsDPgAEAJQw+NWqFJXYw4dVMovzvw76OYnYOTaDaEPNW8ECAQbl
+TzzbBSTp5iqM13mP0/Bo4OO66NS3lA9e/GTO
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair=BOB_cf_sect233r1:BOB_cf_sect233r1_PUB
+
+# ECDH Alice with Bob peer
+Derive=ALICE_cf_sect233r1
+PeerKey=BOB_cf_sect233r1_PUB
+SharedSecret=00209d2995a63f1e8b7a5c33dee5abb602e32e1835ae8bb57eb264d8d795
+
+# ECDH Bob with Alice peer
+Derive=BOB_cf_sect233r1
+PeerKey=ALICE_cf_sect233r1_PUB
+SharedSecret=00209d2995a63f1e8b7a5c33dee5abb602e32e1835ae8bb57eb264d8d795
+
+# ECC CDH Alice with Bob peer
+Derive=ALICE_cf_sect233r1
+PeerKey=BOB_cf_sect233r1_PUB
+Ctrl=ecdh_cofactor_mode:1
+SharedSecret=00c3cd1d38a65f5e421399409a76cec1136bc84149f054a7f55e7980c612
+
+# ECC CDH Bob with Alice peer
+Derive=BOB_cf_sect233r1
+PeerKey=ALICE_cf_sect233r1_PUB
+Ctrl=ecdh_cofactor_mode:1
+SharedSecret=00c3cd1d38a65f5e421399409a76cec1136bc84149f054a7f55e7980c612
+
+PublicKey=MALICE_cf_sect233r1_PUB
+-----BEGIN PUBLIC KEY-----
+MFIwEAYHKoZIzj0CAQYFK4EEABsDPgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYf4
+Vie5eHTnR+4x4G1xyq7qUvISU+X5RtBh2pE4
+-----END PUBLIC KEY-----
+
+# ECC CDH Bob with Malice peer
+Derive=BOB_cf_sect233r1
+PeerKey=MALICE_cf_sect233r1_PUB
+Ctrl=ecdh_cofactor_mode:1
+Result=DERIVE_ERROR
+Reason=point at infinity
+
+# ECC CDH Alice with Malice peer
+Derive=ALICE_cf_sect233r1
+PeerKey=MALICE_cf_sect233r1_PUB
+Ctrl=ecdh_cofactor_mode:1
+Result=DERIVE_ERROR
+Reason=point at infinity
+
+Title=sect283k1 curve tests
+
+PrivateKey=ALICE_cf_sect283k1
+-----BEGIN PRIVATE KEY-----
+MEICAQAwEAYHKoZIzj0CAQYFK4EEABAEKzApAgEBBCQAY1Mi9rST7PiP1t03qYRczV/kSZ+VjQu8
+5EFCgxyvkaLManw=
+-----END PRIVATE KEY-----
+
+PublicKey=ALICE_cf_sect283k1_PUB
+-----BEGIN PUBLIC KEY-----
+MF4wEAYHKoZIzj0CAQYFK4EEABADSgAEBMjBO8WoxHS/vz8po52WZGxS+RK5yolrUe6tfbAMA3Sd
+5/JjBDVjOz95vM4gUnqzUWHN5nKBQtj6HiU9Q/R+zqg98OiQKTyA
 -----END PUBLIC KEY-----
 
-# ECDH Alice with Bob peer
-Derive=ALICE_zero_prime239v2
-PeerKey=BOB_zero_prime239v2_PUB
-SharedSecret=772c2819c960c78f28f21f6542b7409294fad1f84567c44c4b7678dc0e42
+PrivPubKeyPair=ALICE_cf_sect283k1:ALICE_cf_sect283k1_PUB
+
+PrivateKey=BOB_cf_sect283k1
+-----BEGIN PRIVATE KEY-----
+MEICAQAwEAYHKoZIzj0CAQYFK4EEABAEKzApAgEBBCQBCZC8Is+YSjgXJBBDioEl6gu14QpGHllD
+1J6957vBTPSQdH0=
+-----END PRIVATE KEY-----
+
+PublicKey=BOB_cf_sect283k1_PUB
+-----BEGIN PUBLIC KEY-----
+MF4wEAYHKoZIzj0CAQYFK4EEABADSgAEAGEQKZVHYAlvtjHrFyZVm12qUb5j+T5/WNoC962+kwUM
+QkBYA5BpuG8Knlugq1iB31whPAgRCZfdLKHpHRPJSfXvKyUIdeUm
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair=BOB_cf_sect283k1:BOB_cf_sect283k1_PUB
+
+# ECDH Alice with Bob peer
+Derive=ALICE_cf_sect283k1
+PeerKey=BOB_cf_sect283k1_PUB
+SharedSecret=03f67c88bdc230b43773d17fdb4d0a980556d074ceccee726932160e4ed965e3be72803c
+
+# ECDH Bob with Alice peer
+Derive=BOB_cf_sect283k1
+PeerKey=ALICE_cf_sect283k1_PUB
+SharedSecret=03f67c88bdc230b43773d17fdb4d0a980556d074ceccee726932160e4ed965e3be72803c
+
+# ECC CDH Alice with Bob peer
+Derive=ALICE_cf_sect283k1
+PeerKey=BOB_cf_sect283k1_PUB
+Ctrl=ecdh_cofactor_mode:1
+SharedSecret=0677ba01c84d139609ca145cb5b6079fc9ca67f59c9c913e47cad1073f1d1dfaddde0169
+
+# ECC CDH Bob with Alice peer
+Derive=BOB_cf_sect283k1
+PeerKey=ALICE_cf_sect283k1_PUB
+Ctrl=ecdh_cofactor_mode:1
+SharedSecret=0677ba01c84d139609ca145cb5b6079fc9ca67f59c9c913e47cad1073f1d1dfaddde0169
+
+PublicKey=MALICE_cf_sect283k1_PUB
+-----BEGIN PUBLIC KEY-----
+MF4wEAYHKoZIzj0CAQYFK4EEABADSgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB
+-----END PUBLIC KEY-----
+
+# ECC CDH Bob with Malice peer
+Derive=BOB_cf_sect283k1
+PeerKey=MALICE_cf_sect283k1_PUB
+Ctrl=ecdh_cofactor_mode:1
+Result=DERIVE_ERROR
+Reason=point at infinity
+
+# ECC CDH Alice with Malice peer
+Derive=ALICE_cf_sect283k1
+PeerKey=MALICE_cf_sect283k1_PUB
+Ctrl=ecdh_cofactor_mode:1
+Result=DERIVE_ERROR
+Reason=point at infinity
+
+Title=sect283r1 curve tests
+
+PrivateKey=ALICE_cf_sect283r1
+-----BEGIN PRIVATE KEY-----
+MEICAQAwEAYHKoZIzj0CAQYFK4EEABEEKzApAgEBBCQCQ5pqKvPxDysd1pi2Bv8Z11cFhsRZfuaf
+4Pi0hpGr4ubZcHE=
+-----END PRIVATE KEY-----
+
+PublicKey=ALICE_cf_sect283r1_PUB
+-----BEGIN PUBLIC KEY-----
+MF4wEAYHKoZIzj0CAQYFK4EEABEDSgAEBcsrGDgO7pbGybQX/00gRHtQq3+X9XrGb7Uzv9Nabwc/
+kntnBMF0I2KU+aaTjQx1GVtmNf7CvFwPLEBnfKjJAjekjsGyIqoq
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair=ALICE_cf_sect283r1:ALICE_cf_sect283r1_PUB
+
+PrivateKey=BOB_cf_sect283r1
+-----BEGIN PRIVATE KEY-----
+MEICAQAwEAYHKoZIzj0CAQYFK4EEABEEKzApAgEBBCQDxItnY3cDCrX/jGnVuAKDPaySZCr3E83Q
+UdFnP6YIykt7+Pg=
+-----END PRIVATE KEY-----
+
+PublicKey=BOB_cf_sect283r1_PUB
+-----BEGIN PUBLIC KEY-----
+MF4wEAYHKoZIzj0CAQYFK4EEABEDSgAEBJ2C9BCkX0YRfs2ufgUKvreUXFWp2AGK+iHlZB4N3LqO
+PKpmAkrAeCMty6mw2mEnOR5HA1d4Ee+z7/NJgJJ80Ra9bFnreOW3
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair=BOB_cf_sect283r1:BOB_cf_sect283r1_PUB
+
+# ECDH Alice with Bob peer
+Derive=ALICE_cf_sect283r1
+PeerKey=BOB_cf_sect283r1_PUB
+SharedSecret=0424259cf09727574fb863cab7c27d8fe3835e96433110a45a951f94347fc81939ec4773
+
+# ECDH Bob with Alice peer
+Derive=BOB_cf_sect283r1
+PeerKey=ALICE_cf_sect283r1_PUB
+SharedSecret=0424259cf09727574fb863cab7c27d8fe3835e96433110a45a951f94347fc81939ec4773
+
+# ECC CDH Alice with Bob peer
+Derive=ALICE_cf_sect283r1
+PeerKey=BOB_cf_sect283r1_PUB
+Ctrl=ecdh_cofactor_mode:1
+SharedSecret=01c2a542654ce85b17456ed75b6bca6b6eb761580913670debc426a3525f236df0e875c8
+
+# ECC CDH Bob with Alice peer
+Derive=BOB_cf_sect283r1
+PeerKey=ALICE_cf_sect283r1_PUB
+Ctrl=ecdh_cofactor_mode:1
+SharedSecret=01c2a542654ce85b17456ed75b6bca6b6eb761580913670debc426a3525f236df0e875c8
+
+PublicKey=MALICE_cf_sect283r1_PUB
+-----BEGIN PUBLIC KEY-----
+MF4wEAYHKoZIzj0CAQYFK4EEABEDSgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAByvMnFeSsevoGYMIn7b4NaL9IgowRCTKF8CCrhdEKu3pubP2
+-----END PUBLIC KEY-----
+
+# ECC CDH Bob with Malice peer
+Derive=BOB_cf_sect283r1
+PeerKey=MALICE_cf_sect283r1_PUB
+Ctrl=ecdh_cofactor_mode:1
+Result=DERIVE_ERROR
+Reason=point at infinity
+
+# ECC CDH Alice with Malice peer
+Derive=ALICE_cf_sect283r1
+PeerKey=MALICE_cf_sect283r1_PUB
+Ctrl=ecdh_cofactor_mode:1
+Result=DERIVE_ERROR
+Reason=point at infinity
+
+Title=sect409k1 curve tests
+
+PrivateKey=ALICE_cf_sect409k1
+-----BEGIN PRIVATE KEY-----
+MFECAQAwEAYHKoZIzj0CAQYFK4EEACQEOjA4AgEBBDMOthcLahkXFgM0wjOzm767D1A72sFRGlhb
+bVH+EB7z2WpIcPX4OD+M4Y1pf/a7wSaoSAo=
+-----END PRIVATE KEY-----
+
+PublicKey=ALICE_cf_sect409k1_PUB
+-----BEGIN PUBLIC KEY-----
+MH4wEAYHKoZIzj0CAQYFK4EEACQDagAEAbiYYpeFgCMsZFMzQaiwMJDrC+mCMT7KmhYtD5EMMgLW
+5OvhaqYdpRf49A8LOtVcRT7J5gGcMrXQgmQeS3FenA5owWnB2NIgrTNf5d8AAEtrOupsJ4c3kL6e
+aAzayZ1+UCEj8skbC9U=
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair=ALICE_cf_sect409k1:ALICE_cf_sect409k1_PUB
+
+PrivateKey=BOB_cf_sect409k1
+-----BEGIN PRIVATE KEY-----
+MFECAQAwEAYHKoZIzj0CAQYFK4EEACQEOjA4AgEBBDMO43ldQllTewdZwffH4OEXdzBrLwabKsn4
+6/hjgIAaYda/pt4yCEQLMp18QgtfMey5ENI=
+-----END PRIVATE KEY-----
+
+PublicKey=BOB_cf_sect409k1_PUB
+-----BEGIN PUBLIC KEY-----
+MH4wEAYHKoZIzj0CAQYFK4EEACQDagAEAVTQj6hRizVmOx4Z6vroN/zMkmAY+QhkQ0CnFeJ0AydY
+Fv+f+/420vMC1Mhqsc9VzPMmIAH6ZrgGKDsd4Ce9JUtYE0rVhGeiG2RaN1U5RlhVK4avkWhFlyQ5
+vuu4aApQiWE3yQd9v/I=
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair=BOB_cf_sect409k1:BOB_cf_sect409k1_PUB
+
+# ECDH Alice with Bob peer
+Derive=ALICE_cf_sect409k1
+PeerKey=BOB_cf_sect409k1_PUB
+SharedSecret=01fbe13188588c9d1ac3a8a2680ea9a009b28e4b7d7fa4efcb1a22553876fb7973616819fd87c75e5b8ce6e3628595e4ce12edb0
+
+# ECDH Bob with Alice peer
+Derive=BOB_cf_sect409k1
+PeerKey=ALICE_cf_sect409k1_PUB
+SharedSecret=01fbe13188588c9d1ac3a8a2680ea9a009b28e4b7d7fa4efcb1a22553876fb7973616819fd87c75e5b8ce6e3628595e4ce12edb0
+
+# ECC CDH Alice with Bob peer
+Derive=ALICE_cf_sect409k1
+PeerKey=BOB_cf_sect409k1_PUB
+Ctrl=ecdh_cofactor_mode:1
+SharedSecret=007e9485f7234bb2255bb40e51f4be867cb0ef31f8e489a697b31b51c4d5346daaee51e96ae6f9636e6e3af56095fe28755325ee
+
+# ECC CDH Bob with Alice peer
+Derive=BOB_cf_sect409k1
+PeerKey=ALICE_cf_sect409k1_PUB
+Ctrl=ecdh_cofactor_mode:1
+SharedSecret=007e9485f7234bb2255bb40e51f4be867cb0ef31f8e489a697b31b51c4d5346daaee51e96ae6f9636e6e3af56095fe28755325ee
+
+PublicKey=MALICE_cf_sect409k1_PUB
+-----BEGIN PUBLIC KEY-----
+MH4wEAYHKoZIzj0CAQYFK4EEACQDagAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAA=
+-----END PUBLIC KEY-----
+
+# ECC CDH Bob with Malice peer
+Derive=BOB_cf_sect409k1
+PeerKey=MALICE_cf_sect409k1_PUB
+Ctrl=ecdh_cofactor_mode:1
+Result=DERIVE_ERROR
+Reason=point at infinity
+
+# ECC CDH Alice with Malice peer
+Derive=ALICE_cf_sect409k1
+PeerKey=MALICE_cf_sect409k1_PUB
+Ctrl=ecdh_cofactor_mode:1
+Result=DERIVE_ERROR
+Reason=point at infinity
+
+Title=sect409r1 curve tests
 
-PrivateKey=ALICE_zero_prime239v3
+PrivateKey=ALICE_cf_sect409r1
 -----BEGIN PRIVATE KEY-----
-MD8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQYEJTAjAgEBBB5HF5FABzUOTYMZg9UdZTx/oRERm/fU
-M/+otKzpLjA=
+MFICAQAwEAYHKoZIzj0CAQYFK4EEACUEOzA5AgEBBDQAxSC9lST5dtfXQI1Ug9VMMoue3GGni5ON
++gieyXK2KKbd29KAPs4/AOd8kX2wQDsZPO7E
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_zero_prime239v3_PUB
+PublicKey=ALICE_cf_sect409r1_PUB
 -----BEGIN PUBLIC KEY-----
-MFUwEwYHKoZIzj0CAQYIKoZIzj0DAQYDPgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AsZ4u6r3qQI78EYBpiSgWjqNpoeShjr5piecMBWj
+MH4wEAYHKoZIzj0CAQYFK4EEACUDagAEASAvXAM15DJerAu1JttpBuMJK1/fEfFohu2iEpt3r7Ui
+iQoER6HUsWiw1hhcJyTv7WzpJQHFWrOlJMe/KjmQa/CygSc65YHDzG27oUL+KGdQUGc79ZRSwl/q
+fGZqa3D+bDVMwrhmZto=
 -----END PUBLIC KEY-----
 
-# ECDH Alice with Bob peer
-Derive=ALICE_zero_prime239v3
-PeerKey=BOB_zero_prime239v3_PUB
-SharedSecret=56a71f5dd1611e8032c3e2d8224d86e5e8c2fc6480d74c0e282282decd43
+PrivPubKeyPair=ALICE_cf_sect409r1:ALICE_cf_sect409r1_PUB
 
-PrivateKey=ALICE_zero_prime256v1
+PrivateKey=BOB_cf_sect409r1
 -----BEGIN PRIVATE KEY-----
-MEECAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQcEJzAlAgEBBCDXhMb6aR4JR2+l2tmgYqP0r8S4jtym
-yH++awvF2nGhhg==
+MFICAQAwEAYHKoZIzj0CAQYFK4EEACUEOzA5AgEBBDQARen+1P3JQzBgOv0pUYwsZTPRVLpqqDAU
+7mKL2lk9eH7zSGmtNoMvP2m1S2dBnXxFY/bV
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_zero_prime256v1_PUB
+PublicKey=BOB_cf_sect409r1_PUB
 -----BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AABmSFx4Di+D1yQzvV2EoGu2VBwq8x2uhxcov4VqF0+T9A==
+MH4wEAYHKoZIzj0CAQYFK4EEACUDagAEAbDUw066TtdfOpDvrlKosEyqUNEG7rY+AKvDqKw+HOzf
+sUTYee6cEf71oqJ1sCKPQiYzlwCu/HLQeWPxISE6Uo+53kkeJml2xpMBwoE25Gq/DSS61dR7SRTZ
++sUmumbIuGzbrjtMRmw=
 -----END PUBLIC KEY-----
 
+PrivPubKeyPair=BOB_cf_sect409r1:BOB_cf_sect409r1_PUB
+
 # ECDH Alice with Bob peer
-Derive=ALICE_zero_prime256v1
-PeerKey=BOB_zero_prime256v1_PUB
-SharedSecret=c4f5607deb8501f1a4ba23fce4122a4343a17ada2c86a9c8e0d03d92d4a4c84c
+Derive=ALICE_cf_sect409r1
+PeerKey=BOB_cf_sect409r1_PUB
+SharedSecret=00a751259cdb3b445ce71a40a01a2189dfce70226111190505fc6eabe4e5a05bff7af55f2015e1ffcab6aea7ea9a6e74905da2a1
 
-PrivateKey=ALICE_zero_secp112r2
------BEGIN PRIVATE KEY-----
-MCwCAQAwEAYHKoZIzj0CAQYFK4EEAAcEFTATAgEBBA4hh3tRkG3tnA0496ffMw==
------END PRIVATE KEY-----
+# ECDH Bob with Alice peer
+Derive=BOB_cf_sect409r1
+PeerKey=ALICE_cf_sect409r1_PUB
+SharedSecret=00a751259cdb3b445ce71a40a01a2189dfce70226111190505fc6eabe4e5a05bff7af55f2015e1ffcab6aea7ea9a6e74905da2a1
 
-PublicKey=BOB_zero_secp112r2_PUB
+# ECC CDH Alice with Bob peer
+Derive=ALICE_cf_sect409r1
+PeerKey=BOB_cf_sect409r1_PUB
+Ctrl=ecdh_cofactor_mode:1
+SharedSecret=0115a31aed416c5089d74a263ec300aff13a5329c6ad27de950ae0b0917b40a3464fccf5691ac9633a51e5177a82b15cfc434aad
+
+# ECC CDH Bob with Alice peer
+Derive=BOB_cf_sect409r1
+PeerKey=ALICE_cf_sect409r1_PUB
+Ctrl=ecdh_cofactor_mode:1
+SharedSecret=0115a31aed416c5089d74a263ec300aff13a5329c6ad27de950ae0b0917b40a3464fccf5691ac9633a51e5177a82b15cfc434aad
+
+PublicKey=MALICE_cf_sect409r1_PUB
 -----BEGIN PUBLIC KEY-----
-MDIwEAYHKoZIzj0CAQYFK4EEAAcDHgAEAAAAAAAAAAAAAAAAAAAS5eEOWDV/Wk7w4djyDQ==
+MH4wEAYHKoZIzj0CAQYFK4EEACUDagAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAACZNffkdo7i7yL5tKKfU8tdk6su0K185XwbJkn96JWVDPZXZ3My
+bFKKSOJ7hyrM8Lwl1e8=
 -----END PUBLIC KEY-----
 
-# ECDH Alice with Bob peer
-Derive=ALICE_zero_secp112r2
-PeerKey=BOB_zero_secp112r2_PUB
-SharedSecret=958cc1cb425713678830a4d7d95e
+# ECC CDH Bob with Malice peer
+Derive=BOB_cf_sect409r1
+PeerKey=MALICE_cf_sect409r1_PUB
+Ctrl=ecdh_cofactor_mode:1
+Result=DERIVE_ERROR
+Reason=point at infinity
 
-PrivateKey=ALICE_zero_secp128r1
+# ECC CDH Alice with Malice peer
+Derive=ALICE_cf_sect409r1
+PeerKey=MALICE_cf_sect409r1_PUB
+Ctrl=ecdh_cofactor_mode:1
+Result=DERIVE_ERROR
+Reason=point at infinity
+
+Title=sect571k1 curve tests
+
+PrivateKey=ALICE_cf_sect571k1
 -----BEGIN PRIVATE KEY-----
-MC4CAQAwEAYHKoZIzj0CAQYFK4EEABwEFzAVAgEBBBCykSzic/h3T2K6SkSP1SGt
+MGYCAQAwEAYHKoZIzj0CAQYFK4EEACYETzBNAgEBBEgB4agvk7Qdf9bVb9aMVdtXL0MuVw6dTleB
+zrpPMYty/piI5GWkQEGVp4OJSjF1BGgWmtYSYlV0oI8jJ7hfWTjVGfVWix4ipb8=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_zero_secp128r1_PUB
+PublicKey=ALICE_cf_sect571k1_PUB
 -----BEGIN PUBLIC KEY-----
-MDYwEAYHKoZIzj0CAQYFK4EEABwDIgAEAAAAAAAAAAAAAAAAAAAAAABya8M5aeOpNG3z799IdHc=
+MIGnMBAGByqGSM49AgEGBSuBBAAmA4GSAAQDUZq0ZrgYpTXNpOptjExaur0K9FAYHv1j9cvAptwX
+dcmQf3VqekMkGZCfNdqNeqCajG3QHRkBHe4FZhWr3FXi8whvvr463lUDf+t46un1kE6FTYfhILGa
+sBZm7OdfkarYd9TXBbmnkFA+XkyPlkM1+6daM3/WmnegK+TYghFDXLgwiyF8s0ElllF7z38Gmc4=
 -----END PUBLIC KEY-----
 
-# ECDH Alice with Bob peer
-Derive=ALICE_zero_secp128r1
-PeerKey=BOB_zero_secp128r1_PUB
-SharedSecret=5235d452066f126cd7e99eea00fd3068
+PrivPubKeyPair=ALICE_cf_sect571k1:ALICE_cf_sect571k1_PUB
 
-PrivateKey=ALICE_zero_secp160r1
+PrivateKey=BOB_cf_sect571k1
 -----BEGIN PRIVATE KEY-----
-MDMCAQAwEAYHKoZIzj0CAQYFK4EEAAgEHDAaAgEBBBUACoRnbig69XLlh5VcRexpbbn5zwA=
+MGYCAQAwEAYHKoZIzj0CAQYFK4EEACYETzBNAgEBBEgA3pINxGOI7L9M+Mil+bm/udPwI4xu7ubJ
+p3aoOepTXW94laf8wjFLcQnRUwH87Vbq9VLQEfCAFvr2vZoBc+5asnNuDhRNNeQ=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_zero_secp160r1_PUB
+PublicKey=BOB_cf_sect571k1_PUB
 -----BEGIN PUBLIC KEY-----
-MD4wEAYHKoZIzj0CAQYFK4EEAAgDKgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAG/w1po29wYlxlygXs
-MGfbiGg5ng==
+MIGnMBAGByqGSM49AgEGBSuBBAAmA4GSAAQDZRr5GCSq2uzGxmWNB+bED7zye18Rr/KehwXrbn1r
+rKtR8fe+dg2V15FieC3qZe/wCpMtyp79VmEabGi6iGLlAN/rUE81URsA/K7GVpmklslV5gmwryR0
+3E7jGKPFesun9iNtmpgM18P9y3aJd4Qr4hMlwW2Nyw187l6QB/W2e/i+8vKXFTLHlz5WLAyAcpA=
 -----END PUBLIC KEY-----
 
+PrivPubKeyPair=BOB_cf_sect571k1:BOB_cf_sect571k1_PUB
+
 # ECDH Alice with Bob peer
-Derive=ALICE_zero_secp160r1
-PeerKey=BOB_zero_secp160r1_PUB
-SharedSecret=9ccd0ab8d093b6acdb3fe14c3736a0dfe61a4666
+Derive=ALICE_cf_sect571k1
+PeerKey=BOB_cf_sect571k1_PUB
+SharedSecret=02b79c92cee50dc5b9fdddce36d4fa2e28d7d178cd74e575961f39429496305b38815c840c2e66327435c044ed885ec964068531251a2112717602532e8b6d5411db2fe05c1ac18c
 
-PrivateKey=ALICE_zero_secp160r2
------BEGIN PRIVATE KEY-----
-MDMCAQAwEAYHKoZIzj0CAQYFK4EEAB4EHDAaAgEBBBUAQFGxInSw1eAvd45E9TUdbXtJGnA=
------END PRIVATE KEY-----
+# ECDH Bob with Alice peer
+Derive=BOB_cf_sect571k1
+PeerKey=ALICE_cf_sect571k1_PUB
+SharedSecret=02b79c92cee50dc5b9fdddce36d4fa2e28d7d178cd74e575961f39429496305b38815c840c2e66327435c044ed885ec964068531251a2112717602532e8b6d5411db2fe05c1ac18c
 
-PublicKey=BOB_zero_secp160r2_PUB
+# ECC CDH Alice with Bob peer
+Derive=ALICE_cf_sect571k1
+PeerKey=BOB_cf_sect571k1_PUB
+Ctrl=ecdh_cofactor_mode:1
+SharedSecret=063aea789492c9727a5a6b7f24e8d3d377c70ee8e86b13664e191a53b1905e90e78b85960b1881db5160c7c5cacca0d686d9e104140d565eeeec17426f93d3a7ba639ecd716b43d2
+
+# ECC CDH Bob with Alice peer
+Derive=BOB_cf_sect571k1
+PeerKey=ALICE_cf_sect571k1_PUB
+Ctrl=ecdh_cofactor_mode:1
+SharedSecret=063aea789492c9727a5a6b7f24e8d3d377c70ee8e86b13664e191a53b1905e90e78b85960b1881db5160c7c5cacca0d686d9e104140d565eeeec17426f93d3a7ba639ecd716b43d2
+
+PublicKey=MALICE_cf_sect571k1_PUB
 -----BEGIN PUBLIC KEY-----
-MD4wEAYHKoZIzj0CAQYFK4EEAB4DKgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAZtSBSZqfmXp47v5z2
-ZZZl2JFxDg==
+MIGnMBAGByqGSM49AgEGBSuBBAAmA4GSAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE=
 -----END PUBLIC KEY-----
 
-# ECDH Alice with Bob peer
-Derive=ALICE_zero_secp160r2
-PeerKey=BOB_zero_secp160r2_PUB
-SharedSecret=303e0a282ac86f463fe834cb51b0057be42ed5ab
+# ECC CDH Bob with Malice peer
+Derive=BOB_cf_sect571k1
+PeerKey=MALICE_cf_sect571k1_PUB
+Ctrl=ecdh_cofactor_mode:1
+Result=DERIVE_ERROR
+Reason=point at infinity
 
-PrivateKey=ALICE_zero_secp384r1
+# ECC CDH Alice with Malice peer
+Derive=ALICE_cf_sect571k1
+PeerKey=MALICE_cf_sect571k1_PUB
+Ctrl=ecdh_cofactor_mode:1
+Result=DERIVE_ERROR
+Reason=point at infinity
+
+Title=sect571r1 curve tests
+
+PrivateKey=ALICE_cf_sect571r1
 -----BEGIN PRIVATE KEY-----
-ME4CAQAwEAYHKoZIzj0CAQYFK4EEACIENzA1AgEBBDD6kgzKbg28zbQyVTdC0IdHbm0UCQt2Rdbi
-VVHJeYRSnNpFOiFLaOsGOmwoeZzj6jc=
+MGYCAQAwEAYHKoZIzj0CAQYFK4EEACcETzBNAgEBBEgAxfL2/gUsmJonvDMR95Azq1ySgXMlKSRk
++PL+WaS92ZyOo45HaC7RpH5sdkf4b948u6y1BXOxGZuORXy6lgbgZ1Zx2UgL3cI=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_zero_secp384r1_PUB
+PublicKey=ALICE_cf_sect571r1_PUB
 -----BEGIN PUBLIC KEY-----
-MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAPPme8E9RpepjC6P5+WDdWToUyb45/SvSFdO0sIqq+Gu/kn8sRuUqsG+3
-QriFDlIe
+MIGnMBAGByqGSM49AgEGBSuBBAAnA4GSAAQBK5L9ccIWacU2A1srZ35opPu6kcbEOsBPmvj/rlMS
+fFrdMOcagOYfcD0/ouYHPhvkHbr9k87IlQJfnV6ZNRA4PmWSp/FjkNwETm/fqTCUQHti/qqnKH7R
+Ed4fYROLFGvz+PX6E20SryOt1vrmoRyC7Z5FVmgMVOQQ1AaBNAHi3+IPtKx41YdXdbqHJxuI5jE=
 -----END PUBLIC KEY-----
 
-# ECDH Alice with Bob peer
-Derive=ALICE_zero_secp384r1
-PeerKey=BOB_zero_secp384r1_PUB
-SharedSecret=b1cfeaeef51dfd487d3a8b2849f1592e04d63f2d2c88b310a6290ebfe5399f5ffe954eabd0619231393e56c35b242986
+PrivPubKeyPair=ALICE_cf_sect571r1:ALICE_cf_sect571r1_PUB
 
-PrivateKey=ALICE_zero_secp521r1
+PrivateKey=BOB_cf_sect571r1
 -----BEGIN PRIVATE KEY-----
-MGACAQAwEAYHKoZIzj0CAQYFK4EEACMESTBHAgEBBEIAbddDLMUWbAsY7l3vbNDmntXuAUcDYPg5
-w/cgUwSCIvrV9MBeSG8AWqT16riHmHlsn+XI5PAJM6eij3JDahnu9Mo=
+MGYCAQAwEAYHKoZIzj0CAQYFK4EEACcETzBNAgEBBEgAzcRvASPpWi0ybpOGlj0Lozz01C2a5oDA
+G5alib1EmZKcpVULxJXn75FQlTKpkUEuWUgA4yk5X5DTiScUuh4LDhaF3AFhsEY=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_zero_secp521r1_PUB
+PublicKey=BOB_cf_sect571r1_PUB
 -----BEGIN PUBLIC KEY-----
-MIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0g7J/qa1d8ENJsobtEb0CymeZIsa
-1Qiq0GiJb+4/jmFLxjBU1Xcr8Bpl1BLgvKqOll0vXTMtfzn4RtRArgAfT4c=
+MIGnMBAGByqGSM49AgEGBSuBBAAnA4GSAAQH3dnL22NajtqDWTX6qD14w1BOlpHFBUPTr24VySlh
+kiiBlOF95u7hFr/hSb7gm/3f+IVKyE18Sh2kR4KaxWcPWKY5xKTiqiICT7hCistuzNRt8gR+kNOT
+c1rETMV6ZruZinwzEWWWjwJf6612oy2HG3CX3B8Rm+a3sS0q6IzowEwqmDv6v9bMTFk8bsCv0Fk=
 -----END PUBLIC KEY-----
 
+PrivPubKeyPair=BOB_cf_sect571r1:BOB_cf_sect571r1_PUB
+
 # ECDH Alice with Bob peer
-Derive=ALICE_zero_secp521r1
-PeerKey=BOB_zero_secp521r1_PUB
-SharedSecret=003fc3028f61db94b20c7cd177923b6e73f12f0ab067c9ce8866755e3c82abb39c9863cde74fa80b32520bd7dd0eb156c30c08911503b67b2661f1264d09bb231423
+Derive=ALICE_cf_sect571r1
+PeerKey=BOB_cf_sect571r1_PUB
+SharedSecret=0031f9879fa75b8c67ba81ee861be634e2b53aa79f834e9a8ca4df7f4461bcb02f083d9fa5b4767f881a710caa6524b58eb626623ba394961d46535204c26d165089e7d4f7be1827
 
-PrivateKey=ALICE_zero_wap-wsg-idm-ecid-wtls7
------BEGIN PRIVATE KEY-----
-MDMCAQAwEAYHKoZIzj0CAQYFZysBBAcEHDAaAgEBBBUAoGng7WzYr4P9vtdc3BS/UiNWmc0=
------END PRIVATE KEY-----
+# ECDH Bob with Alice peer
+Derive=BOB_cf_sect571r1
+PeerKey=ALICE_cf_sect571r1_PUB
+SharedSecret=0031f9879fa75b8c67ba81ee861be634e2b53aa79f834e9a8ca4df7f4461bcb02f083d9fa5b4767f881a710caa6524b58eb626623ba394961d46535204c26d165089e7d4f7be1827
 
-PublicKey=BOB_zero_wap-wsg-idm-ecid-wtls7_PUB
+# ECC CDH Alice with Bob peer
+Derive=ALICE_cf_sect571r1
+PeerKey=BOB_cf_sect571r1_PUB
+Ctrl=ecdh_cofactor_mode:1
+SharedSecret=012e8c2c1554988fe20c5ae7d11cdcfe15c7c6e8d2b6f46a43a45d724bfc7b415ea7594d5c16f770a95d6e65bbcb1f34619db95e89f4fecbcb0bc6a3f92d52df6a49b0e7773e0ac0
+
+# ECC CDH Bob with Alice peer
+Derive=BOB_cf_sect571r1
+PeerKey=ALICE_cf_sect571r1_PUB
+Ctrl=ecdh_cofactor_mode:1
+SharedSecret=012e8c2c1554988fe20c5ae7d11cdcfe15c7c6e8d2b6f46a43a45d724bfc7b415ea7594d5c16f770a95d6e65bbcb1f34619db95e89f4fecbcb0bc6a3f92d52df6a49b0e7773e0ac0
+
+PublicKey=MALICE_cf_sect571r1_PUB
 -----BEGIN PUBLIC KEY-----
-MD4wEAYHKoZIzj0CAQYFZysBBAcDKgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAZtSBSZqfmXp47v5z2
-ZZZl2JFxDg==
+MIGnMBAGByqGSM49AgEGBSuBBAAnA4GSAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHMtVWZAwgtd1zmgWN/9WC
+aNQcWRNUKesEHXqhJVkC5jYsSACodKsLYFNrWEYM0gwG8DQONZSn93G+38EM45tkaZsIRDt2HEM=
 -----END PUBLIC KEY-----
 
-# ECDH Alice with Bob peer
-Derive=ALICE_zero_wap-wsg-idm-ecid-wtls7
-PeerKey=BOB_zero_wap-wsg-idm-ecid-wtls7_PUB
-SharedSecret=6582fc03bbb340fcf24a5fe8fcdf722655efa8b9
+# ECC CDH Bob with Malice peer
+Derive=BOB_cf_sect571r1
+PeerKey=MALICE_cf_sect571r1_PUB
+Ctrl=ecdh_cofactor_mode:1
+Result=DERIVE_ERROR
+Reason=point at infinity
 
-# tests: 14
+# ECC CDH Alice with Malice peer
+Derive=ALICE_cf_sect571r1
+PeerKey=MALICE_cf_sect571r1_PUB
+Ctrl=ecdh_cofactor_mode:1
+Result=DERIVE_ERROR
+Reason=point at infinity