Add 'fips-securitychecks' option and plumb this into the actual fips checks
authorShane Lontis <shane.lontis@oracle.com>
Fri, 4 Sep 2020 07:55:28 +0000 (17:55 +1000)
committerMatt Caswell <matt@openssl.org>
Fri, 18 Sep 2020 13:20:39 +0000 (14:20 +0100)
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/12745)

22 files changed:
Configure
providers/common/build.info
providers/common/check_fips.c [deleted file]
providers/common/digest_to_nid.c
providers/common/include/prov/securitycheck.h [moved from providers/common/include/prov/check.h with 86% similarity]
providers/common/securitycheck.c [new file with mode: 0644]
providers/common/securitycheck_default.c [moved from providers/common/check_default.c with 62% similarity]
providers/common/securitycheck_fips.c [new file with mode: 0644]
providers/implementations/asymciphers/rsa_enc.c
providers/implementations/exchange/dh_exch.c
providers/implementations/exchange/ecdh_exch.c
providers/implementations/signature/dsa.c
providers/implementations/signature/ecdsa.c
providers/implementations/signature/rsa.c
test/evp_test.c
test/recipes/15-test_rsaoaep.t
test/recipes/30-test_evp_data/evppkey_dsa.txt
test/recipes/30-test_evp_data/evppkey_ecc.txt
test/recipes/30-test_evp_data/evppkey_ecdh.txt
test/recipes/30-test_evp_data/evppkey_ecdsa.txt
test/recipes/30-test_evp_data/evppkey_kas.txt
test/recipes/30-test_evp_data/evppkey_rsa_common.txt

index eeb88f6..22c0ecd 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -421,6 +421,7 @@ my @disablables = (
     "external-tests",
     "filenames",
     "fips",
+    "fips-securitychecks",
     "fuzz-libfuzzer",
     "fuzz-afl",
     "gost",
index 1e0ea4e..2179b2a 100644 (file)
@@ -1,6 +1,7 @@
 SUBDIRS=der
 
 SOURCE[../libcommon.a]=provider_err.c provider_ctx.c
-$FIPSCOMMON=provider_util.c capabilities.c bio_prov.c digest_to_nid.c
-SOURCE[../libnonfips.a]=$FIPSCOMMON nid_to_name.c check_default.c
-SOURCE[../libfips.a]=$FIPSCOMMON check_fips.c
+$FIPSCOMMON=provider_util.c capabilities.c bio_prov.c digest_to_nid.c\
+            securitycheck.c
+SOURCE[../libnonfips.a]=$FIPSCOMMON nid_to_name.c securitycheck_default.c
+SOURCE[../libfips.a]=$FIPSCOMMON securitycheck_fips.c
diff --git a/providers/common/check_fips.c b/providers/common/check_fips.c
deleted file mode 100644 (file)
index 891df49..0000000
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright 2020 The OpenSSL Project Authors. All Rights Reserved.
- *
- * Licensed under the Apache License 2.0 (the "License").  You may not use
- * this file except in compliance with the License.  You can obtain a copy
- * in the file LICENSE in the source distribution or at
- * https://www.openssl.org/source/license.html
- */
-
-#include "internal/deprecated.h"
-
-#include <openssl/rsa.h>
-#include <openssl/dsa.h>
-#include <openssl/dh.h>
-#include <openssl/ec.h>
-#include <openssl/err.h>
-#include <openssl/core_names.h>
-#include <openssl/obj_mac.h>
-#include "prov/check.h"
-#include "prov/providercommonerr.h"
-
-/*
- * FIPS requires a minimum security strength of 112 bits (for encryption or
- * signing), and for legacy purposes 80 bits (for decryption or verifying).
- * Set protect = 1 for encryption or signing operations, or 0 otherwise. See
- * https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-131Ar2.pdf.
- */
-int rsa_check_key(const RSA *rsa, int protect)
-{
-    int sz = RSA_bits(rsa);
-
-    return protect ? (sz >= 2048) : (sz >= 1024);
-}
-
-#ifndef OPENSSL_NO_EC
-/*
- * In FIPS mode:
- * protect should be 1 for any operations that need 112 bits of security
- * strength (such as signing, and key exchange), or 0 for operations that allow
- * a lower security strength (such as verify).
- *
- * For ECDH key agreement refer to SP800-56A
- * https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-56Ar3.pdf
- * "Appendix D"
- *
- * For ECDSA signatures refer to
- * https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-131Ar2.pdf
- * "Table 2"
- */
-int ec_check_key(const EC_KEY *ec, int protect)
-{
-    int nid, strength;
-    const char *curve_name;
-    const EC_GROUP *group = EC_KEY_get0_group(ec);
-
-    if (group == NULL) {
-        ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_CURVE, "No group");
-        return 0;
-    }
-    nid = EC_GROUP_get_curve_name(group);
-    if (nid == NID_undef) {
-        ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_CURVE,
-                       "Explicit curves are not allowed in fips mode");
-        return 0;
-    }
-
-    curve_name = EC_curve_nid2nist(nid);
-    if (curve_name == NULL) {
-        ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_CURVE,
-                       "Curve %s is not approved in FIPS mode", curve_name);
-        return 0;
-    }
-
-    /*
-     * For EC the security strength is the (order_bits / 2)
-     * e.g. P-224 is 112 bits.
-     */
-    strength = EC_GROUP_order_bits(group) / 2;
-    /* The min security strength allowed for legacy verification is 80 bits */
-    if (strength < 80) {
-        ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_CURVE);
-        return 0;
-    }
-
-    /*
-     * For signing or key agreement only allow curves with at least 112 bits of
-     * security strength
-     */
-    if (protect && strength < 112) {
-        ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_CURVE,
-                       "Curve %s cannot be used for signing", curve_name);
-        return 0;
-    }
-    return 1;
-}
-#endif /* OPENSSL_NO_EC */
-
-#ifndef OPENSSL_NO_DSA
-/*
- * Check for valid key sizes if fips mode. Refer to
- * https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-131Ar2.pdf
- * "Table 2"
- */
-int dsa_check_key(const DSA *dsa, int sign)
-{
-    size_t L, N;
-    const BIGNUM *p, *q;
-
-    if (dsa == NULL)
-        return 0;
-
-    p = DSA_get0_p(dsa);
-    q = DSA_get0_q(dsa);
-    if (p == NULL || q == NULL)
-        return 0;
-
-    L = BN_num_bits(p);
-    N = BN_num_bits(q);
-
-    /*
-     * Valid sizes or verification - Note this could be a fips186-2 type
-     * key - so we allow 512 also. When this is no longer suppported the
-     * lower bound should be increased to 1024.
-     */
-    if (!sign)
-        return (L >= 512 && N >= 160);
-
-     /* Valid sizes for both sign and verify */
-    if (L == 2048 && (N == 224 || N == 256))
-        return 1;
-    return (L == 3072 && N == 256);
-}
-#endif /* OPENSSL_NO_DSA */
-
-#ifndef OPENSSL_NO_DH
-/*
- * For DH key agreement refer to SP800-56A
- * https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-56Ar3.pdf
- * "Section 5.5.1.1FFC Domain Parameter Selection/Generation" and
- * "Appendix D" FFC Safe-prime Groups
- */
-int dh_check_key(const DH *dh)
-{
-    size_t L, N;
-    const BIGNUM *p, *q;
-
-    if (dh == NULL)
-        return 0;
-
-    p = DH_get0_p(dh);
-    q = DH_get0_q(dh);
-    if (p == NULL || q == NULL)
-        return 0;
-
-    L = BN_num_bits(p);
-    if (L < 2048)
-        return 0;
-
-    /* If it is a safe prime group then it is ok */
-    if (DH_get_nid(dh))
-        return 1;
-
-    /* If not then it must be FFC, which only allows certain sizes. */
-    N = BN_num_bits(q);
-
-    return (L == 2048 && (N == 224 || N == 256));
-}
-#endif /* OPENSSL_NO_DH */
-
-int digest_get_approved_nid_with_sha1(const EVP_MD *md, int sha1_allowed)
-{
-    int mdnid = digest_get_approved_nid(md);
-
-    if (mdnid == NID_sha1 && !sha1_allowed)
-        mdnid = NID_undef;
-
-    return mdnid;
-}
-
-int digest_is_allowed(const EVP_MD *md)
-{
-    return (digest_get_approved_nid(md) != NID_undef);
-}
-
-int digest_rsa_sign_get_md_nid(const EVP_MD *md, int sha1_allowed)
-{
-    return digest_get_approved_nid_with_sha1(md, sha1_allowed);
-}
index e233ce4..99633c1 100644 (file)
@@ -11,7 +11,7 @@
 #include <openssl/core_names.h>
 #include <openssl/evp.h>
 #include <openssl/core.h>
-#include "prov/check.h"
+#include "prov/securitycheck.h"
 #include "internal/nelem.h"
 
 /*
similarity index 86%
rename from providers/common/include/prov/check.h
rename to providers/common/include/prov/securitycheck.h
index 3042584..0d3b9e8 100644 (file)
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-/* Functions that have different implementations for the FIPS_MODULE */
+/* Functions that are common */
 int rsa_check_key(const RSA *rsa, int protect);
 int ec_check_key(const EC_KEY *ec, int protect);
 int dsa_check_key(const DSA *dsa, int sign);
@@ -15,8 +15,11 @@ int dh_check_key(const DH *dh);
 
 int digest_is_allowed(const EVP_MD *md);
 int digest_get_approved_nid_with_sha1(const EVP_MD *md, int sha1_allowed);
-int digest_rsa_sign_get_md_nid(const EVP_MD *md, ossl_unused int sha1_allowed);
 
 /* Functions that are common */
 int digest_md_to_nid(const EVP_MD *md, const OSSL_ITEM *it, size_t it_len);
 int digest_get_approved_nid(const EVP_MD *md);
+
+/* Functions that have different implementations for the FIPS_MODULE */
+int digest_rsa_sign_get_md_nid(const EVP_MD *md, int sha1_allowed);
+int securitycheck_enabled(void);
diff --git a/providers/common/securitycheck.c b/providers/common/securitycheck.c
new file mode 100644 (file)
index 0000000..624843e
--- /dev/null
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#include "internal/deprecated.h"
+
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
+#include <openssl/dh.h>
+#include <openssl/ec.h>
+#include <openssl/err.h>
+#include <openssl/core_names.h>
+#include <openssl/obj_mac.h>
+#include "prov/securitycheck.h"
+#include "prov/providercommonerr.h"
+
+/*
+ * FIPS requires a minimum security strength of 112 bits (for encryption or
+ * signing), and for legacy purposes 80 bits (for decryption or verifying).
+ * Set protect = 1 for encryption or signing operations, or 0 otherwise. See
+ * https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-131Ar2.pdf.
+ */
+int rsa_check_key(const RSA *rsa, int protect)
+{
+#if !defined(OPENSSL_NO_FIPS_SECURITYCHECKS)
+    if (securitycheck_enabled()) {
+        int sz = RSA_bits(rsa);
+
+        return protect ? (sz >= 2048) : (sz >= 1024);
+    }
+#endif /* OPENSSL_NO_FIPS_SECURITYCHECKS */
+    return 1;
+}
+
+#ifndef OPENSSL_NO_EC
+/*
+ * In FIPS mode:
+ * protect should be 1 for any operations that need 112 bits of security
+ * strength (such as signing, and key exchange), or 0 for operations that allow
+ * a lower security strength (such as verify).
+ *
+ * For ECDH key agreement refer to SP800-56A
+ * https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-56Ar3.pdf
+ * "Appendix D"
+ *
+ * For ECDSA signatures refer to
+ * https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-131Ar2.pdf
+ * "Table 2"
+ */
+int ec_check_key(const EC_KEY *ec, int protect)
+{
+# if !defined(OPENSSL_NO_FIPS_SECURITYCHECKS)
+    if (securitycheck_enabled()) {
+        int nid, strength;
+        const char *curve_name;
+        const EC_GROUP *group = EC_KEY_get0_group(ec);
+
+        if (group == NULL) {
+            ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_CURVE, "No group");
+            return 0;
+        }
+        nid = EC_GROUP_get_curve_name(group);
+        if (nid == NID_undef) {
+            ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_CURVE,
+                           "Explicit curves are not allowed in fips mode");
+            return 0;
+        }
+
+        curve_name = EC_curve_nid2nist(nid);
+        if (curve_name == NULL) {
+            ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_CURVE,
+                           "Curve %s is not approved in FIPS mode", curve_name);
+            return 0;
+        }
+
+        /*
+         * For EC the security strength is the (order_bits / 2)
+         * e.g. P-224 is 112 bits.
+         */
+        strength = EC_GROUP_order_bits(group) / 2;
+        /* The min security strength allowed for legacy verification is 80 bits */
+        if (strength < 80) {
+            ERR_raise(ERR_LIB_PROV, PROV_R_INVALID_CURVE);
+            return 0;
+        }
+
+        /*
+         * For signing or key agreement only allow curves with at least 112 bits of
+         * security strength
+         */
+        if (protect && strength < 112) {
+            ERR_raise_data(ERR_LIB_PROV, PROV_R_INVALID_CURVE,
+                           "Curve %s cannot be used for signing", curve_name);
+            return 0;
+        }
+    }
+# endif /* OPENSSL_NO_FIPS_SECURITYCHECKS */
+    return 1;
+}
+#endif /* OPENSSL_NO_EC */
+
+#ifndef OPENSSL_NO_DSA
+/*
+ * Check for valid key sizes if fips mode. Refer to
+ * https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-131Ar2.pdf
+ * "Table 2"
+ */
+int dsa_check_key(const DSA *dsa, int sign)
+{
+# if !defined(OPENSSL_NO_FIPS_SECURITYCHECKS)
+    if (securitycheck_enabled()) {
+        size_t L, N;
+        const BIGNUM *p, *q;
+
+        if (dsa == NULL)
+            return 0;
+
+        p = DSA_get0_p(dsa);
+        q = DSA_get0_q(dsa);
+        if (p == NULL || q == NULL)
+            return 0;
+
+        L = BN_num_bits(p);
+        N = BN_num_bits(q);
+
+        /*
+         * Valid sizes or verification - Note this could be a fips186-2 type
+         * key - so we allow 512 also. When this is no longer suppported the
+         * lower bound should be increased to 1024.
+         */
+        if (!sign)
+            return (L >= 512 && N >= 160);
+
+         /* Valid sizes for both sign and verify */
+        if (L == 2048 && (N == 224 || N == 256))
+            return 1;
+        return (L == 3072 && N == 256);
+    }
+# endif /* OPENSSL_NO_FIPS_SECURITYCHECKS */
+    return 1;
+}
+#endif /* OPENSSL_NO_DSA */
+
+#ifndef OPENSSL_NO_DH
+/*
+ * For DH key agreement refer to SP800-56A
+ * https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-56Ar3.pdf
+ * "Section 5.5.1.1FFC Domain Parameter Selection/Generation" and
+ * "Appendix D" FFC Safe-prime Groups
+ */
+int dh_check_key(const DH *dh)
+{
+# if !defined(OPENSSL_NO_FIPS_SECURITYCHECKS)
+    if (securitycheck_enabled()) {
+        size_t L, N;
+        const BIGNUM *p, *q;
+
+        if (dh == NULL)
+            return 0;
+
+        p = DH_get0_p(dh);
+        q = DH_get0_q(dh);
+        if (p == NULL || q == NULL)
+            return 0;
+
+        L = BN_num_bits(p);
+        if (L < 2048)
+            return 0;
+
+        /* If it is a safe prime group then it is ok */
+        if (DH_get_nid(dh))
+            return 1;
+
+        /* If not then it must be FFC, which only allows certain sizes. */
+        N = BN_num_bits(q);
+
+        return (L == 2048 && (N == 224 || N == 256));
+    }
+# endif /* OPENSSL_NO_FIPS_SECURITYCHECKS */
+    return 1;
+}
+#endif /* OPENSSL_NO_DH */
+
+int digest_get_approved_nid_with_sha1(const EVP_MD *md, int sha1_allowed)
+{
+    int mdnid = digest_get_approved_nid(md);
+
+# if !defined(OPENSSL_NO_FIPS_SECURITYCHECKS)
+    if (securitycheck_enabled()) {
+        if (mdnid == NID_sha1 && !sha1_allowed)
+            mdnid = NID_undef;
+    }
+# endif /* OPENSSL_NO_FIPS_SECURITYCHECKS */
+    return mdnid;
+}
+
+int digest_is_allowed(const EVP_MD *md)
+{
+# if !defined(OPENSSL_NO_FIPS_SECURITYCHECKS)
+    if (securitycheck_enabled())
+        return (digest_get_approved_nid(md) != NID_undef);
+# endif /* OPENSSL_NO_FIPS_SECURITYCHECKS */
+    return 1;
+}
similarity index 62%
rename from providers/common/check_default.c
rename to providers/common/securitycheck_default.c
index 2bfa690..e88b642 100644 (file)
 #include <openssl/core.h>
 #include <openssl/core_names.h>
 #include <openssl/obj_mac.h>
-#include "prov/check.h"
+#include "prov/securitycheck.h"
 #include "internal/nelem.h"
 
-int rsa_check_key(ossl_unused const RSA *rsa, ossl_unused int protect)
+/* Disable the security checks in the default provider */
+int securitycheck_enabled(void)
 {
-    return 1;
-}
-
-#ifndef OPENSSL_NO_EC
-int ec_check_key(ossl_unused const EC_KEY *ec, ossl_unused int protect)
-{
-    return 1;
-}
-#endif
-
-#ifndef OPENSSL_NO_DSA
-int dsa_check_key(ossl_unused const DSA *dsa, ossl_unused int sign)
-{
-    return 1;
-}
-#endif
-
-#ifndef OPENSSL_NO_DH
-int dh_check_key(const DH *dh)
-{
-    return 1;
-}
-#endif
-
-int digest_is_allowed(ossl_unused const EVP_MD *md)
-{
-    return 1;
-}
-
-int digest_get_approved_nid_with_sha1(const EVP_MD *md,
-                                      ossl_unused int sha1_allowed)
-{
-    return digest_get_approved_nid(md);
+    return 0;
 }
 
 int digest_rsa_sign_get_md_nid(const EVP_MD *md, ossl_unused int sha1_allowed)
@@ -65,8 +34,6 @@ int digest_rsa_sign_get_md_nid(const EVP_MD *md, ossl_unused int sha1_allowed)
         { NID_mdc2,      OSSL_DIGEST_NAME_MDC2      },
         { NID_ripemd160, OSSL_DIGEST_NAME_RIPEMD160 },
     };
-    if (md == NULL)
-        return NID_undef;
 
     mdnid = digest_get_approved_nid_with_sha1(md, 1);
     if (mdnid == NID_undef)
diff --git a/providers/common/securitycheck_fips.c b/providers/common/securitycheck_fips.c
new file mode 100644 (file)
index 0000000..f73eae9
--- /dev/null
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2020 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#include "internal/deprecated.h"
+
+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
+#include <openssl/dh.h>
+#include <openssl/ec.h>
+#include <openssl/err.h>
+#include <openssl/core_names.h>
+#include <openssl/obj_mac.h>
+#include "prov/securitycheck.h"
+#include "prov/providercommonerr.h"
+
+int securitycheck_enabled(void)
+{
+#if !defined(OPENSSL_NO_FIPS_SECURITYCHECKS)
+    /* TODO(3.0): make this configurable */
+    return 1;
+#else
+    return 0;
+#endif /* OPENSSL_NO_FIPS_SECURITYCHECKS */
+}
+
+int digest_rsa_sign_get_md_nid(const EVP_MD *md, int sha1_allowed)
+{
+#if !defined(OPENSSL_NO_FIPS_SECURITYCHECKS)
+    if (securitycheck_enabled())
+        return digest_get_approved_nid_with_sha1(md, sha1_allowed);
+#endif /* OPENSSL_NO_FIPS_SECURITYCHECKS */
+    return digest_get_approved_nid(md);
+}
index 437d7c5..199edbb 100644 (file)
@@ -29,7 +29,7 @@
 #include "prov/provider_ctx.h"
 #include "prov/implementations.h"
 #include "prov/providercommon.h"
-#include "prov/check.h"
+#include "prov/securitycheck.h"
 
 #include <stdlib.h>
 
index 3ca3da4..9e08608 100644 (file)
@@ -23,7 +23,7 @@
 #include "prov/providercommon.h"
 #include "prov/implementations.h"
 #include "prov/provider_ctx.h"
-#include "prov/check.h"
+#include "prov/securitycheck.h"
 #include "crypto/dh.h"
 
 static OSSL_FUNC_keyexch_newctx_fn dh_newctx;
index 9933383..e668161 100644 (file)
@@ -24,7 +24,7 @@
 #include "prov/provider_ctx.h"
 #include "prov/providercommon.h"
 #include "prov/implementations.h"
-#include "prov/check.h"
+#include "prov/securitycheck.h"
 #include "crypto/ec.h" /* ecdh_KDF_X9_63() */
 
 static OSSL_FUNC_keyexch_newctx_fn ecdh_newctx;
index 9f44607..31f6abf 100644 (file)
@@ -30,7 +30,7 @@
 #include "prov/implementations.h"
 #include "prov/providercommonerr.h"
 #include "prov/provider_ctx.h"
-#include "prov/check.h"
+#include "prov/securitycheck.h"
 #include "crypto/dsa.h"
 #include "prov/der_dsa.h"
 
index 75ee839..5fd4d48 100644 (file)
@@ -28,7 +28,7 @@
 #include "prov/providercommonerr.h"
 #include "prov/implementations.h"
 #include "prov/provider_ctx.h"
-#include "prov/check.h"
+#include "prov/securitycheck.h"
 #include "crypto/ec.h"
 #include "prov/der_ec.h"
 
index 20011b5..5209ac9 100644 (file)
@@ -30,7 +30,7 @@
 #include "prov/implementations.h"
 #include "prov/provider_ctx.h"
 #include "prov/der_rsa.h"
-#include "prov/check.h"
+#include "prov/securitycheck.h"
 
 #define RSA_DEFAULT_DIGEST_NAME OSSL_DIGEST_NAME_SHA1
 
index b8ca4a1..14ea4a8 100644 (file)
@@ -3443,7 +3443,14 @@ start:
     }
 
     for (pp++, i = 1; i < (t->s.numpairs - skip_availablein); pp++, i++) {
-        if (strcmp(pp->key, "Availablein") == 0) {
+        if (strcmp(pp->key, "Securitycheck") == 0) {
+#if defined(OPENSSL_NO_FIPS_SECURITYCHECKS)
+            TEST_info("skipping, securitycheck is not available: %s:%d",
+                      t->s.test_file, t->s.start);
+            t->skip = 1;
+            return 0;
+#endif
+        } else if (strcmp(pp->key, "Availablein") == 0) {
             TEST_info("Line %d: 'Availablein' should be the first option",
                       t->s.curr);
             return 0;
index 923e5fd..ddbfe84 100644 (file)
@@ -21,9 +21,10 @@ use lib bldtop_dir('.');
 use platform;
 
 my $no_fips = disabled('fips') || ($ENV{NO_FIPS} // 0);
+my $no_check = disabled('fips-securitychecks');
 
 plan tests =>
-    ($no_fips ? 0 : 2)          # FIPS install test
+    ($no_fips ? 0 : 1 + ($no_check ? 0 : 1))          # FIPS install test
     + 9;
 
 my @prov = ( );
@@ -49,17 +50,19 @@ unless ($no_fips) {
        "fipsinstall");
     $ENV{OPENSSL_TEST_LIBCTX} = "1";
 
-    ok(!run(app(['openssl', 'pkeyutl',
-                @prov,
-                '-encrypt',
-                '-in', $msg_file,
-                '-inkey', $small_key_file,
-                '-pkeyopt', 'pad-mode:oaep',
-                '-pkeyopt', 'oaep-label:123',
-                '-pkeyopt', 'digest:sha1',
-                '-pkeyopt', 'mgf1-digest:sha1',
-                '-out', $enc1_file])),
-       "RSA OAEP Encryption with a key smaller than 2048 in fips mode should fail");
+    unless ($no_check) {
+        ok(!run(app(['openssl', 'pkeyutl',
+                    @prov,
+                    '-encrypt',
+                    '-in', $msg_file,
+                    '-inkey', $small_key_file,
+                    '-pkeyopt', 'pad-mode:oaep',
+                    '-pkeyopt', 'oaep-label:123',
+                    '-pkeyopt', 'digest:sha1',
+                    '-pkeyopt', 'mgf1-digest:sha1',
+                    '-out', $enc1_file])),
+           "RSA OAEP Encryption with a key smaller than 2048 in fips mode should fail");
+    }
 }
 
 ok(run(app(['openssl', 'pkeyutl',
index 5ec5d57..8e3743b 100644 (file)
@@ -294,6 +294,7 @@ Title = Fips Negative Tests (using different key sizes and digests)
 # Test sign with a 1024 bit key is not allowed in fips mode
 Availablein = fips
 DigestSign = SHA256
+Securitycheck = 1
 Key = DSA-1024-FIPS186-2
 Input = "Hello"
 Result = DIGESTSIGNINIT_ERROR
@@ -301,6 +302,7 @@ Result = DIGESTSIGNINIT_ERROR
 # Test sign with SHA1 is not allowed in fips mode
 Availablein = fips
 DigestSign = SHA1
+Securitycheck = 1
 Key = DSA-2048
 Input = "Hello"
 Result = DIGESTSIGNINIT_ERROR
@@ -308,6 +310,7 @@ Result = DIGESTSIGNINIT_ERROR
 # Test sign with a 3072 bit key with N == 224 is not allowed in fips mode
 Availablein = fips
 DigestSign = SHA256
+Securitycheck = 1
 Key = DSA-3072-224
 Input = "Hello"
 Result = DIGESTSIGNINIT_ERROR
@@ -315,6 +318,7 @@ Result = DIGESTSIGNINIT_ERROR
 # Test sign with a 4096 bit key is not allowed in fips mode
 Availablein = fips
 DigestSign = SHA256
+Securitycheck = 1
 Key = DSA-4096-256
 Input = "Hello"
 Result = DIGESTSIGNINIT_ERROR
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
index 35b5078..c738c4a 100644 (file)
 
 # Private keys used for PKEY operations.
 
-
-# EC P-256 key
-
-PrivateKey=P-256
------BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgiocvtiiTxNH/xbnw
-+RdYBp+DUuCPoFpJ+NuSbLVyhyWhRANCAAQsFQ9CnOcPIWwlLPXgYs4fY5zV0WXH
-+JQkBywnGX14szuSDpXNtmTpkNzwz+oNlOKo5q+dDlgFbmUxBJJbn+bJ
------END PRIVATE KEY-----
-
-# EC public key for above
-
-PublicKey=P-256-PUBLIC
------BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAELBUPQpznDyFsJSz14GLOH2Oc1dFl
-x/iUJAcsJxl9eLM7kg6VzbZk6ZDc8M/qDZTiqOavnQ5YBW5lMQSSW5/myQ==
------END PUBLIC KEY-----
-
-PrivPubKeyPair = P-256:P-256-PUBLIC
-
-# Additional EC key for ECDH
-PrivateKey=P-256-Peer
------BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg/URzu1TDNwUFWZ3i
-dLISAZpEY0vfJ2pLB7f+Xnjyl2OhRANCAAQgBuXhSgeKpz+4piXlYSVLvy0NT+wK
-uZWUI3LqUUCV07wg+RLLMY8yNK9kjqcgZDs/cB+bet64nQq+dNnvtpxG
------END PRIVATE KEY-----
-
-PublicKey=P-256-Peer-PUBLIC
------BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIAbl4UoHiqc/uKYl5WElS78tDU/s
-CrmVlCNy6lFAldO8IPkSyzGPMjSvZI6nIGQ7P3Afm3reuJ0KvnTZ77acRg==
------END PUBLIC KEY-----
-
-PrivPubKeyPair = P-256-Peer:P-256-Peer-PUBLIC
-
-Title = ECDH tests
-
-
-Derive=P-256
-PeerKey=P-256-Peer-PUBLIC
-SharedSecret=E3CC07DFBDDE76A1139811DB9FF5FAF9D17EF39944F1E77D1F6A208524BF7B1B
-
-
-Derive=P-256-Peer
-PeerKey=P-256-PUBLIC
-SharedSecret=E3CC07DFBDDE76A1139811DB9FF5FAF9D17EF39944F1E77D1F6A208524BF7B1B
-
 Title = ECDH tests (with random keys)
 
 # TEST CURVE secp112r1
@@ -99,11 +51,13 @@ PrivPubKeyPair = BOB_secp112r1:BOB_secp112r1_PUB
 
 
 # ECDH Alice with Bob peer
+Availablein = default
 Derive=ALICE_secp112r1
 PeerKey=BOB_secp112r1_PUB
 SharedSecret=a6cefb5aa7a352afe818749eb401
 
 # ECDH Bob with Alice peer
+Availablein = default
 Derive=BOB_secp112r1
 PeerKey=ALICE_secp112r1_PUB
 SharedSecret=a6cefb5aa7a352afe818749eb401
@@ -142,12 +96,14 @@ PrivPubKeyPair = BOB_secp112r2:BOB_secp112r2_PUB
 
 # ECDH Alice with Bob peer
 
+Availablein = default
 Derive=ALICE_secp112r2
 PeerKey=BOB_secp112r2_PUB
 SharedSecret=6bed2c55e233e9214d5898c4c12a
 
 # ECDH Bob with Alice peer
 
+Availablein = default
 Derive=BOB_secp112r2
 PeerKey=ALICE_secp112r2_PUB
 SharedSecret=6bed2c55e233e9214d5898c4c12a
@@ -186,12 +142,14 @@ PrivPubKeyPair = BOB_secp128r1:BOB_secp128r1_PUB
 
 # ECDH Alice with Bob peer
 
+Availablein = default
 Derive=ALICE_secp128r1
 PeerKey=BOB_secp128r1_PUB
 SharedSecret=91ded46ac404afdbd708fdcc1cac6842
 
 # ECDH Bob with Alice peer
 
+Availablein = default
 Derive=BOB_secp128r1
 PeerKey=ALICE_secp128r1_PUB
 SharedSecret=91ded46ac404afdbd708fdcc1cac6842
@@ -230,12 +188,14 @@ PrivPubKeyPair = BOB_secp128r2:BOB_secp128r2_PUB
 
 # ECDH Alice with Bob peer
 
+Availablein = default
 Derive=ALICE_secp128r2
 PeerKey=BOB_secp128r2_PUB
 SharedSecret=dc32faa978008a694672076b756a1e4b
 
 # ECDH Bob with Alice peer
 
+Availablein = default
 Derive=BOB_secp128r2
 PeerKey=ALICE_secp128r2_PUB
 SharedSecret=dc32faa978008a694672076b756a1e4b
@@ -276,12 +236,14 @@ PrivPubKeyPair = BOB_secp160k1:BOB_secp160k1_PUB
 
 # ECDH Alice with Bob peer
 
+Availablein = default
 Derive=ALICE_secp160k1
 PeerKey=BOB_secp160k1_PUB
 SharedSecret=5457d367346cc3e82031784f95ebcd856de0c735
 
 # ECDH Bob with Alice peer
 
+Availablein = default
 Derive=BOB_secp160k1
 PeerKey=ALICE_secp160k1_PUB
 SharedSecret=5457d367346cc3e82031784f95ebcd856de0c735
@@ -322,12 +284,14 @@ PrivPubKeyPair = BOB_secp160r1:BOB_secp160r1_PUB
 
 # ECDH Alice with Bob peer
 
+Availablein = default
 Derive=ALICE_secp160r1
 PeerKey=BOB_secp160r1_PUB
 SharedSecret=87856536b6a295ea94d3e483d69c6212d5c7afcf
 
 # ECDH Bob with Alice peer
 
+Availablein = default
 Derive=BOB_secp160r1
 PeerKey=ALICE_secp160r1_PUB
 SharedSecret=87856536b6a295ea94d3e483d69c6212d5c7afcf
@@ -368,12 +332,14 @@ PrivPubKeyPair = BOB_secp160r2:BOB_secp160r2_PUB
 
 # ECDH Alice with Bob peer
 
+Availablein = default
 Derive=ALICE_secp160r2
 PeerKey=BOB_secp160r2_PUB
 SharedSecret=5481e282c47cbd37c84873847c4fc2f31fc15a1a
 
 # ECDH Bob with Alice peer
 
+Availablein = default
 Derive=BOB_secp160r2
 PeerKey=ALICE_secp160r2_PUB
 SharedSecret=5481e282c47cbd37c84873847c4fc2f31fc15a1a
@@ -414,12 +380,14 @@ PrivPubKeyPair = BOB_secp192k1:BOB_secp192k1_PUB
 
 # ECDH Alice with Bob peer
 
+Availablein = default
 Derive=ALICE_secp192k1
 PeerKey=BOB_secp192k1_PUB
 SharedSecret=6a4daca0412284172e8fcaafa0d9df76257d899752bf0f23
 
 # ECDH Bob with Alice peer
 
+Availablein = default
 Derive=BOB_secp192k1
 PeerKey=ALICE_secp192k1_PUB
 SharedSecret=6a4daca0412284172e8fcaafa0d9df76257d899752bf0f23
@@ -460,62 +428,18 @@ PrivPubKeyPair = BOB_secp224k1:BOB_secp224k1_PUB
 
 # ECDH Alice with Bob peer
 
+Availablein = default
 Derive=ALICE_secp224k1
 PeerKey=BOB_secp224k1_PUB
 SharedSecret=80b65e65fe29c779213dd31189d371ff57b0b2bf08c6458ed142399a
 
 # ECDH Bob with Alice peer
 
+Availablein = default
 Derive=BOB_secp224k1
 PeerKey=ALICE_secp224k1_PUB
 SharedSecret=80b65e65fe29c779213dd31189d371ff57b0b2bf08c6458ed142399a
 
-# TEST CURVE secp224r1
-
-PrivateKey=ALICE_secp224r1
------BEGIN PRIVATE KEY-----
-MHgCAQAwEAYHKoZIzj0CAQYFK4EEACEEYTBfAgEBBBxLKkXFJXYqGUlTsmgjlesi
-kwqejrekrkSTbehyoTwDOgAEUcEh0Ggy/rD+Nj9JQozzI+qzPtiU7b2D2HtdCa4h
-fbVPXngcRH2B2xN8W+dcHoIxrxO2UFXy4xo=
------END PRIVATE KEY-----
-
-PublicKey=ALICE_secp224r1_PUB
------BEGIN PUBLIC KEY-----
-ME4wEAYHKoZIzj0CAQYFK4EEACEDOgAEUcEh0Ggy/rD+Nj9JQozzI+qzPtiU7b2D
-2HtdCa4hfbVPXngcRH2B2xN8W+dcHoIxrxO2UFXy4xo=
------END PUBLIC KEY-----
-
-PrivPubKeyPair = ALICE_secp224r1:ALICE_secp224r1_PUB
-
-
-PrivateKey=BOB_secp224r1
------BEGIN PRIVATE KEY-----
-MHgCAQAwEAYHKoZIzj0CAQYFK4EEACEEYTBfAgEBBBzOHGGUR3fZYg3GSaUN6pxo
-NQtAlOzM3UclEhMzoTwDOgAEdwFklK/YoDRU6bM7X2ulNLwqx9TUETMFUM6VV9DB
-4YcvAzv6pQgVwYEU7IahmSKpX19chbPt2I0=
------END PRIVATE KEY-----
-
-PublicKey=BOB_secp224r1_PUB
------BEGIN PUBLIC KEY-----
-ME4wEAYHKoZIzj0CAQYFK4EEACEDOgAEdwFklK/YoDRU6bM7X2ulNLwqx9TUETMF
-UM6VV9DB4YcvAzv6pQgVwYEU7IahmSKpX19chbPt2I0=
------END PUBLIC KEY-----
-
-PrivPubKeyPair = BOB_secp224r1:BOB_secp224r1_PUB
-
-
-# ECDH Alice with Bob peer
-
-Derive=ALICE_secp224r1
-PeerKey=BOB_secp224r1_PUB
-SharedSecret=34ea06d16d82f0d1725de47f3639ac0c23db7d7ed68f01488539a2a5
-
-# ECDH Bob with Alice peer
-
-Derive=BOB_secp224r1
-PeerKey=ALICE_secp224r1_PUB
-SharedSecret=34ea06d16d82f0d1725de47f3639ac0c23db7d7ed68f01488539a2a5
-
 # TEST CURVE secp256k1
 
 PrivateKey=ALICE_secp256k1
@@ -552,168 +476,18 @@ PrivPubKeyPair = BOB_secp256k1:BOB_secp256k1_PUB
 
 # ECDH Alice with Bob peer
 
+Availablein = default
 Derive=ALICE_secp256k1
 PeerKey=BOB_secp256k1_PUB
 SharedSecret=af43b52790082fd87afb1d14b883c12d12bb9e554080d1f8e527920676e31f3e
 
 # ECDH Bob with Alice peer
 
+Availablein = default
 Derive=BOB_secp256k1
 PeerKey=ALICE_secp256k1_PUB
 SharedSecret=af43b52790082fd87afb1d14b883c12d12bb9e554080d1f8e527920676e31f3e
 
-# TEST CURVE secp384r1
-
-PrivateKey=ALICE_secp384r1
------BEGIN PRIVATE KEY-----
-MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDCxE7Q4m1dsK7M3Otxo
-cgY/ejX9JOKKdAtSnRiU4bnK3eFmALkMN7XIveQnWLB1PEKhZANiAAQaUsvUFr/u
-ISpAmYqYZIme4VassCtb0tNGU97s3qt4ozcogZ4z+fIzXZ4YXqfGoEa57+uQDgqr
-+jNOTji7Gxopt6AqZ9EvwuVaCuunUi0pcx6cc8IuUfrwMwSFovV/7sM=
------END PRIVATE KEY-----
-
-PublicKey=ALICE_secp384r1_PUB
------BEGIN PUBLIC KEY-----
-MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEGlLL1Ba/7iEqQJmKmGSJnuFWrLArW9LT
-RlPe7N6reKM3KIGeM/nyM12eGF6nxqBGue/rkA4Kq/ozTk44uxsaKbegKmfRL8Ll
-Wgrrp1ItKXMenHPCLlH68DMEhaL1f+7D
------END PUBLIC KEY-----
-
-PrivPubKeyPair = ALICE_secp384r1:ALICE_secp384r1_PUB
-
-
-PrivateKey=BOB_secp384r1
------BEGIN PRIVATE KEY-----
-MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDBRiGXRsb5sUq0b3/dg
-Z+pA9kbrSivBMCUCXVwxno1d/30hI/Yy0Z5PWwbBgwTFprWhZANiAASp1FeUOBJF
-mzQCNbGiOz8He0kF+KIf24UGYVO5MC7u5rV9hpoYsbcgmwxALskPN18os2ygK1Pn
-f/h+WALIsG2RknSTbiyvBYkoIhJV9cflvEDpMeaWSLF7qJ5YjEIf9PM=
------END PRIVATE KEY-----
-
-PublicKey=BOB_secp384r1_PUB
------BEGIN PUBLIC KEY-----
-MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEqdRXlDgSRZs0AjWxojs/B3tJBfiiH9uF
-BmFTuTAu7ua1fYaaGLG3IJsMQC7JDzdfKLNsoCtT53/4flgCyLBtkZJ0k24srwWJ
-KCISVfXH5bxA6THmlkixe6ieWIxCH/Tz
------END PUBLIC KEY-----
-
-PrivPubKeyPair = BOB_secp384r1:BOB_secp384r1_PUB
-
-
-# ECDH Alice with Bob peer
-
-Derive=ALICE_secp384r1
-PeerKey=BOB_secp384r1_PUB
-SharedSecret=2006ed49acbb991b8fbf8a15c3f263542496eaefe1e2952591b72fb929463eac7a403a5419cebbfb73734918eaed59fd
-
-# ECDH Bob with Alice peer
-
-Derive=BOB_secp384r1
-PeerKey=ALICE_secp384r1_PUB
-SharedSecret=2006ed49acbb991b8fbf8a15c3f263542496eaefe1e2952591b72fb929463eac7a403a5419cebbfb73734918eaed59fd
-
-# TEST CURVE secp521r1
-
-PrivateKey=ALICE_secp521r1
------BEGIN PRIVATE KEY-----
-MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIAFBIz3FLAuX8VCWzM
-wu1f/tm8pf1QqnsdLqaIWCQAJa2W5ldpJTYfkj1gGxM44AD3qHnkXISvNLwwuxI1
-hr2+pOGhgYkDgYYABACWlOOFYk/p3AS2LxEQWBuMm6uIjo3XArjh1QrsLcUc5hhi
-82CIz6kKwKjCnYRDHq4iv1x63rVEzGGhQOM1g+cRVwHSpfbBpaxK7bMLkVFOOavv
-OdcdyRHaHsvxw2pREmdS/GwtfgT8odQrG06KMIwVeL+H08fGJSbPX0Zock0DOPCp
-aw==
------END PRIVATE KEY-----
-
-PublicKey=ALICE_secp521r1_PUB
------BEGIN PUBLIC KEY-----
-MIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQAlpTjhWJP6dwEti8REFgbjJuriI6N
-1wK44dUK7C3FHOYYYvNgiM+pCsCowp2EQx6uIr9cet61RMxhoUDjNYPnEVcB0qX2
-waWsSu2zC5FRTjmr7znXHckR2h7L8cNqURJnUvxsLX4E/KHUKxtOijCMFXi/h9PH
-xiUmz19GaHJNAzjwqWs=
------END PUBLIC KEY-----
-
-PrivPubKeyPair = ALICE_secp521r1:ALICE_secp521r1_PUB
-
-
-PrivateKey=BOB_secp521r1
------BEGIN PRIVATE KEY-----
-MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIA9C/sMWveRlHPr9P5
-cc3U+1L2/zB0VtHewKSQRWZ67SmS4+m7uXTqUVSLRHiQEgQid0cg77gSxXPlmV+z
-y0f3zd+hgYkDgYYABAE18N3SwDGtea3IOqUdh3j0JtnMeP41i/agEBlxK8/iEBXc
-Q61mkIrQIKcabRhoylEugXHiyNnqNQOD4DUa0bTKzAHtJ4UqqbEVno6byRmcUQwb
-mvG89eS8GLEmk5X/O2atHU4yIGTuTRQWn/BTJUCS+OgJz4FZdadscc5Z640EZqSD
-iw==
------END PRIVATE KEY-----
-
-PublicKey=BOB_secp521r1_PUB
------BEGIN PUBLIC KEY-----
-MIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQBNfDd0sAxrXmtyDqlHYd49CbZzHj+
-NYv2oBAZcSvP4hAV3EOtZpCK0CCnGm0YaMpRLoFx4sjZ6jUDg+A1GtG0yswB7SeF
-KqmxFZ6Om8kZnFEMG5rxvPXkvBixJpOV/ztmrR1OMiBk7k0UFp/wUyVAkvjoCc+B
-WXWnbHHOWeuNBGakg4s=
------END PUBLIC KEY-----
-
-PrivPubKeyPair = BOB_secp521r1:BOB_secp521r1_PUB
-
-
-# ECDH Alice with Bob peer
-
-Derive=ALICE_secp521r1
-PeerKey=BOB_secp521r1_PUB
-SharedSecret=018c8f33e544a0fa8854dcd96bdba75b7687d1c42b2ff1bf0a06d49c424fee96d8a7f3af3119dcbfabc1c147477c50f7c72971956f9bb17ddec6d02b2187f06cf4be
-
-# ECDH Bob with Alice peer
-
-Derive=BOB_secp521r1
-PeerKey=ALICE_secp521r1_PUB
-SharedSecret=018c8f33e544a0fa8854dcd96bdba75b7687d1c42b2ff1bf0a06d49c424fee96d8a7f3af3119dcbfabc1c147477c50f7c72971956f9bb17ddec6d02b2187f06cf4be
-
-# TEST CURVE prime192v1
-
-PrivateKey=ALICE_prime192v1
------BEGIN PRIVATE KEY-----
-MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQEEVTBTAgEBBBjxfXvSFNqD2UzFVN1L
-bQrPlzop7dxQq/ehNAMyAATibpGuYzCjkT1tWLYEogpKz74WqhvbQtZPkCYQCin1
-cmZuNW+BZ0jyVEpGlpnZPMg=
------END PRIVATE KEY-----
-
-PublicKey=ALICE_prime192v1_PUB
------BEGIN PUBLIC KEY-----
-MEkwEwYHKoZIzj0CAQYIKoZIzj0DAQEDMgAE4m6RrmMwo5E9bVi2BKIKSs++Fqob
-20LWT5AmEAop9XJmbjVvgWdI8lRKRpaZ2TzI
------END PUBLIC KEY-----
-
-PrivPubKeyPair = ALICE_prime192v1:ALICE_prime192v1_PUB
-
-
-PrivateKey=BOB_prime192v1
------BEGIN PRIVATE KEY-----
-MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQEEVTBTAgEBBBhewaqXNZlYyqnmuEEE
-Y/oUXe3/jpzhmyGhNAMyAASkpwNJEP/1FuuWKCDDUm26iyqrs+zKwayZnaF77YC6
-qCtgia7yNcSl9tlWHh3gQgw=
------END PRIVATE KEY-----
-
-PublicKey=BOB_prime192v1_PUB
------BEGIN PUBLIC KEY-----
-MEkwEwYHKoZIzj0CAQYIKoZIzj0DAQEDMgAEpKcDSRD/9Rbrliggw1Jtuosqq7Ps
-ysGsmZ2he+2AuqgrYImu8jXEpfbZVh4d4EIM
------END PUBLIC KEY-----
-
-PrivPubKeyPair = BOB_prime192v1:BOB_prime192v1_PUB
-
-
-# ECDH Alice with Bob peer
-
-Derive=ALICE_prime192v1
-PeerKey=BOB_prime192v1_PUB
-SharedSecret=be2a779b587f8f5d7c9d8f006e0a6d0e996c9c63c255f861
-
-# ECDH Bob with Alice peer
-
-Derive=BOB_prime192v1
-PeerKey=ALICE_prime192v1_PUB
-SharedSecret=be2a779b587f8f5d7c9d8f006e0a6d0e996c9c63c255f861
-
 # TEST CURVE prime192v2
 
 PrivateKey=ALICE_prime192v2
@@ -750,12 +524,14 @@ PrivPubKeyPair = BOB_prime192v2:BOB_prime192v2_PUB
 
 # ECDH Alice with Bob peer
 
+Availablein = default
 Derive=ALICE_prime192v2
 PeerKey=BOB_prime192v2_PUB
 SharedSecret=9b37033a48af7fe1825c062625f8b57d4b3ac48c12bec69c
 
 # ECDH Bob with Alice peer
 
+Availablein = default
 Derive=BOB_prime192v2
 PeerKey=ALICE_prime192v2_PUB
 SharedSecret=9b37033a48af7fe1825c062625f8b57d4b3ac48c12bec69c
@@ -796,12 +572,14 @@ PrivPubKeyPair = BOB_prime192v3:BOB_prime192v3_PUB
 
 # ECDH Alice with Bob peer
 
+Availablein = default
 Derive=ALICE_prime192v3
 PeerKey=BOB_prime192v3_PUB
 SharedSecret=7133f1d99b0e03ed9c4d78d3be40598cf419cd588283ac29
 
 # ECDH Bob with Alice peer
 
+Availablein = default
 Derive=BOB_prime192v3
 PeerKey=ALICE_prime192v3_PUB
 SharedSecret=7133f1d99b0e03ed9c4d78d3be40598cf419cd588283ac29
@@ -842,12 +620,14 @@ PrivPubKeyPair = BOB_prime239v1:BOB_prime239v1_PUB
 
 # ECDH Alice with Bob peer
 
+Availablein = default
 Derive=ALICE_prime239v1
 PeerKey=BOB_prime239v1_PUB
 SharedSecret=2ef92070f7a5fa14c8a67a8aa3080b4c4a597eafaa81d3f698599ac0be1e
 
 # ECDH Bob with Alice peer
 
+Availablein = default
 Derive=BOB_prime239v1
 PeerKey=ALICE_prime239v1_PUB
 SharedSecret=2ef92070f7a5fa14c8a67a8aa3080b4c4a597eafaa81d3f698599ac0be1e
@@ -888,12 +668,14 @@ PrivPubKeyPair = BOB_prime239v2:BOB_prime239v2_PUB
 
 # ECDH Alice with Bob peer
 
+Availablein = default
 Derive=ALICE_prime239v2
 PeerKey=BOB_prime239v2_PUB
 SharedSecret=5bdab282dc371ee88ade318a6aad2b329ec3ea957e0df18b7a691c1bf703
 
 # ECDH Bob with Alice peer
 
+Availablein = default
 Derive=BOB_prime239v2
 PeerKey=ALICE_prime239v2_PUB
 SharedSecret=5bdab282dc371ee88ade318a6aad2b329ec3ea957e0df18b7a691c1bf703
@@ -934,68 +716,24 @@ PrivPubKeyPair = BOB_prime239v3:BOB_prime239v3_PUB
 
 # ECDH Alice with Bob peer
 
+Availablein = default
 Derive=ALICE_prime239v3
 PeerKey=BOB_prime239v3_PUB
 SharedSecret=78e80ae760061178bd005e9e3634333971468bc6d3f82baee238c5ed32f9
 
 # ECDH Bob with Alice peer
 
+Availablein = default
 Derive=BOB_prime239v3
 PeerKey=ALICE_prime239v3_PUB
 SharedSecret=78e80ae760061178bd005e9e3634333971468bc6d3f82baee238c5ed32f9
 
-# TEST CURVE prime256v1
+# TEST CURVE sect113r1
 
-PrivateKey=ALICE_prime256v1
+PrivateKey=ALICE_sect113r1
 -----BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQglUPDk8gQ8lMj38V7
-0jPBZDfQUx5pNOVSKOMTqlh04POhRANCAARq87w+K0q9b1mzJGh309kjNvYTS02m
-YkHKxAewiZwmt/5w+5uywz/+0130SdAWbXtECjaHUK94YEHzp0G/PCl5
------END PRIVATE KEY-----
-
-PublicKey=ALICE_prime256v1_PUB
------BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEavO8PitKvW9ZsyRod9PZIzb2E0tN
-pmJBysQHsImcJrf+cPubssM//tNd9EnQFm17RAo2h1CveGBB86dBvzwpeQ==
------END PUBLIC KEY-----
-
-PrivPubKeyPair = ALICE_prime256v1:ALICE_prime256v1_PUB
-
-
-PrivateKey=BOB_prime256v1
------BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgNsLfn/sRZfm9ZcM7
-xURiUHT7+w8Jgk9SbwTVDjpLYYmhRANCAASRmyKNgUbADGxkIOAVh9T7IXv2ZDT6
-I5YMW6wOs27VMOAD0AiNLrv7sW1TdqxkUtF17/GFpLvFOuZcbdX4p3i/
------END PRIVATE KEY-----
-
-PublicKey=BOB_prime256v1_PUB
------BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEkZsijYFGwAxsZCDgFYfU+yF79mQ0
-+iOWDFusDrNu1TDgA9AIjS67+7FtU3asZFLRde/xhaS7xTrmXG3V+Kd4vw==
------END PUBLIC KEY-----
-
-PrivPubKeyPair = BOB_prime256v1:BOB_prime256v1_PUB
-
-
-# ECDH Alice with Bob peer
-
-Derive=ALICE_prime256v1
-PeerKey=BOB_prime256v1_PUB
-SharedSecret=390021fbca00d959c1adaf7e9cedef0e65a582489eab9adbe739ef66bf82adb4
-
-# ECDH Bob with Alice peer
-
-Derive=BOB_prime256v1
-PeerKey=ALICE_prime256v1_PUB
-SharedSecret=390021fbca00d959c1adaf7e9cedef0e65a582489eab9adbe739ef66bf82adb4
-
-# TEST CURVE sect113r1
-
-PrivateKey=ALICE_sect113r1
------BEGIN PRIVATE KEY-----
-MFECAQAwEAYHKoZIzj0CAQYFK4EEAAQEOjA4AgEBBA8AcrP9u8BlWb4knkGVZmSh
-IgMgAAQBviTf62+1V4etJb2D9LkBadAFmdmRS+rVI3spTYs=
+MFECAQAwEAYHKoZIzj0CAQYFK4EEAAQEOjA4AgEBBA8AcrP9u8BlWb4knkGVZmSh
+IgMgAAQBviTf62+1V4etJb2D9LkBadAFmdmRS+rVI3spTYs=
 -----END PRIVATE KEY-----
 
 PublicKey=ALICE_sect113r1_PUB
@@ -1024,12 +762,14 @@ PrivPubKeyPair = BOB_sect113r1:BOB_sect113r1_PUB
 
 # ECDH Alice with Bob peer
 
+Availablein = default
 Derive=ALICE_sect113r1
 PeerKey=BOB_sect113r1_PUB
 SharedSecret=015405437add26b8841c62a9016c85
 
 # ECDH Bob with Alice peer
 
+Availablein = default
 Derive=BOB_sect113r1
 PeerKey=ALICE_sect113r1_PUB
 SharedSecret=015405437add26b8841c62a9016c85
@@ -1068,12 +808,14 @@ PrivPubKeyPair = BOB_sect113r2:BOB_sect113r2_PUB
 
 # ECDH Alice with Bob peer
 
+Availablein = default
 Derive=ALICE_sect113r2
 PeerKey=BOB_sect113r2_PUB
 SharedSecret=014231c5e9e28d451aa44a755407e1
 
 # ECDH Bob with Alice peer
 
+Availablein = default
 Derive=BOB_sect113r2
 PeerKey=ALICE_sect113r2_PUB
 SharedSecret=014231c5e9e28d451aa44a755407e1
@@ -1112,12 +854,14 @@ PrivPubKeyPair = BOB_sect131r1:BOB_sect131r1_PUB
 
 # ECDH Alice with Bob peer
 
+Availablein = default
 Derive=ALICE_sect131r1
 PeerKey=BOB_sect131r1_PUB
 SharedSecret=009e4acc8c1ba3a129a9ad83a733d7d702
 
 # ECDH Bob with Alice peer
 
+Availablein = default
 Derive=BOB_sect131r1
 PeerKey=ALICE_sect131r1_PUB
 SharedSecret=009e4acc8c1ba3a129a9ad83a733d7d702
@@ -1156,62 +900,18 @@ PrivPubKeyPair = BOB_sect131r2:BOB_sect131r2_PUB
 
 # ECDH Alice with Bob peer
 
+Availablein = default
 Derive=ALICE_sect131r2
 PeerKey=BOB_sect131r2_PUB
 SharedSecret=03cbec3a3050c7f13d4801ad692d61c417
 
 # ECDH Bob with Alice peer
 
+Availablein = default
 Derive=BOB_sect131r2
 PeerKey=ALICE_sect131r2_PUB
 SharedSecret=03cbec3a3050c7f13d4801ad692d61c417
 
-# TEST CURVE sect163k1
-
-PrivateKey=ALICE_sect163k1
------BEGIN PRIVATE KEY-----
-MGMCAQAwEAYHKoZIzj0CAQYFK4EEAAEETDBKAgEBBBUBxkeGOXE86PAijpk8trN/
-f3kl4UmhLgMsAAQD1hrDCJ2MSFKZ6Q11cTllX/l5HY0Hg5XZCxMFC84AaczwPtNJ
-YNCxfCk=
------END PRIVATE KEY-----
-
-PublicKey=ALICE_sect163k1_PUB
------BEGIN PUBLIC KEY-----
-MEAwEAYHKoZIzj0CAQYFK4EEAAEDLAAEA9YawwidjEhSmekNdXE5ZV/5eR2NB4OV
-2QsTBQvOAGnM8D7TSWDQsXwp
------END PUBLIC KEY-----
-
-PrivPubKeyPair = ALICE_sect163k1:ALICE_sect163k1_PUB
-
-
-PrivateKey=BOB_sect163k1
------BEGIN PRIVATE KEY-----
-MGMCAQAwEAYHKoZIzj0CAQYFK4EEAAEETDBKAgEBBBUCUJ5kItSfXidHXsgokcS7
-nzPFbOShLgMsAAQGrYNJ1qgdb3A9ISOmTujfS+WYFKwBXXrJEluAkeNh3jXnDq8X
-+XBB0k8=
------END PRIVATE KEY-----
-
-PublicKey=BOB_sect163k1_PUB
------BEGIN PUBLIC KEY-----
-MEAwEAYHKoZIzj0CAQYFK4EEAAEDLAAEBq2DSdaoHW9wPSEjpk7o30vlmBSsAV16
-yRJbgJHjYd415w6vF/lwQdJP
------END PUBLIC KEY-----
-
-PrivPubKeyPair = BOB_sect163k1:BOB_sect163k1_PUB
-
-
-# ECDH Alice with Bob peer
-
-Derive=ALICE_sect163k1
-PeerKey=BOB_sect163k1_PUB
-SharedSecret=07bfdf00759b383aa7741ae4634400f8ddf2047092
-
-# ECDH Bob with Alice peer
-
-Derive=BOB_sect163k1
-PeerKey=ALICE_sect163k1_PUB
-SharedSecret=07bfdf00759b383aa7741ae4634400f8ddf2047092
-
 # TEST CURVE sect163r1
 
 PrivateKey=ALICE_sect163r1
@@ -1258,52 +958,6 @@ Derive=BOB_sect163r1
 PeerKey=ALICE_sect163r1_PUB
 SharedSecret=02355c765bbc07fcc44bb1496e490912f6df56e6d4
 
-# TEST CURVE sect163r2
-
-PrivateKey=ALICE_sect163r2
------BEGIN PRIVATE KEY-----
-MGMCAQAwEAYHKoZIzj0CAQYFK4EEAA8ETDBKAgEBBBUDjH2G7BkPTBM4VtljaQr8
-sXVLNOqhLgMsAAQHHqWxJWR2KrHCPp/PSjZIdK88ET0A323/UOTxhYHwsLpR7rp3
-ahq1lQ8=
------END PRIVATE KEY-----
-
-PublicKey=ALICE_sect163r2_PUB
------BEGIN PUBLIC KEY-----
-MEAwEAYHKoZIzj0CAQYFK4EEAA8DLAAEBx6lsSVkdiqxwj6fz0o2SHSvPBE9AN9t
-/1Dk8YWB8LC6Ue66d2oatZUP
------END PUBLIC KEY-----
-
-PrivPubKeyPair = ALICE_sect163r2:ALICE_sect163r2_PUB
-
-
-PrivateKey=BOB_sect163r2
------BEGIN PRIVATE KEY-----
-MGMCAQAwEAYHKoZIzj0CAQYFK4EEAA8ETDBKAgEBBBUBXOM9Tm6sKXUlRLlW0HgC
-NTDxW2ihLgMsAAQGxa8xRcC+TIcDgGtehDVEV1PoBokBwtILj16NPYC0aBZI8/nF
-F4jhgmc=
------END PRIVATE KEY-----
-
-PublicKey=BOB_sect163r2_PUB
------BEGIN PUBLIC KEY-----
-MEAwEAYHKoZIzj0CAQYFK4EEAA8DLAAEBsWvMUXAvkyHA4BrXoQ1RFdT6AaJAcLS
-C49ejT2AtGgWSPP5xReI4YJn
------END PUBLIC KEY-----
-
-PrivPubKeyPair = BOB_sect163r2:BOB_sect163r2_PUB
-
-
-# ECDH Alice with Bob peer
-
-Derive=ALICE_sect163r2
-PeerKey=BOB_sect163r2_PUB
-SharedSecret=040df54e6df412790ef5c0fafbbfcba5136b872951
-
-# ECDH Bob with Alice peer
-
-Derive=BOB_sect163r2
-PeerKey=ALICE_sect163r2_PUB
-SharedSecret=040df54e6df412790ef5c0fafbbfcba5136b872951
-
 # TEST CURVE sect193r1
 
 PrivateKey=ALICE_sect193r1
@@ -1396,98 +1050,6 @@ Derive=BOB_sect193r2
 PeerKey=ALICE_sect193r2_PUB
 SharedSecret=019d1f316d204a9cd1b9632cebb4accddb204158be3e435891
 
-# TEST CURVE sect233k1
-
-PrivateKey=ALICE_sect233k1
------BEGIN PRIVATE KEY-----
-MH0CAQAwEAYHKoZIzj0CAQYFK4EEABoEZjBkAgEBBB1aR7qaKm1vmZWK2bGsJ1rX
-mH6BpTkW4t1L4zSf/KFAAz4ABADcDiv+bTvPVViqYLNz06VO5wodry+sGi6fnJIr
-QQCTfZ9d5whiIsbY5Thlcm7I0A/cIGoShA/6LumOVA==
------END PRIVATE KEY-----
-
-PublicKey=ALICE_sect233k1_PUB
------BEGIN PUBLIC KEY-----
-MFIwEAYHKoZIzj0CAQYFK4EEABoDPgAEANwOK/5tO89VWKpgs3PTpU7nCh2vL6wa
-Lp+ckitBAJN9n13nCGIixtjlOGVybsjQD9wgahKED/ou6Y5U
------END PUBLIC KEY-----
-
-PrivPubKeyPair = ALICE_sect233k1:ALICE_sect233k1_PUB
-
-
-PrivateKey=BOB_sect233k1
------BEGIN PRIVATE KEY-----
-MH0CAQAwEAYHKoZIzj0CAQYFK4EEABoEZjBkAgEBBB0oa5BrzYxm6mn51Xyphn6X
-OUjKc9oMDHCowAyHTaFAAz4ABAGKiFuFJVQeymHYRVnt2LNF2MSaTMcL9JGSPn2z
-OwBis5MS4kgEFakWQl7KpGiy3vS89wmpblvHLJ/+IQ==
------END PRIVATE KEY-----
-
-PublicKey=BOB_sect233k1_PUB
------BEGIN PUBLIC KEY-----
-MFIwEAYHKoZIzj0CAQYFK4EEABoDPgAEAYqIW4UlVB7KYdhFWe3Ys0XYxJpMxwv0
-kZI+fbM7AGKzkxLiSAQVqRZCXsqkaLLe9Lz3CaluW8csn/4h
------END PUBLIC KEY-----
-
-PrivPubKeyPair = BOB_sect233k1:BOB_sect233k1_PUB
-
-
-# ECDH Alice with Bob peer
-
-Derive=ALICE_sect233k1
-PeerKey=BOB_sect233k1_PUB
-SharedSecret=00a5e5f2e992f4360d530dd365d14f5c6013212e14f4ea258c91c71f1512
-
-# ECDH Bob with Alice peer
-
-Derive=BOB_sect233k1
-PeerKey=ALICE_sect233k1_PUB
-SharedSecret=00a5e5f2e992f4360d530dd365d14f5c6013212e14f4ea258c91c71f1512
-
-# TEST CURVE sect233r1
-
-PrivateKey=ALICE_sect233r1
------BEGIN PRIVATE KEY-----
-MH4CAQAwEAYHKoZIzj0CAQYFK4EEABsEZzBlAgEBBB4AEN6fePR2gizyXzU6kIgU
-Gijp5+IQAXoNBfKnVeChQAM+AAQB0kEwu2fwQWo1v1j7XQ8uJT3iMwRC8w+cxgxx
-GQ4B/FyjrhIUpEDWaMqfV23McZ6WdbIUe3MZ7K5pG38=
------END PRIVATE KEY-----
-
-PublicKey=ALICE_sect233r1_PUB
------BEGIN PUBLIC KEY-----
-MFIwEAYHKoZIzj0CAQYFK4EEABsDPgAEAdJBMLtn8EFqNb9Y+10PLiU94jMEQvMP
-nMYMcRkOAfxco64SFKRA1mjKn1dtzHGelnWyFHtzGeyuaRt/
------END PUBLIC KEY-----
-
-PrivPubKeyPair = ALICE_sect233r1:ALICE_sect233r1_PUB
-
-
-PrivateKey=BOB_sect233r1
------BEGIN PRIVATE KEY-----
-MH4CAQAwEAYHKoZIzj0CAQYFK4EEABsEZzBlAgEBBB4AXHWOeS6fG0XCH3FnHDuS
-IcELUeDG+AYNNeLVZd6hQAM+AAQAYRRYH017uxcaMPF3GOsL4bvodW1yZLEtL3pm
-CkcAfqJI/4niCr8uHKh0gBa2JBjBWMV1u8Mpf60uvok=
------END PRIVATE KEY-----
-
-PublicKey=BOB_sect233r1_PUB
------BEGIN PUBLIC KEY-----
-MFIwEAYHKoZIzj0CAQYFK4EEABsDPgAEAGEUWB9Ne7sXGjDxdxjrC+G76HVtcmSx
-LS96ZgpHAH6iSP+J4gq/LhyodIAWtiQYwVjFdbvDKX+tLr6J
------END PUBLIC KEY-----
-
-PrivPubKeyPair = BOB_sect233r1:BOB_sect233r1_PUB
-
-
-# ECDH Alice with Bob peer
-
-Derive=ALICE_sect233r1
-PeerKey=BOB_sect233r1_PUB
-SharedSecret=01625f3fcd367ee7cd74c67cca02dccfce6c3b19ef07e358ed943d17a8e2
-
-# ECDH Bob with Alice peer
-
-Derive=BOB_sect233r1
-PeerKey=ALICE_sect233r1_PUB
-SharedSecret=01625f3fcd367ee7cd74c67cca02dccfce6c3b19ef07e358ed943d17a8e2
-
 # TEST CURVE sect239k1
 
 PrivateKey=ALICE_sect239k1
@@ -1534,1569 +1096,2166 @@ Derive=BOB_sect239k1
 PeerKey=ALICE_sect239k1_PUB
 SharedSecret=4d1c9a8ae73f754d0a593d6e426114f4f67d7c8082ccc4e04a72b0d2aff8
 
-# TEST CURVE sect283k1
 
-PrivateKey=ALICE_sect283k1
------BEGIN PRIVATE KEY-----
-MIGQAgEAMBAGByqGSM49AgEGBSuBBAAQBHkwdwIBAQQkAGhnsmZ2UDKV3QKmq3k+
-33LQ6n5aCYvKXcMgiZlBS/RrVgIRoUwDSgAEBSgpOw5TMTc4O8HHhw5atJl5mrnW
-uC6oWVYRYpD1IMvPNTRsAYo4SYRmPIfgzVv/ESVcHVaD1lPNo+eq0HN1qhvRX+4r
-mGO7
------END PRIVATE KEY-----
+# ECDH Alice with Bob peer
 
-PublicKey=ALICE_sect283k1_PUB
------BEGIN PUBLIC KEY-----
-MF4wEAYHKoZIzj0CAQYFK4EEABADSgAEBSgpOw5TMTc4O8HHhw5atJl5mrnWuC6o
-WVYRYpD1IMvPNTRsAYo4SYRmPIfgzVv/ESVcHVaD1lPNo+eq0HN1qhvRX+4rmGO7
------END PUBLIC KEY-----
+Availablein = default
+Derive=ALICE_sect163r1
+PeerKey=BOB_sect163r1_PUB
+SharedSecret=02355c765bbc07fcc44bb1496e490912f6df56e6d4
 
-PrivPubKeyPair = ALICE_sect283k1:ALICE_sect283k1_PUB
+# ECDH Bob with Alice peer
 
+Availablein = default
+Derive=BOB_sect163r1
+PeerKey=ALICE_sect163r1_PUB
+SharedSecret=02355c765bbc07fcc44bb1496e490912f6df56e6d4
 
-PrivateKey=BOB_sect283k1
------BEGIN PRIVATE KEY-----
-MIGQAgEAMBAGByqGSM49AgEGBSuBBAAQBHkwdwIBAQQkAAJXIwfWjYbiM5jEcNw8
-8/1kbEnhVjWGivO7zDPts7AuKSMkoUwDSgAEA5Ause5pdH6ks7PdyPeoPbYAkz6V
-D5v8KTV1b97PiYmZNDeoBY78FQyHRSvdSo+oRew2RacpaCAntRoiWHyN1nAdDSzj
-CN/m
+# ECDH Alice with Bob peer
+
+Availablein = default
+Derive=ALICE_sect193r1
+PeerKey=BOB_sect193r1_PUB
+SharedSecret=00458b4c5ad122de5a377bea0adf1ab87bcb961b24ed764f47
+
+# ECDH Bob with Alice peer
+
+Availablein = default
+Derive=BOB_sect193r1
+PeerKey=ALICE_sect193r1_PUB
+SharedSecret=00458b4c5ad122de5a377bea0adf1ab87bcb961b24ed764f47
+
+# ECDH Alice with Bob peer
+
+Availablein = default
+Derive=ALICE_sect193r2
+PeerKey=BOB_sect193r2_PUB
+SharedSecret=019d1f316d204a9cd1b9632cebb4accddb204158be3e435891
+
+# ECDH Bob with Alice peer
+
+Availablein = default
+Derive=BOB_sect193r2
+PeerKey=ALICE_sect193r2_PUB
+SharedSecret=019d1f316d204a9cd1b9632cebb4accddb204158be3e435891
+
+# ECDH Alice with Bob peer
+
+Availablein = default
+Derive=ALICE_sect239k1
+PeerKey=BOB_sect239k1_PUB
+SharedSecret=4d1c9a8ae73f754d0a593d6e426114f4f67d7c8082ccc4e04a72b0d2aff8
+
+# ECDH Bob with Alice peer
+
+Availablein = default
+Derive=BOB_sect239k1
+PeerKey=ALICE_sect239k1_PUB
+SharedSecret=4d1c9a8ae73f754d0a593d6e426114f4f67d7c8082ccc4e04a72b0d2aff8
+
+# TEST CURVE c2pnb163v1
+
+PrivateKey=ALICE_c2pnb163v1
+-----BEGIN PRIVATE KEY-----
+MGYCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAEETDBKAgEBBBUDTVBXDIdMMg5JIb6y
+ZHLpkONauzuhLgMsAAQC/TaMi2YGY4SmYVCrIVVommDnOyMHJZ1VZ4+fT+hE/qRp
+WHMMW5gOZO4=
+-----END PRIVATE KEY-----
+
+PublicKey=ALICE_c2pnb163v1_PUB
+-----BEGIN PUBLIC KEY-----
+MEMwEwYHKoZIzj0CAQYIKoZIzj0DAAEDLAAEAv02jItmBmOEpmFQqyFVaJpg5zsj
+ByWdVWePn0/oRP6kaVhzDFuYDmTu
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair = ALICE_c2pnb163v1:ALICE_c2pnb163v1_PUB
+
+
+PrivateKey=BOB_c2pnb163v1
+-----BEGIN PRIVATE KEY-----
+MGYCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAEETDBKAgEBBBUC3uEAfGc3+a0FOrFh
+ftdUBtZ5BPOhLgMsAAQGojKkhnOduUQY6XT0GwQbDe1YM1wFkj3vZGkhO5OzsqG1
+QqQLkFeMwKo=
+-----END PRIVATE KEY-----
+
+PublicKey=BOB_c2pnb163v1_PUB
+-----BEGIN PUBLIC KEY-----
+MEMwEwYHKoZIzj0CAQYIKoZIzj0DAAEDLAAEBqIypIZznblEGOl09BsEGw3tWDNc
+BZI972RpITuTs7KhtUKkC5BXjMCq
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair = BOB_c2pnb163v1:BOB_c2pnb163v1_PUB
+
+
+# ECDH Alice with Bob peer
+
+Availablein = default
+Derive=ALICE_c2pnb163v1
+PeerKey=BOB_c2pnb163v1_PUB
+SharedSecret=05939a47cb503656e684f433001e45776c7620e13b
+
+# ECDH Bob with Alice peer
+
+Availablein = default
+Derive=BOB_c2pnb163v1
+PeerKey=ALICE_c2pnb163v1_PUB
+SharedSecret=05939a47cb503656e684f433001e45776c7620e13b
+
+# TEST CURVE c2pnb163v2
+
+PrivateKey=ALICE_c2pnb163v2
+-----BEGIN PRIVATE KEY-----
+MGYCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAIETDBKAgEBBBUC3m3meJNbhDwwFH3C
+//L2EyOQNruhLgMsAAQBaATOiPV6c8icBYWczLXM6k+t8U4FIN57iiC8RsmIS3+V
+yM/rN3UBZaw=
+-----END PRIVATE KEY-----
+
+PublicKey=ALICE_c2pnb163v2_PUB
+-----BEGIN PUBLIC KEY-----
+MEMwEwYHKoZIzj0CAQYIKoZIzj0DAAIDLAAEAWgEzoj1enPInAWFnMy1zOpPrfFO
+BSDee4ogvEbJiEt/lcjP6zd1AWWs
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair = ALICE_c2pnb163v2:ALICE_c2pnb163v2_PUB
+
+
+PrivateKey=BOB_c2pnb163v2
+-----BEGIN PRIVATE KEY-----
+MGYCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAIETDBKAgEBBBUBvd/DvKharywckSaW
+aAniKByXBwihLgMsAAQH0+FWe4mb13QrEZCPwfIS+gChEXoGhyBVubt6+SSgS5nS
+eDGgjW/36Qw=
+-----END PRIVATE KEY-----
+
+PublicKey=BOB_c2pnb163v2_PUB
+-----BEGIN PUBLIC KEY-----
+MEMwEwYHKoZIzj0CAQYIKoZIzj0DAAIDLAAEB9PhVnuJm9d0KxGQj8HyEvoAoRF6
+BocgVbm7evkkoEuZ0ngxoI1v9+kM
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair = BOB_c2pnb163v2:BOB_c2pnb163v2_PUB
+
+
+# ECDH Alice with Bob peer
+
+Availablein = default
+Derive=ALICE_c2pnb163v2
+PeerKey=BOB_c2pnb163v2_PUB
+SharedSecret=0779fb5f6ac7892f2f342b785d71244e0b03ca562d
+
+# ECDH Bob with Alice peer
+
+Availablein = default
+Derive=BOB_c2pnb163v2
+PeerKey=ALICE_c2pnb163v2_PUB
+SharedSecret=0779fb5f6ac7892f2f342b785d71244e0b03ca562d
+
+# TEST CURVE c2pnb163v3
+
+PrivateKey=ALICE_c2pnb163v3
+-----BEGIN PRIVATE KEY-----
+MGYCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAMETDBKAgEBBBUCtJ0ZQMD5T6Ym/jZx
+Fzb9tQkLOhuhLgMsAAQE26YD7hG+CY02+nBDFKIBnMvHWUQGfkiIfG9yxV+LptOM
+CdU4y9RhM+w=
+-----END PRIVATE KEY-----
+
+PublicKey=ALICE_c2pnb163v3_PUB
+-----BEGIN PUBLIC KEY-----
+MEMwEwYHKoZIzj0CAQYIKoZIzj0DAAMDLAAEBNumA+4RvgmNNvpwQxSiAZzLx1lE
+Bn5IiHxvcsVfi6bTjAnVOMvUYTPs
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair = ALICE_c2pnb163v3:ALICE_c2pnb163v3_PUB
+
+
+PrivateKey=BOB_c2pnb163v3
+-----BEGIN PRIVATE KEY-----
+MGYCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAMETDBKAgEBBBUB9MnYR9NXM8OoCraO
+orQz1LXIZJChLgMsAAQH15R/xAGyrtmg+hrdAaGn9rVEfWQA7yUCn4vKR2eIy/qN
+YfbeHTIaTBY=
+-----END PRIVATE KEY-----
+
+PublicKey=BOB_c2pnb163v3_PUB
+-----BEGIN PUBLIC KEY-----
+MEMwEwYHKoZIzj0CAQYIKoZIzj0DAAMDLAAEB9eUf8QBsq7ZoPoa3QGhp/a1RH1k
+AO8lAp+LykdniMv6jWH23h0yGkwW
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair = BOB_c2pnb163v3:BOB_c2pnb163v3_PUB
+
+
+# ECDH Alice with Bob peer
+
+Availablein = default
+Derive=ALICE_c2pnb163v3
+PeerKey=BOB_c2pnb163v3_PUB
+SharedSecret=02bf68863a8798e72cdc9cd3b9ce731f12654bfa81
+
+# ECDH Bob with Alice peer
+
+Availablein = default
+Derive=BOB_c2pnb163v3
+PeerKey=ALICE_c2pnb163v3_PUB
+SharedSecret=02bf68863a8798e72cdc9cd3b9ce731f12654bfa81
+
+# TEST CURVE c2pnb176v1
+
+PrivateKey=ALICE_c2pnb176v1
+-----BEGIN PRIVATE KEY-----
+MGgCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAQETjBMAgEBBBUAxXEz1PjthqsI664l
+N5LRLN8C2uyhMAMuAARD1qVJHbL5A7BhEKeHSuDeT6XeZ3ODFn9ef67qdF+tS7p3
+zgXGKt4pKMoYcg==
+-----END PRIVATE KEY-----
+
+PublicKey=ALICE_c2pnb176v1_PUB
+-----BEGIN PUBLIC KEY-----
+MEUwEwYHKoZIzj0CAQYIKoZIzj0DAAQDLgAEQ9alSR2y+QOwYRCnh0rg3k+l3mdz
+gxZ/Xn+u6nRfrUu6d84FxireKSjKGHI=
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair = ALICE_c2pnb176v1:ALICE_c2pnb176v1_PUB
+
+
+PrivateKey=BOB_c2pnb176v1
+-----BEGIN PRIVATE KEY-----
+MGgCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAQETjBMAgEBBBUAJvHHFW0v+/cjaLd7
+Xgt6FtSga5+hMAMuAASUs7rUAlv1qhppI82ikLvZ8Y0DApC356nhs7SyQYdLtHRM
++qUHBB3IzrLKdQ==
+-----END PRIVATE KEY-----
+
+PublicKey=BOB_c2pnb176v1_PUB
+-----BEGIN PUBLIC KEY-----
+MEUwEwYHKoZIzj0CAQYIKoZIzj0DAAQDLgAElLO61AJb9aoaaSPNopC72fGNAwKQ
+t+ep4bO0skGHS7R0TPqlBwQdyM6yynU=
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair = BOB_c2pnb176v1:BOB_c2pnb176v1_PUB
+
+
+# ECDH Alice with Bob peer
+
+Availablein = default
+Derive=ALICE_c2pnb176v1
+PeerKey=BOB_c2pnb176v1_PUB
+SharedSecret=b204734417542df762e09013d6ba958940837a2aa25a
+
+# ECDH Bob with Alice peer
+
+Availablein = default
+Derive=BOB_c2pnb176v1
+PeerKey=ALICE_c2pnb176v1_PUB
+SharedSecret=b204734417542df762e09013d6ba958940837a2aa25a
+
+# TEST CURVE c2tnb191v1
+
+PrivateKey=ALICE_c2tnb191v1
+-----BEGIN PRIVATE KEY-----
+MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAUEVTBTAgEBBBgYgpO+wgirUtuqHF00
+2o02Vc7xQjKgSzChNAMyAAQ2ae+5tDQ2CDaV5XPdC+RtLgcHS5lTOclTClr/WSpP
+TlMt2TGh/KRrD859oXg6KYY=
+-----END PRIVATE KEY-----
+
+PublicKey=ALICE_c2tnb191v1_PUB
+-----BEGIN PUBLIC KEY-----
+MEkwEwYHKoZIzj0CAQYIKoZIzj0DAAUDMgAENmnvubQ0Ngg2leVz3QvkbS4HB0uZ
+UznJUwpa/1kqT05TLdkxofykaw/OfaF4OimG
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair = ALICE_c2tnb191v1:ALICE_c2tnb191v1_PUB
+
+
+PrivateKey=BOB_c2tnb191v1
+-----BEGIN PRIVATE KEY-----
+MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAUEVTBTAgEBBBguzm5uFNRy/lX3OKuJ
+j8i/vH/+viMd48yhNAMyAARka5rhdTmtbqQVRMWZQjUqsHUMX43siRt5f2WQSZfg
++IQ2l/8veayyX9erUSt3gK4=
+-----END PRIVATE KEY-----
+
+PublicKey=BOB_c2tnb191v1_PUB
+-----BEGIN PUBLIC KEY-----
+MEkwEwYHKoZIzj0CAQYIKoZIzj0DAAUDMgAEZGua4XU5rW6kFUTFmUI1KrB1DF+N
+7IkbeX9lkEmX4PiENpf/L3mssl/Xq1Erd4Cu
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair = BOB_c2tnb191v1:BOB_c2tnb191v1_PUB
+
+
+# ECDH Alice with Bob peer
+
+Availablein = default
+Derive=ALICE_c2tnb191v1
+PeerKey=BOB_c2tnb191v1_PUB
+SharedSecret=7a30d30acd3b067f38bb3be9e8cdef739483df26455e36e1
+
+# ECDH Bob with Alice peer
+
+Availablein = default
+Derive=BOB_c2tnb191v1
+PeerKey=ALICE_c2tnb191v1_PUB
+SharedSecret=7a30d30acd3b067f38bb3be9e8cdef739483df26455e36e1
+
+# TEST CURVE c2tnb191v2
+
+PrivateKey=ALICE_c2tnb191v2
+-----BEGIN PRIVATE KEY-----
+MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAYEVTBTAgEBBBgOlslgJ0XSK3vKC5Ls
+QmYxZfr8OEKXRQ2hNAMyAAQAHivLhSwW2SJZtUPhuV1p9fQSfz7w9SJY8dJOpVf8
+9DevPUlJMPcaSGyjX+3nJZc=
+-----END PRIVATE KEY-----
+
+PublicKey=ALICE_c2tnb191v2_PUB
+-----BEGIN PUBLIC KEY-----
+MEkwEwYHKoZIzj0CAQYIKoZIzj0DAAYDMgAEAB4ry4UsFtkiWbVD4bldafX0En8+
+8PUiWPHSTqVX/PQ3rz1JSTD3Gkhso1/t5yWX
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair = ALICE_c2tnb191v2:ALICE_c2tnb191v2_PUB
+
+
+PrivateKey=BOB_c2tnb191v2
+-----BEGIN PRIVATE KEY-----
+MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAYEVTBTAgEBBBgK9QaS2SDU6yz7uXqO
++/+C+baTTVMAGVGhNAMyAAQiR0t9plm77ezfXvJzDNdlyYC0pWX+QmJ8EavgEElk
+ky/M+YXb5ufkFzFXIEfU9pM=
+-----END PRIVATE KEY-----
+
+PublicKey=BOB_c2tnb191v2_PUB
+-----BEGIN PUBLIC KEY-----
+MEkwEwYHKoZIzj0CAQYIKoZIzj0DAAYDMgAEIkdLfaZZu+3s317ycwzXZcmAtKVl
+/kJifBGr4BBJZJMvzPmF2+bn5BcxVyBH1PaT
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair = BOB_c2tnb191v2:BOB_c2tnb191v2_PUB
+
+
+# ECDH Alice with Bob peer
+
+Availablein = default
+Derive=ALICE_c2tnb191v2
+PeerKey=BOB_c2tnb191v2_PUB
+SharedSecret=5ec2b6ccd193620dbad302c4ad8f8909a40698bf454d7534
+
+# ECDH Bob with Alice peer
+
+Availablein = default
+Derive=BOB_c2tnb191v2
+PeerKey=ALICE_c2tnb191v2_PUB
+SharedSecret=5ec2b6ccd193620dbad302c4ad8f8909a40698bf454d7534
+
+# TEST CURVE c2tnb191v3
+
+PrivateKey=ALICE_c2tnb191v3
+-----BEGIN PRIVATE KEY-----
+MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAcEVTBTAgEBBBgSaBOQyq6XX3hZVVgV
+FlRrxTuvgtv33C6hNAMyAARL+Fup8jOnixQYPx8pU/b066PHrhTXfiNerFEYA/5O
+XCKCEkdRCpuDJnyqpmaC2vw=
+-----END PRIVATE KEY-----
+
+PublicKey=ALICE_c2tnb191v3_PUB
+-----BEGIN PUBLIC KEY-----
+MEkwEwYHKoZIzj0CAQYIKoZIzj0DAAcDMgAES/hbqfIzp4sUGD8fKVP29Oujx64U
+134jXqxRGAP+TlwighJHUQqbgyZ8qqZmgtr8
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair = ALICE_c2tnb191v3:ALICE_c2tnb191v3_PUB
+
+
+PrivateKey=BOB_c2tnb191v3
+-----BEGIN PRIVATE KEY-----
+MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAcEVTBTAgEBBBgEE8Ls7pc1/q3/0ruR
+gMrWGhGIr4VLt4uhNAMyAAQHAZsjkAXanwGbXR3SKkoKli6rSfSiu0lU2XHDiZdt
+LaPN+Eihz4KeG2YM/p3m1do=
+-----END PRIVATE KEY-----
+
+PublicKey=BOB_c2tnb191v3_PUB
+-----BEGIN PUBLIC KEY-----
+MEkwEwYHKoZIzj0CAQYIKoZIzj0DAAcDMgAEBwGbI5AF2p8Bm10d0ipKCpYuq0n0
+ortJVNlxw4mXbS2jzfhIoc+CnhtmDP6d5tXa
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair = BOB_c2tnb191v3:BOB_c2tnb191v3_PUB
+
+
+# ECDH Alice with Bob peer
+
+Availablein = default
+Derive=ALICE_c2tnb191v3
+PeerKey=BOB_c2tnb191v3_PUB
+SharedSecret=39093dc8a2e6724a6206ed41bb99490d527d80c902c41891
+
+# ECDH Bob with Alice peer
+
+Availablein = default
+Derive=BOB_c2tnb191v3
+PeerKey=ALICE_c2tnb191v3_PUB
+SharedSecret=39093dc8a2e6724a6206ed41bb99490d527d80c902c41891
+
+# TEST CURVE c2pnb208w1
+
+PrivateKey=ALICE_c2pnb208w1
+-----BEGIN PRIVATE KEY-----
+MHQCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAoEWjBYAgEBBBkAbfnNboX6Dk+NLoBO
+6qBB2aE1srmTgS96oTgDNgAEFLHciAu4excYB0mty8rF442ULXZfqL90IkgP5G2z
+wzY1mAlEBFMg83izeRaCJ/vRihZDJw==
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_sect283k1_PUB
+PublicKey=ALICE_c2pnb208w1_PUB
 -----BEGIN PUBLIC KEY-----
-MF4wEAYHKoZIzj0CAQYFK4EEABADSgAEA5Ause5pdH6ks7PdyPeoPbYAkz6VD5v8
-KTV1b97PiYmZNDeoBY78FQyHRSvdSo+oRew2RacpaCAntRoiWHyN1nAdDSzjCN/m
+ME0wEwYHKoZIzj0CAQYIKoZIzj0DAAoDNgAEFLHciAu4excYB0mty8rF442ULXZf
+qL90IkgP5G2zwzY1mAlEBFMg83izeRaCJ/vRihZDJw==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_sect283k1:BOB_sect283k1_PUB
+PrivPubKeyPair = ALICE_c2pnb208w1:ALICE_c2pnb208w1_PUB
+
+
+PrivateKey=BOB_c2pnb208w1
+-----BEGIN PRIVATE KEY-----
+MHQCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAoEWjBYAgEBBBkAwjGFJOPkZqQPZ+mI
+Ae3G12zpUia40tRjoTgDNgAEDxaP6u0phDLfM4RsZhgIfZy8CurR4/IPtqMGxbfz
+pPKPMZXV12F6MrWrorSFDZ8KFd58Ww==
+-----END PRIVATE KEY-----
+
+PublicKey=BOB_c2pnb208w1_PUB
+-----BEGIN PUBLIC KEY-----
+ME0wEwYHKoZIzj0CAQYIKoZIzj0DAAoDNgAEDxaP6u0phDLfM4RsZhgIfZy8CurR
+4/IPtqMGxbfzpPKPMZXV12F6MrWrorSFDZ8KFd58Ww==
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair = BOB_c2pnb208w1:BOB_c2pnb208w1_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_sect283k1
-PeerKey=BOB_sect283k1_PUB
-SharedSecret=02f2e682c2f60d7261624f3661a5e85fca920443b72aa4dd5a540082e65e552302d8f825
+Availablein = default
+Derive=ALICE_c2pnb208w1
+PeerKey=BOB_c2pnb208w1_PUB
+SharedSecret=59bf3c91bd168d4d4d900d9ce155933045e0fd16dcf0511bb5af
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_sect283k1
-PeerKey=ALICE_sect283k1_PUB
-SharedSecret=02f2e682c2f60d7261624f3661a5e85fca920443b72aa4dd5a540082e65e552302d8f825
+Availablein = default
+Derive=BOB_c2pnb208w1
+PeerKey=ALICE_c2pnb208w1_PUB
+SharedSecret=59bf3c91bd168d4d4d900d9ce155933045e0fd16dcf0511bb5af
 
-# TEST CURVE sect283r1
+# TEST CURVE c2tnb239v1
 
-PrivateKey=ALICE_sect283r1
+PrivateKey=ALICE_c2tnb239v1
 -----BEGIN PRIVATE KEY-----
-MIGQAgEAMBAGByqGSM49AgEGBSuBBAARBHkwdwIBAQQkAi4Jrhu19kt7H8jw1FO7
-VzCxh6p0pI0ogl3q9ev5NFkufZkZoUwDSgAEAHx6cwnWw+9l3oZHpx+R8nu7SLqU
-S40TU2uL0W6VTNANIvcJB1b++3okH0FJgFAahbaotafYTyfqCoY11VaxnVqU5/aE
-7jsD
+MIGBAgEAMBMGByqGSM49AgEGCCqGSM49AwALBGcwZQIBAQQeE4CCwXEKsP3CfLC/
+DLSSF9lfyOaNSuQXmq9rzLqwoUADPgAEM6oQIsXJs+ANKQpF3DzBdG4FdS5DS+qp
+c5fVTsZiI4FAWCXUvzzPTRAex3wwvF/4JrYK6cKVh8i1EOrN
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_sect283r1_PUB
+PublicKey=ALICE_c2tnb239v1_PUB
 -----BEGIN PUBLIC KEY-----
-MF4wEAYHKoZIzj0CAQYFK4EEABEDSgAEAHx6cwnWw+9l3oZHpx+R8nu7SLqUS40T
-U2uL0W6VTNANIvcJB1b++3okH0FJgFAahbaotafYTyfqCoY11VaxnVqU5/aE7jsD
+MFUwEwYHKoZIzj0CAQYIKoZIzj0DAAsDPgAEM6oQIsXJs+ANKQpF3DzBdG4FdS5D
+S+qpc5fVTsZiI4FAWCXUvzzPTRAex3wwvF/4JrYK6cKVh8i1EOrN
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_sect283r1:ALICE_sect283r1_PUB
+PrivPubKeyPair = ALICE_c2tnb239v1:ALICE_c2tnb239v1_PUB
 
 
-PrivateKey=BOB_sect283r1
+PrivateKey=BOB_c2tnb239v1
 -----BEGIN PRIVATE KEY-----
-MIGQAgEAMBAGByqGSM49AgEGBSuBBAARBHkwdwIBAQQkACD04gJaVfVxK/Dpbxjq
-rzZWc6B76a23MK/IQD1jMlGPQzzxoUwDSgAEA13mIYMvik12DBp8JkdETMB1ewOw
-22C/xhnzLEHmgrG0ewxeANVAoIZy2uv5t0VUJIp4PYdLNaqIguN+9v6U78O4lass
-Iq5I
+MIGBAgEAMBMGByqGSM49AgEGCCqGSM49AwALBGcwZQIBAQQeAGDYCGAXqD03x510
+h35JSzlgReW6W/T8lYPEA42doUADPgAECk6Uyh8ULkOVOxZSNZYGwtko/oy7ZLDP
+F8dbsEZTeYIBpQ6hWqZ/4Nz3RyzfoukyfCb3b8OMtpq+Qgio
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_sect283r1_PUB
+PublicKey=BOB_c2tnb239v1_PUB
 -----BEGIN PUBLIC KEY-----
-MF4wEAYHKoZIzj0CAQYFK4EEABEDSgAEA13mIYMvik12DBp8JkdETMB1ewOw22C/
-xhnzLEHmgrG0ewxeANVAoIZy2uv5t0VUJIp4PYdLNaqIguN+9v6U78O4lassIq5I
+MFUwEwYHKoZIzj0CAQYIKoZIzj0DAAsDPgAECk6Uyh8ULkOVOxZSNZYGwtko/oy7
+ZLDPF8dbsEZTeYIBpQ6hWqZ/4Nz3RyzfoukyfCb3b8OMtpq+Qgio
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_sect283r1:BOB_sect283r1_PUB
+PrivPubKeyPair = BOB_c2tnb239v1:BOB_c2tnb239v1_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_sect283r1
-PeerKey=BOB_sect283r1_PUB
-SharedSecret=05778bc1afcf38d7dddb2150cacbfe4d38dc588968fd8b2e859c28ae2629d3435f89f6cc
+Availablein = default
+Derive=ALICE_c2tnb239v1
+PeerKey=BOB_c2tnb239v1_PUB
+SharedSecret=78c42256900725df9a47bb042cef7dad9f639b32e3010738a144e7472d1a
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_sect283r1
-PeerKey=ALICE_sect283r1_PUB
-SharedSecret=05778bc1afcf38d7dddb2150cacbfe4d38dc588968fd8b2e859c28ae2629d3435f89f6cc
+Availablein = default
+Derive=BOB_c2tnb239v1
+PeerKey=ALICE_c2tnb239v1_PUB
+SharedSecret=78c42256900725df9a47bb042cef7dad9f639b32e3010738a144e7472d1a
 
-# TEST CURVE sect409k1
+# TEST CURVE c2tnb239v2
 
-PrivateKey=ALICE_sect409k1
+PrivateKey=ALICE_c2tnb239v2
 -----BEGIN PRIVATE KEY-----
-MIHBAgEAMBAGByqGSM49AgEGBSuBBAAkBIGpMIGmAgEBBDMg1vV7wiPe1ovX+ukz
-VfwPZoqvyj/vdif04Opi9PcjV5mPBEZgSFBg8hbutNxZJdVLrxShbANqAAQACe1I
-J5ilSk1pPLvbcjEZIE6abC9LZ9WmHuNJxM9LAW1OuLvJGi72AsGYUOGpX0WGmK6C
-AYaqZb2Qeedq/yUIljDHYi66J+26owYl7lOMpRzZ9U2QDJrZ7TYuxeMUui6re0B+
-JuZdYw==
+MIGBAgEAMBMGByqGSM49AgEGCCqGSM49AwAMBGcwZQIBAQQeE8kBjHLjFeC+Z2gZ
+q0snwR3UgEgWMW0xilhJNjW2oUADPgAEQ+ubIYhh82VohwKSVz70PkHsjmYWDvDU
+/SBRk8AiP71CM9D7XEKK5tnU94MtK2Kscx5nWZFc+oIh1+sY
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_sect409k1_PUB
+PublicKey=ALICE_c2tnb239v2_PUB
 -----BEGIN PUBLIC KEY-----
-MH4wEAYHKoZIzj0CAQYFK4EEACQDagAEAAntSCeYpUpNaTy723IxGSBOmmwvS2fV
-ph7jScTPSwFtTri7yRou9gLBmFDhqV9FhpiuggGGqmW9kHnnav8lCJYwx2Iuuift
-uqMGJe5TjKUc2fVNkAya2e02LsXjFLouq3tAfibmXWM=
+MFUwEwYHKoZIzj0CAQYIKoZIzj0DAAwDPgAEQ+ubIYhh82VohwKSVz70PkHsjmYW
+DvDU/SBRk8AiP71CM9D7XEKK5tnU94MtK2Kscx5nWZFc+oIh1+sY
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_sect409k1:ALICE_sect409k1_PUB
+PrivPubKeyPair = ALICE_c2tnb239v2:ALICE_c2tnb239v2_PUB
 
 
-PrivateKey=BOB_sect409k1
+PrivateKey=BOB_c2tnb239v2
 -----BEGIN PRIVATE KEY-----
-MIHBAgEAMBAGByqGSM49AgEGBSuBBAAkBIGpMIGmAgEBBDMIYBGZZcZz4qCdhAV9
-vqpfe8vV+vJEhjawR52JUV1rumWEBPAx0o6E+gaxHBr5hzVGkIKhbANqAAQAAQKK
-s60CTUUkltsT+lIBukjz850pkGGLltJ4eaZn4k9AtN/lFTCq6Vgqe2sDrjA3b45q
-AdWjf1vRaP0wawJ13SjApJmyXg5hQks6d0Zqz2OHYhGEGiM159VtTlStK067dVe1
-fGVDeg==
+MIGBAgEAMBMGByqGSM49AgEGCCqGSM49AwAMBGcwZQIBAQQeE7bhzKZZUm780c0e
+3EBWY1GxD90Mzu7zrQMi7bAzoUADPgAEYgV7bokY6iLMzZTG10c6NDaW11plAm0T
+NKVVwzPqe3ylhsQmmm02LHKX0gN4E1dUS0uClBbMGNq2mhln
+-----END PRIVATE KEY-----
+
+PublicKey=BOB_c2tnb239v2_PUB
+-----BEGIN PUBLIC KEY-----
+MFUwEwYHKoZIzj0CAQYIKoZIzj0DAAwDPgAEYgV7bokY6iLMzZTG10c6NDaW11pl
+Am0TNKVVwzPqe3ylhsQmmm02LHKX0gN4E1dUS0uClBbMGNq2mhln
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair = BOB_c2tnb239v2:BOB_c2tnb239v2_PUB
+
+
+# ECDH Alice with Bob peer
+
+Availablein = default
+Derive=ALICE_c2tnb239v2
+PeerKey=BOB_c2tnb239v2_PUB
+SharedSecret=4ba2ecfa8ec7a375594d1673886cccf96d7763c55611b3c9008a35160192
+
+# ECDH Bob with Alice peer
+
+Availablein = default
+Derive=BOB_c2tnb239v2
+PeerKey=ALICE_c2tnb239v2_PUB
+SharedSecret=4ba2ecfa8ec7a375594d1673886cccf96d7763c55611b3c9008a35160192
+
+# TEST CURVE c2tnb239v3
+
+PrivateKey=ALICE_c2tnb239v3
+-----BEGIN PRIVATE KEY-----
+MIGBAgEAMBMGByqGSM49AgEGCCqGSM49AwANBGcwZQIBAQQeCxiC5lbHYL1QYbb2
+izZiSoLPnWCZIds811J1N7KtoUADPgAEdHMz+tsuO7VcO9IFgsSWTweLoB1ah5WI
+g6cWrtcUfmO7EGfPwNni4Bf8No7rGGMwbisW0v6Jv2pkTSM8
+-----END PRIVATE KEY-----
+
+PublicKey=ALICE_c2tnb239v3_PUB
+-----BEGIN PUBLIC KEY-----
+MFUwEwYHKoZIzj0CAQYIKoZIzj0DAA0DPgAEdHMz+tsuO7VcO9IFgsSWTweLoB1a
+h5WIg6cWrtcUfmO7EGfPwNni4Bf8No7rGGMwbisW0v6Jv2pkTSM8
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair = ALICE_c2tnb239v3:ALICE_c2tnb239v3_PUB
+
+
+PrivateKey=BOB_c2tnb239v3
+-----BEGIN PRIVATE KEY-----
+MIGBAgEAMBMGByqGSM49AgEGCCqGSM49AwANBGcwZQIBAQQeBBPxdeU3MohZc5Jx
+7WadLuPSeXeOg75rXC1ElexsoUADPgAEaHwiwQmoqbPij8+l6hLHVQz0AZLBT5uX
+hAh8fhTABKqI7qYShICAAX0tvu3EvQ8BQLP14grxUsSoEqAF
+-----END PRIVATE KEY-----
+
+PublicKey=BOB_c2tnb239v3_PUB
+-----BEGIN PUBLIC KEY-----
+MFUwEwYHKoZIzj0CAQYIKoZIzj0DAA0DPgAEaHwiwQmoqbPij8+l6hLHVQz0AZLB
+T5uXhAh8fhTABKqI7qYShICAAX0tvu3EvQ8BQLP14grxUsSoEqAF
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair = BOB_c2tnb239v3:BOB_c2tnb239v3_PUB
+
+
+# ECDH Alice with Bob peer
+
+Availablein = default
+Derive=ALICE_c2tnb239v3
+PeerKey=BOB_c2tnb239v3_PUB
+SharedSecret=47ad60e5480375fccd9246c93ab04da8e5da83e1dbf5f177f10a47cb54a0
+
+# ECDH Bob with Alice peer
+
+Availablein = default
+Derive=BOB_c2tnb239v3
+PeerKey=ALICE_c2tnb239v3_PUB
+SharedSecret=47ad60e5480375fccd9246c93ab04da8e5da83e1dbf5f177f10a47cb54a0
+
+# TEST CURVE c2pnb272w1
+
+PrivateKey=ALICE_c2pnb272w1
+-----BEGIN PRIVATE KEY-----
+MIGMAgEAMBMGByqGSM49AgEGCCqGSM49AwAQBHIwcAIBAQQhAKMtKddENVGjzTU4
+w+hW0SgDOtIElcs52wb40S08j6gMoUgDRgAEfGvSzQo+00VXIDXV7iiGXpI16kzs
+6C8rkchA5sVBBY56nSCp0n4FpIXRzafiFQklJD9OrJzA6PXc7tp2n2XhIwvuOmI=
+-----END PRIVATE KEY-----
+
+PublicKey=ALICE_c2pnb272w1_PUB
+-----BEGIN PUBLIC KEY-----
+MF0wEwYHKoZIzj0CAQYIKoZIzj0DABADRgAEfGvSzQo+00VXIDXV7iiGXpI16kzs
+6C8rkchA5sVBBY56nSCp0n4FpIXRzafiFQklJD9OrJzA6PXc7tp2n2XhIwvuOmI=
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair = ALICE_c2pnb272w1:ALICE_c2pnb272w1_PUB
+
+
+PrivateKey=BOB_c2pnb272w1
+-----BEGIN PRIVATE KEY-----
+MIGMAgEAMBMGByqGSM49AgEGCCqGSM49AwAQBHIwcAIBAQQhAFAKPByX1wlYUpU4
+mECDAxg+VM5aFo4JPlqEzR0b9hI6oUgDRgAEL8+863IU4uxbEY8jVBjhsrG4W6AF
+MF6t+aGvoiKHtEMLQa6U158TRapDWp4eRurm6Idvv7hepCPqOMEGySDUwMECiQM=
+-----END PRIVATE KEY-----
+
+PublicKey=BOB_c2pnb272w1_PUB
+-----BEGIN PUBLIC KEY-----
+MF0wEwYHKoZIzj0CAQYIKoZIzj0DABADRgAEL8+863IU4uxbEY8jVBjhsrG4W6AF
+MF6t+aGvoiKHtEMLQa6U158TRapDWp4eRurm6Idvv7hepCPqOMEGySDUwMECiQM=
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair = BOB_c2pnb272w1:BOB_c2pnb272w1_PUB
+
+
+# ECDH Alice with Bob peer
+
+Availablein = default
+Derive=ALICE_c2pnb272w1
+PeerKey=BOB_c2pnb272w1_PUB
+SharedSecret=3ae063b2bed6ba8aa28ff35e9bd2673f22ee8087860c86b89429a5b52538216632a3
+
+# ECDH Bob with Alice peer
+
+Availablein = default
+Derive=BOB_c2pnb272w1
+PeerKey=ALICE_c2pnb272w1_PUB
+SharedSecret=3ae063b2bed6ba8aa28ff35e9bd2673f22ee8087860c86b89429a5b52538216632a3
+
+# TEST CURVE c2pnb304w1
+
+PrivateKey=ALICE_c2pnb304w1
+-----BEGIN PRIVATE KEY-----
+MIGYAgEAMBMGByqGSM49AgEGCCqGSM49AwARBH4wfAIBAQQlAOKzfcV2XOvVsSUh
+oVz3SHGzSCf0q9i+ilz5ZfBxc+5ssjK7jKFQA04ABDc4zQNFaZukj9iz3iXTYdza
+tCOYZvrfOjrbgzl/8PoFxt5q6yJTu35Vu9XVp5pTCtjpDEpywBj0xb07RRuVDEk8
+TthFP5vGeTIWLD4=
+-----END PRIVATE KEY-----
+
+PublicKey=ALICE_c2pnb304w1_PUB
+-----BEGIN PUBLIC KEY-----
+MGUwEwYHKoZIzj0CAQYIKoZIzj0DABEDTgAENzjNA0Vpm6SP2LPeJdNh3Nq0I5hm
++t86OtuDOX/w+gXG3mrrIlO7flW71dWnmlMK2OkMSnLAGPTFvTtFG5UMSTxO2EU/
+m8Z5MhYsPg==
+-----END PUBLIC KEY-----
+
+PrivPubKeyPair = ALICE_c2pnb304w1:ALICE_c2pnb304w1_PUB
+
+
+PrivateKey=BOB_c2pnb304w1
+-----BEGIN PRIVATE KEY-----
+MIGYAgEAMBMGByqGSM49AgEGCCqGSM49AwARBH4wfAIBAQQlAPP4hz6sa+KdTJ4h
+fBeCUiJBfshcZoapkZMFrhI1vdcRY7MeAaFQA04ABMHRUzLiUY7O4nEBdmex31U4
+l6TO/dD+5MV/tVNizVsWjkTvi2fs772lZ9MeNp6QnGMZ5n5subHsa0QOJL1LpmXX
+K0UIWGbW0nQb52g=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_sect409k1_PUB
+PublicKey=BOB_c2pnb304w1_PUB
 -----BEGIN PUBLIC KEY-----
-MH4wEAYHKoZIzj0CAQYFK4EEACQDagAEAAECirOtAk1FJJbbE/pSAbpI8/OdKZBh
-i5bSeHmmZ+JPQLTf5RUwqulYKntrA64wN2+OagHVo39b0Wj9MGsCdd0owKSZsl4O
-YUJLOndGas9jh2IRhBojNefVbU5UrStOu3VXtXxlQ3o=
+MGUwEwYHKoZIzj0CAQYIKoZIzj0DABEDTgAEwdFTMuJRjs7icQF2Z7HfVTiXpM79
+0P7kxX+1U2LNWxaORO+LZ+zvvaVn0x42npCcYxnmfmy5sexrRA4kvUumZdcrRQhY
+ZtbSdBvnaA==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_sect409k1:BOB_sect409k1_PUB
+PrivPubKeyPair = BOB_c2pnb304w1:BOB_c2pnb304w1_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_sect409k1
-PeerKey=BOB_sect409k1_PUB
-SharedSecret=01523ec40ad40226a57281a4c423801ae9495dcf736eddd667023b1390977d018ce79313fb99c503f39cbee80f5c1968f3bd02e0
+Availablein = default
+Derive=ALICE_c2pnb304w1
+PeerKey=BOB_c2pnb304w1_PUB
+SharedSecret=6df88b20de9f095c7632234291ea4658a9265cd2293424e11ed56705b09a069f09dc4e055eb7
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_sect409k1
-PeerKey=ALICE_sect409k1_PUB
-SharedSecret=01523ec40ad40226a57281a4c423801ae9495dcf736eddd667023b1390977d018ce79313fb99c503f39cbee80f5c1968f3bd02e0
+Availablein = default
+Derive=BOB_c2pnb304w1
+PeerKey=ALICE_c2pnb304w1_PUB
+SharedSecret=6df88b20de9f095c7632234291ea4658a9265cd2293424e11ed56705b09a069f09dc4e055eb7
 
-# TEST CURVE sect409r1
+# TEST CURVE c2tnb359v1
 
-PrivateKey=ALICE_sect409r1
+PrivateKey=ALICE_c2tnb359v1
 -----BEGIN PRIVATE KEY-----
-MIHCAgEAMBAGByqGSM49AgEGBSuBBAAlBIGqMIGnAgEBBDQAYTMsTpey51D2ULnd
-pN+AAWnJLy9pTerziakhjii8OyWKpUVfpDFNneCCd2oQTDcPX5vdoWwDagAEAYfk
-3ZejxpVYCG7dYHTVhhcqILEyTYoQa4YehGPxKcbmgpqW4Wev1tEDVI3JIowICYGU
-owHXXzgDXoJeR79wgb7ySAlXJXgQ8Ficr7i0CaqyAuIpFw9FWJT3jheFwnbpDTvI
-eIozlf4=
+MIGwAgEAMBMGByqGSM49AgEGCCqGSM49AwASBIGVMIGSAgEBBC0BeMU97SvjsIvQ
+1v+Ztf56OCL8JXHxRJDQZ5gWEa4c2b3FZXFVC4CwEPd7cB+hXgNcAAQOBgLp0TzS
+4Hf/VYbJCFuj3OlRC5JMzFV7ox41ubhl5Ij+gHIodu1bQ6cqd0YAb2/30PxwX++N
+NpFvq8u8435zhPYXsut6txOPNU5ZzCeagy2xsKacXSZc7D0=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_sect409r1_PUB
+PublicKey=ALICE_c2tnb359v1_PUB
 -----BEGIN PUBLIC KEY-----
-MH4wEAYHKoZIzj0CAQYFK4EEACUDagAEAYfk3ZejxpVYCG7dYHTVhhcqILEyTYoQ
-a4YehGPxKcbmgpqW4Wev1tEDVI3JIowICYGUowHXXzgDXoJeR79wgb7ySAlXJXgQ
-8Ficr7i0CaqyAuIpFw9FWJT3jheFwnbpDTvIeIozlf4=
+MHMwEwYHKoZIzj0CAQYIKoZIzj0DABIDXAAEDgYC6dE80uB3/1WGyQhbo9zpUQuS
+TMxVe6MeNbm4ZeSI/oByKHbtW0OnKndGAG9v99D8cF/vjTaRb6vLvON+c4T2F7Lr
+ercTjzVOWcwnmoMtsbCmnF0mXOw9
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_sect409r1:ALICE_sect409r1_PUB
+PrivPubKeyPair = ALICE_c2tnb359v1:ALICE_c2tnb359v1_PUB
 
 
-PrivateKey=BOB_sect409r1
+PrivateKey=BOB_c2tnb359v1
 -----BEGIN PRIVATE KEY-----
-MIHCAgEAMBAGByqGSM49AgEGBSuBBAAlBIGqMIGnAgEBBDQAsCs1nRgwW97TdKIH
-PRcsqmK1e8TIZ00e6rqLb3nD4sIe+Gw/fGhSUER9akQ7lAluEUnfoWwDagAEAfM2
-fvBEic+7jV4oC+v8GfsunD9Zp9rzNgMp3dJ+ZU7r6Bp+ZH3dL9Uvv8kUiB89UlDl
-LwBm/W6TlzGuh1FnzXYKVnhnXpzSlRZQsPCceKukbV46Asl8O23b2+DPJgQBGbMf
-WsgK+KA=
+MIGwAgEAMBMGByqGSM49AgEGCCqGSM49AwASBIGVMIGSAgEBBC0BRZ3IIh3mrLIX
+KBbh6Vj7TXNY5bzRuD5/ayHPlHQkJcd8K66dOqu7hgaN91GhXgNcAAQ7njbTQ2xY
+YZtkKswYr8E6P/R3Dg/XEZgQQ72B4qXnqbK/SgYsZAntFg7CRztcTkHjKAgdSz6f
+TRIc4///gwXN3Oi6D8PeswhzPJi/uLmCAHMm3GT6SUO3aTY=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_sect409r1_PUB
+PublicKey=BOB_c2tnb359v1_PUB
 -----BEGIN PUBLIC KEY-----
-MH4wEAYHKoZIzj0CAQYFK4EEACUDagAEAfM2fvBEic+7jV4oC+v8GfsunD9Zp9rz
-NgMp3dJ+ZU7r6Bp+ZH3dL9Uvv8kUiB89UlDlLwBm/W6TlzGuh1FnzXYKVnhnXpzS
-lRZQsPCceKukbV46Asl8O23b2+DPJgQBGbMfWsgK+KA=
+MHMwEwYHKoZIzj0CAQYIKoZIzj0DABIDXAAEO54200NsWGGbZCrMGK/BOj/0dw4P
+1xGYEEO9geKl56myv0oGLGQJ7RYOwkc7XE5B4ygIHUs+n00SHOP//4MFzdzoug/D
+3rMIczyYv7i5ggBzJtxk+klDt2k2
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_sect409r1:BOB_sect409r1_PUB
+PrivPubKeyPair = BOB_c2tnb359v1:BOB_c2tnb359v1_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_sect409r1
-PeerKey=BOB_sect409r1_PUB
-SharedSecret=019dc849870dc6f79978aca8e1fc6aa6836c8fcb25bbfe3d5ab41ea53eae2c7329952280efb30f9097a31a774191e476dbd842d5
+Availablein = default
+Derive=ALICE_c2tnb359v1
+PeerKey=BOB_c2tnb359v1_PUB
+SharedSecret=1d3f3396492d130caea54233c79833e90a072fe883071bb08cec671ce0319f0bc39c68dda0199952152a5c3563
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_sect409r1
-PeerKey=ALICE_sect409r1_PUB
-SharedSecret=019dc849870dc6f79978aca8e1fc6aa6836c8fcb25bbfe3d5ab41ea53eae2c7329952280efb30f9097a31a774191e476dbd842d5
+Availablein = default
+Derive=BOB_c2tnb359v1
+PeerKey=ALICE_c2tnb359v1_PUB
+SharedSecret=1d3f3396492d130caea54233c79833e90a072fe883071bb08cec671ce0319f0bc39c68dda0199952152a5c3563
 
-# TEST CURVE sect571k1
+# TEST CURVE c2pnb368w1
 
-PrivateKey=ALICE_sect571k1
+PrivateKey=ALICE_c2pnb368w1
 -----BEGIN PRIVATE KEY-----
-MIIBAAIBADAQBgcqhkjOPQIBBgUrgQQAJgSB6DCB5QIBAQRIARO8hI8j6TZ556/d
-RcdGYvdblnALD2XZCKu2c3C5yQIeA8Tidi+f8n6cCnb5FtJNTYKqP8tRfHlwAZtW
-/giXi/4yF5K2twS3oYGVA4GSAAQAtiuUbz7v6njhujnDhanD4iV84K0LQd9wP1+k
-v0Bn833nKtFrZComgrip2SwUaEYOE6IcPyCJ48vWOKvIR6fU11tWwsFRPU0Cct0S
-qVbANAJzwL1umwuKNPblJ6ZEwcBdgw7hWFL6sh+0ayAQ3a8zOizhViJPCnaKR/Oo
-AtaUpCWLSTHDF1gK4/kmlwEx+8o=
+MIGyAgEAMBMGByqGSM49AgEGCCqGSM49AwATBIGXMIGUAgEBBC0AFagbth/4/M2s
+b1G4FpxbFEVLIulioS34v0hrClpZ38/Z+PHmIhOfEFminyehYANeAAQAU42w7mII
+jkyAdnCC4qoEPdH42fh3oVyCtnaRtKUmdhUdXm0IgSM4T4SYEOsx+aQZLGIjnhHJ
+CabcaKPQ0sai3dirUr2YsNXNDJiU93T7buUr+DnRPGsfBy/nEg==
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_sect571k1_PUB
+PublicKey=ALICE_c2pnb368w1_PUB
 -----BEGIN PUBLIC KEY-----
-MIGnMBAGByqGSM49AgEGBSuBBAAmA4GSAAQAtiuUbz7v6njhujnDhanD4iV84K0L
-Qd9wP1+kv0Bn833nKtFrZComgrip2SwUaEYOE6IcPyCJ48vWOKvIR6fU11tWwsFR
-PU0Cct0SqVbANAJzwL1umwuKNPblJ6ZEwcBdgw7hWFL6sh+0ayAQ3a8zOizhViJP
-CnaKR/OoAtaUpCWLSTHDF1gK4/kmlwEx+8o=
+MHUwEwYHKoZIzj0CAQYIKoZIzj0DABMDXgAEAFONsO5iCI5MgHZwguKqBD3R+Nn4
+d6FcgrZ2kbSlJnYVHV5tCIEjOE+EmBDrMfmkGSxiI54RyQmm3Gij0NLGot3Yq1K9
+mLDVzQyYlPd0+27lK/g50TxrHwcv5xI=
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_sect571k1:ALICE_sect571k1_PUB
+PrivPubKeyPair = ALICE_c2pnb368w1:ALICE_c2pnb368w1_PUB
 
 
-PrivateKey=BOB_sect571k1
+PrivateKey=BOB_c2pnb368w1
 -----BEGIN PRIVATE KEY-----
-MIIBAAIBADAQBgcqhkjOPQIBBgUrgQQAJgSB6DCB5QIBAQRIAVZT4tnX9dMWS6Vd
-YCoYRl9o/j/Hz7KGqF4Ujk9n9b4+mXbJ37tobpjnpNqKlJfI04w80JPp+NxpoBR3
-8p1bcc9iL4Smh48YoYGVA4GSAAQARzAx9yVkHL8pbe1myosILIhhLLURYRDHmopO
-IijLQmTATV9pYO7CrFBPBjaKNRjPpw/cVOs89X9Jdzx/bolkGqVAsjLN1tsCrqET
-31F4mpnfsPwcM6zbp6lE4N2gL5cakKMmyPNM4d3m8xl1f6e56LBYfaxOaqcYzbXC
-Q/Aiij13H06qKhuFM4iiB/0D164=
+MIGyAgEAMBMGByqGSM49AgEGCCqGSM49AwATBIGXMIGUAgEBBC0AA/woMzOFy8k2
+zBqBkubhkOIwc7sx0u+JadM9f7V45L4P8nK7bjJasOqrHRahYANeAATKE6jcstac
+H8yWzg/qBgvGoGan2PVwTN/U+68K4WxHO7+oPHviUh1OVF7ZxYjsVSdyno83iHE3
+3sq2Ej6j26f+uVs/fuWk19t8NpAQ6+sVETZszuMDm5adqtVZRQ==
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_sect571k1_PUB
+PublicKey=BOB_c2pnb368w1_PUB
 -----BEGIN PUBLIC KEY-----
-MIGnMBAGByqGSM49AgEGBSuBBAAmA4GSAAQARzAx9yVkHL8pbe1myosILIhhLLUR
-YRDHmopOIijLQmTATV9pYO7CrFBPBjaKNRjPpw/cVOs89X9Jdzx/bolkGqVAsjLN
-1tsCrqET31F4mpnfsPwcM6zbp6lE4N2gL5cakKMmyPNM4d3m8xl1f6e56LBYfaxO
-aqcYzbXCQ/Aiij13H06qKhuFM4iiB/0D164=
+MHUwEwYHKoZIzj0CAQYIKoZIzj0DABMDXgAEyhOo3LLWnB/Mls4P6gYLxqBmp9j1
+cEzf1PuvCuFsRzu/qDx74lIdTlRe2cWI7FUncp6PN4hxN97KthI+o9un/rlbP37l
+pNfbfDaQEOvrFRE2bM7jA5uWnarVWUU=
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_sect571k1:BOB_sect571k1_PUB
+PrivPubKeyPair = BOB_c2pnb368w1:BOB_c2pnb368w1_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_sect571k1
-PeerKey=BOB_sect571k1_PUB
-SharedSecret=05a423515fcc91b3171c83edd5c4085ff729a8ff0a3fa1578ebf769523ded0f5c1e387cf63109f2fbd95e117345b788b4577fdc6b6e727230bfc73eae0d4e851cb6f6e616eddb13e
+Availablein = default
+Derive=ALICE_c2pnb368w1
+PeerKey=BOB_c2pnb368w1_PUB
+SharedSecret=d191710b156d1b1d14242843a7f0abf28060bbb9e655655b53852a8b0f250ef1eee37d59364d9791c8e1bc526cbb
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_sect571k1
-PeerKey=ALICE_sect571k1_PUB
-SharedSecret=05a423515fcc91b3171c83edd5c4085ff729a8ff0a3fa1578ebf769523ded0f5c1e387cf63109f2fbd95e117345b788b4577fdc6b6e727230bfc73eae0d4e851cb6f6e616eddb13e
+Availablein = default
+Derive=BOB_c2pnb368w1
+PeerKey=ALICE_c2pnb368w1_PUB
+SharedSecret=d191710b156d1b1d14242843a7f0abf28060bbb9e655655b53852a8b0f250ef1eee37d59364d9791c8e1bc526cbb
 
-# TEST CURVE sect571r1
+# TEST CURVE c2tnb431r1
 
-PrivateKey=ALICE_sect571r1
+PrivateKey=ALICE_c2tnb431r1
 -----BEGIN PRIVATE KEY-----
-MIIBAAIBADAQBgcqhkjOPQIBBgUrgQQAJwSB6DCB5QIBAQRIArsi//Zp9veeURYV
-zGYHn4MlNIxNt6U6vtmTPS/NaoiaavxbOimpHgxYPCjpoPYhM33Z2VBh7pl2aoRW
-3GBepLFLoF8oiQaLoYGVA4GSAAQDRG2b7KCUKbGDTWVgW0qqNC3oYcz4f/AwTHmo
-US1mzdRZj/Sf6IU+7mITGnQ6lg1EkTas/X6TK1hNMV7tAjSeowdN75wzd8YF32SF
-HMIcWew5g56oF961qv3IvICZnRAOmWyGHeHdYwHxMBSBPNgua42QGoJz6J6dYAUe
-vE+F3N29p/tRBGNzMFIqoDdW+NA=
+MIHKAgEAMBMGByqGSM49AgEGCCqGSM49AwAUBIGvMIGsAgEBBDUC18JhUt+NCIZ/
+q6kdjNZ7zX72UqpW4K6Uc2bAWu2PXK1aL573LNzu4oUlHfbvuE1BUrxNpaFwA24A
+BDrG8SG4lckR1rrvLRpXYf7Wspmh/fbql+Zpulyl896XtwQK2BkLVRkZ5ixTG4PU
+yb64OiffdSnvIaM++cb7LgJLBBgT3d5le8V1gtxWFFm0NggUyF6glmUqHQL0LuhX
+WS468O6w05KS0AL6vQ==
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_sect571r1_PUB
+PublicKey=ALICE_c2tnb431r1_PUB
 -----BEGIN PUBLIC KEY-----
-MIGnMBAGByqGSM49AgEGBSuBBAAnA4GSAAQDRG2b7KCUKbGDTWVgW0qqNC3oYcz4
-f/AwTHmoUS1mzdRZj/Sf6IU+7mITGnQ6lg1EkTas/X6TK1hNMV7tAjSeowdN75wz
-d8YF32SFHMIcWew5g56oF961qv3IvICZnRAOmWyGHeHdYwHxMBSBPNgua42QGoJz
-6J6dYAUevE+F3N29p/tRBGNzMFIqoDdW+NA=
+MIGFMBMGByqGSM49AgEGCCqGSM49AwAUA24ABDrG8SG4lckR1rrvLRpXYf7Wspmh
+/fbql+Zpulyl896XtwQK2BkLVRkZ5ixTG4PUyb64OiffdSnvIaM++cb7LgJLBBgT
+3d5le8V1gtxWFFm0NggUyF6glmUqHQL0LuhXWS468O6w05KS0AL6vQ==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_sect571r1:ALICE_sect571r1_PUB
+PrivPubKeyPair = ALICE_c2tnb431r1:ALICE_c2tnb431r1_PUB
 
 
-PrivateKey=BOB_sect571r1
+PrivateKey=BOB_c2tnb431r1
 -----BEGIN PRIVATE KEY-----
-MIIBAAIBADAQBgcqhkjOPQIBBgUrgQQAJwSB6DCB5QIBAQRIAYj65N5XJTQusn+h
-Z9xj/dgZ4qR1GDC1Ij7jYuow+TvGrG2wz/WT76/lLNtlCLfDW2kODDUmDAJeK/e+
-VMO7suJTXGnrGFHioYGVA4GSAAQGxykYFxqz7jZxcBbiPLYfJEhXlf2SYmMKve74
-trOT+qjIm35+uUAcg2krOzH7X/8wH6bVSn/UKG/k27wZrAnWzZ5XKd8QI70H8aHv
-LgrCoMoqOno+h6J4TgvlDq7FIGZ8fvDaM7YJ8dHPX5FC8Vyphu82TcNdnNATBqom
-6WDWc7RTFZ4sijL5ywVhovwJ1gA=
+MIHKAgEAMBMGByqGSM49AgEGCCqGSM49AwAUBIGvMIGsAgEBBDUApanyPgvpfrAu
+1jNAKGpctH71v0+P/kFF9JxdFYarpWEwBBd4tz6CxoYKmvDZ9ukOOqBbX6FwA24A
+BGh3JXuYmh6dGGEmbRhoR2T5pVD/5Mq2ZKKzfzY2NOoKiIs6rVzv2SW7S6BScYlR
+qRWiXCeZVFvT0crDY/5uodkHbcRw6B/Yo/iMN8wLI257Tjm9/C5G+JPCLopCcLIL
+gTwAJM2ZhtPnc08LyQ==
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_sect571r1_PUB
+PublicKey=BOB_c2tnb431r1_PUB
 -----BEGIN PUBLIC KEY-----
-MIGnMBAGByqGSM49AgEGBSuBBAAnA4GSAAQGxykYFxqz7jZxcBbiPLYfJEhXlf2S
-YmMKve74trOT+qjIm35+uUAcg2krOzH7X/8wH6bVSn/UKG/k27wZrAnWzZ5XKd8Q
-I70H8aHvLgrCoMoqOno+h6J4TgvlDq7FIGZ8fvDaM7YJ8dHPX5FC8Vyphu82TcNd
-nNATBqom6WDWc7RTFZ4sijL5ywVhovwJ1gA=
+MIGFMBMGByqGSM49AgEGCCqGSM49AwAUA24ABGh3JXuYmh6dGGEmbRhoR2T5pVD/
+5Mq2ZKKzfzY2NOoKiIs6rVzv2SW7S6BScYlRqRWiXCeZVFvT0crDY/5uodkHbcRw
+6B/Yo/iMN8wLI257Tjm9/C5G+JPCLopCcLILgTwAJM2ZhtPnc08LyQ==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_sect571r1:BOB_sect571r1_PUB
+PrivPubKeyPair = BOB_c2tnb431r1:BOB_c2tnb431r1_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_sect571r1
-PeerKey=BOB_sect571r1_PUB
-SharedSecret=004b397e564055e2c7d87648183c948655ccb0ebb20bd441f9b11635cf461cb5815ff060eab33091b9f7aed67bec8ba1bb7b22437ece3c92c7cf76124408fb951595dfb4a512b2ae
+Availablein = default
+Derive=ALICE_c2tnb431r1
+PeerKey=BOB_c2tnb431r1_PUB
+SharedSecret=4c4d7d387843ff5152f22f101b0609238819357fae2ccc9097b818e383ef6809cb46671fb514009d4d1d3d0119fba265107302e95748
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_sect571r1
-PeerKey=ALICE_sect571r1_PUB
-SharedSecret=004b397e564055e2c7d87648183c948655ccb0ebb20bd441f9b11635cf461cb5815ff060eab33091b9f7aed67bec8ba1bb7b22437ece3c92c7cf76124408fb951595dfb4a512b2ae
+Availablein = default
+Derive=BOB_c2tnb431r1
+PeerKey=ALICE_c2tnb431r1_PUB
+SharedSecret=4c4d7d387843ff5152f22f101b0609238819357fae2ccc9097b818e383ef6809cb46671fb514009d4d1d3d0119fba265107302e95748
 
-# TEST CURVE c2pnb163v1
+# TEST CURVE wap-wsg-idm-ecid-wtls1
 
-PrivateKey=ALICE_c2pnb163v1
+PrivateKey=ALICE_wap-wsg-idm-ecid-wtls1
 -----BEGIN PRIVATE KEY-----
-MGYCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAEETDBKAgEBBBUDTVBXDIdMMg5JIb6y
-ZHLpkONauzuhLgMsAAQC/TaMi2YGY4SmYVCrIVVommDnOyMHJZ1VZ4+fT+hE/qRp
-WHMMW5gOZO4=
+MFACAQAwEAYHKoZIzj0CAQYFZysBBAEEOTA3AgEBBA5Xu91qBwxTDmhD/30Kf6Ei
+AyAABAFQSZ0G+afa1x4KwUzBjQEWFNdZoF6UNYGkCRINyg==
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_c2pnb163v1_PUB
+PublicKey=ALICE_wap-wsg-idm-ecid-wtls1_PUB
 -----BEGIN PUBLIC KEY-----
-MEMwEwYHKoZIzj0CAQYIKoZIzj0DAAEDLAAEAv02jItmBmOEpmFQqyFVaJpg5zsj
-ByWdVWePn0/oRP6kaVhzDFuYDmTu
+MDQwEAYHKoZIzj0CAQYFZysBBAEDIAAEAVBJnQb5p9rXHgrBTMGNARYU11mgXpQ1
+gaQJEg3K
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_c2pnb163v1:ALICE_c2pnb163v1_PUB
+PrivPubKeyPair = ALICE_wap-wsg-idm-ecid-wtls1:ALICE_wap-wsg-idm-ecid-wtls1_PUB
 
 
-PrivateKey=BOB_c2pnb163v1
+PrivateKey=BOB_wap-wsg-idm-ecid-wtls1
 -----BEGIN PRIVATE KEY-----
-MGYCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAEETDBKAgEBBBUC3uEAfGc3+a0FOrFh
-ftdUBtZ5BPOhLgMsAAQGojKkhnOduUQY6XT0GwQbDe1YM1wFkj3vZGkhO5OzsqG1
-QqQLkFeMwKo=
+MFACAQAwEAYHKoZIzj0CAQYFZysBBAEEOTA3AgEBBA5aU6CQ474Z1fH3xAtn/6Ei
+AyAABAFpb4GTc+5vf5nkt4zLxwGZQ6qSbYlH8pUbpvwcqA==
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_c2pnb163v1_PUB
+PublicKey=BOB_wap-wsg-idm-ecid-wtls1_PUB
 -----BEGIN PUBLIC KEY-----
-MEMwEwYHKoZIzj0CAQYIKoZIzj0DAAEDLAAEBqIypIZznblEGOl09BsEGw3tWDNc
-BZI972RpITuTs7KhtUKkC5BXjMCq
+MDQwEAYHKoZIzj0CAQYFZysBBAEDIAAEAWlvgZNz7m9/meS3jMvHAZlDqpJtiUfy
+lRum/Byo
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_c2pnb163v1:BOB_c2pnb163v1_PUB
+PrivPubKeyPair = BOB_wap-wsg-idm-ecid-wtls1:BOB_wap-wsg-idm-ecid-wtls1_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_c2pnb163v1
-PeerKey=BOB_c2pnb163v1_PUB
-SharedSecret=05939a47cb503656e684f433001e45776c7620e13b
+Availablein = default
+Derive=ALICE_wap-wsg-idm-ecid-wtls1
+PeerKey=BOB_wap-wsg-idm-ecid-wtls1_PUB
+SharedSecret=0000fc6e280987e8b9bf6e3c7fa003
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_c2pnb163v1
-PeerKey=ALICE_c2pnb163v1_PUB
-SharedSecret=05939a47cb503656e684f433001e45776c7620e13b
+Availablein = default
+Derive=BOB_wap-wsg-idm-ecid-wtls1
+PeerKey=ALICE_wap-wsg-idm-ecid-wtls1_PUB
+SharedSecret=0000fc6e280987e8b9bf6e3c7fa003
 
-# TEST CURVE c2pnb163v2
+# TEST CURVE wap-wsg-idm-ecid-wtls3
 
-PrivateKey=ALICE_c2pnb163v2
+PrivateKey=ALICE_wap-wsg-idm-ecid-wtls3
 -----BEGIN PRIVATE KEY-----
-MGYCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAIETDBKAgEBBBUC3m3meJNbhDwwFH3C
-//L2EyOQNruhLgMsAAQBaATOiPV6c8icBYWczLXM6k+t8U4FIN57iiC8RsmIS3+V
-yM/rN3UBZaw=
+MGMCAQAwEAYHKoZIzj0CAQYFZysBBAMETDBKAgEBBBUBN2FFgQiz4KPJ9GEsrj5B
+m908ifuhLgMsAAQBV21Tx3v8+1wFKq7PiloR1CxzmlUDvnyXrs4mNmc5Ns38mzPe
+NueQNo0=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_c2pnb163v2_PUB
+PublicKey=ALICE_wap-wsg-idm-ecid-wtls3_PUB
 -----BEGIN PUBLIC KEY-----
-MEMwEwYHKoZIzj0CAQYIKoZIzj0DAAIDLAAEAWgEzoj1enPInAWFnMy1zOpPrfFO
-BSDee4ogvEbJiEt/lcjP6zd1AWWs
+MEAwEAYHKoZIzj0CAQYFZysBBAMDLAAEAVdtU8d7/PtcBSquz4paEdQsc5pVA758
+l67OJjZnOTbN/Jsz3jbnkDaN
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_c2pnb163v2:ALICE_c2pnb163v2_PUB
+PrivPubKeyPair = ALICE_wap-wsg-idm-ecid-wtls3:ALICE_wap-wsg-idm-ecid-wtls3_PUB
 
 
-PrivateKey=BOB_c2pnb163v2
+PrivateKey=BOB_wap-wsg-idm-ecid-wtls3
 -----BEGIN PRIVATE KEY-----
-MGYCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAIETDBKAgEBBBUBvd/DvKharywckSaW
-aAniKByXBwihLgMsAAQH0+FWe4mb13QrEZCPwfIS+gChEXoGhyBVubt6+SSgS5nS
-eDGgjW/36Qw=
+MGMCAQAwEAYHKoZIzj0CAQYFZysBBAMETDBKAgEBBBUA/0Ust7IoJ526zn2wiWBu
+rR5NeSWhLgMsAAQB7d+/zMMti4djhlVnaGqaqonbmo4Cv+iKT1cF3nzXV/KXHSJI
+p9iZeas=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_c2pnb163v2_PUB
+PublicKey=BOB_wap-wsg-idm-ecid-wtls3_PUB
 -----BEGIN PUBLIC KEY-----
-MEMwEwYHKoZIzj0CAQYIKoZIzj0DAAIDLAAEB9PhVnuJm9d0KxGQj8HyEvoAoRF6
-BocgVbm7evkkoEuZ0ngxoI1v9+kM
+MEAwEAYHKoZIzj0CAQYFZysBBAMDLAAEAe3fv8zDLYuHY4ZVZ2hqmqqJ25qOAr/o
+ik9XBd5811fylx0iSKfYmXmr
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_c2pnb163v2:BOB_c2pnb163v2_PUB
+PrivPubKeyPair = BOB_wap-wsg-idm-ecid-wtls3:BOB_wap-wsg-idm-ecid-wtls3_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_c2pnb163v2
-PeerKey=BOB_c2pnb163v2_PUB
-SharedSecret=0779fb5f6ac7892f2f342b785d71244e0b03ca562d
+Availablein = default
+Derive=ALICE_wap-wsg-idm-ecid-wtls3
+PeerKey=BOB_wap-wsg-idm-ecid-wtls3_PUB
+SharedSecret=00cf1d850f396436be68f1e5502935853ed054511f
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_c2pnb163v2
-PeerKey=ALICE_c2pnb163v2_PUB
-SharedSecret=0779fb5f6ac7892f2f342b785d71244e0b03ca562d
+Availablein = default
+Derive=BOB_wap-wsg-idm-ecid-wtls3
+PeerKey=ALICE_wap-wsg-idm-ecid-wtls3_PUB
+SharedSecret=00cf1d850f396436be68f1e5502935853ed054511f
 
-# TEST CURVE c2pnb163v3
+# TEST CURVE wap-wsg-idm-ecid-wtls4
 
-PrivateKey=ALICE_c2pnb163v3
+PrivateKey=ALICE_wap-wsg-idm-ecid-wtls4
 -----BEGIN PRIVATE KEY-----
-MGYCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAMETDBKAgEBBBUCtJ0ZQMD5T6Ym/jZx
-Fzb9tQkLOhuhLgMsAAQE26YD7hG+CY02+nBDFKIBnMvHWUQGfkiIfG9yxV+LptOM
-CdU4y9RhM+w=
+MFECAQAwEAYHKoZIzj0CAQYFZysBBAQEOjA4AgEBBA8AsuEGufSNSrDPu3Y1Namh
+IgMgAAQAcvPRbArskeBs6W2oOesAHMQo8Lk/FHcYKUfMOKY=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_c2pnb163v3_PUB
+PublicKey=ALICE_wap-wsg-idm-ecid-wtls4_PUB
 -----BEGIN PUBLIC KEY-----
-MEMwEwYHKoZIzj0CAQYIKoZIzj0DAAMDLAAEBNumA+4RvgmNNvpwQxSiAZzLx1lE
-Bn5IiHxvcsVfi6bTjAnVOMvUYTPs
+MDQwEAYHKoZIzj0CAQYFZysBBAQDIAAEAHLz0WwK7JHgbOltqDnrABzEKPC5PxR3
+GClHzDim
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_c2pnb163v3:ALICE_c2pnb163v3_PUB
+PrivPubKeyPair = ALICE_wap-wsg-idm-ecid-wtls4:ALICE_wap-wsg-idm-ecid-wtls4_PUB
 
 
-PrivateKey=BOB_c2pnb163v3
+PrivateKey=BOB_wap-wsg-idm-ecid-wtls4
 -----BEGIN PRIVATE KEY-----
-MGYCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAMETDBKAgEBBBUB9MnYR9NXM8OoCraO
-orQz1LXIZJChLgMsAAQH15R/xAGyrtmg+hrdAaGn9rVEfWQA7yUCn4vKR2eIy/qN
-YfbeHTIaTBY=
+MFECAQAwEAYHKoZIzj0CAQYFZysBBAQEOjA4AgEBBA8AFJwmUkKbWdmzvqv+AbWh
+IgMgAAQBriOJSyRL4ro55CbCwekBluEKwIfP64OfJCEfWTU=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_c2pnb163v3_PUB
+PublicKey=BOB_wap-wsg-idm-ecid-wtls4_PUB
 -----BEGIN PUBLIC KEY-----
-MEMwEwYHKoZIzj0CAQYIKoZIzj0DAAMDLAAEB9eUf8QBsq7ZoPoa3QGhp/a1RH1k
-AO8lAp+LykdniMv6jWH23h0yGkwW
+MDQwEAYHKoZIzj0CAQYFZysBBAQDIAAEAa4jiUskS+K6OeQmwsHpAZbhCsCHz+uD
+nyQhH1k1
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_c2pnb163v3:BOB_c2pnb163v3_PUB
+PrivPubKeyPair = BOB_wap-wsg-idm-ecid-wtls4:BOB_wap-wsg-idm-ecid-wtls4_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_c2pnb163v3
-PeerKey=BOB_c2pnb163v3_PUB
-SharedSecret=02bf68863a8798e72cdc9cd3b9ce731f12654bfa81
+Availablein = default
+Derive=ALICE_wap-wsg-idm-ecid-wtls4
+PeerKey=BOB_wap-wsg-idm-ecid-wtls4_PUB
+SharedSecret=01076232302ca32b5f3daf075e5213
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_c2pnb163v3
-PeerKey=ALICE_c2pnb163v3_PUB
-SharedSecret=02bf68863a8798e72cdc9cd3b9ce731f12654bfa81
+Availablein = default
+Derive=BOB_wap-wsg-idm-ecid-wtls4
+PeerKey=ALICE_wap-wsg-idm-ecid-wtls4_PUB
+SharedSecret=01076232302ca32b5f3daf075e5213
 
-# TEST CURVE c2pnb176v1
+# TEST CURVE wap-wsg-idm-ecid-wtls5
 
-PrivateKey=ALICE_c2pnb176v1
+PrivateKey=ALICE_wap-wsg-idm-ecid-wtls5
 -----BEGIN PRIVATE KEY-----
-MGgCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAQETjBMAgEBBBUAxXEz1PjthqsI664l
-N5LRLN8C2uyhMAMuAARD1qVJHbL5A7BhEKeHSuDeT6XeZ3ODFn9ef67qdF+tS7p3
-zgXGKt4pKMoYcg==
+MGMCAQAwEAYHKoZIzj0CAQYFZysBBAUETDBKAgEBBBUCmngbaO2S//Ta0ZUhn/nb
+ZydTKD+hLgMsAAQA1792id3hLIu2z0KECkBCUbTSP9UFLu2FTJkLa8qP4ZIrBt5F
+XKJo2Dw=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_c2pnb176v1_PUB
+PublicKey=ALICE_wap-wsg-idm-ecid-wtls5_PUB
 -----BEGIN PUBLIC KEY-----
-MEUwEwYHKoZIzj0CAQYIKoZIzj0DAAQDLgAEQ9alSR2y+QOwYRCnh0rg3k+l3mdz
-gxZ/Xn+u6nRfrUu6d84FxireKSjKGHI=
+MEAwEAYHKoZIzj0CAQYFZysBBAUDLAAEANe/dond4SyLts9ChApAQlG00j/VBS7t
+hUyZC2vKj+GSKwbeRVyiaNg8
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_c2pnb176v1:ALICE_c2pnb176v1_PUB
+PrivPubKeyPair = ALICE_wap-wsg-idm-ecid-wtls5:ALICE_wap-wsg-idm-ecid-wtls5_PUB
 
 
-PrivateKey=BOB_c2pnb176v1
+PrivateKey=BOB_wap-wsg-idm-ecid-wtls5
 -----BEGIN PRIVATE KEY-----
-MGgCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAQETjBMAgEBBBUAJvHHFW0v+/cjaLd7
-Xgt6FtSga5+hMAMuAASUs7rUAlv1qhppI82ikLvZ8Y0DApC356nhs7SyQYdLtHRM
-+qUHBB3IzrLKdQ==
+MGMCAQAwEAYHKoZIzj0CAQYFZysBBAUETDBKAgEBBBUBraa4aeYxHd9HJ0vLIoCw
+auGKd9yhLgMsAAQHzc2FgfJGasNlMcJNDDrNQElhA1cHD4izqEedmC3ueMu72/Sp
+VF2Ppig=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_c2pnb176v1_PUB
+PublicKey=BOB_wap-wsg-idm-ecid-wtls5_PUB
 -----BEGIN PUBLIC KEY-----
-MEUwEwYHKoZIzj0CAQYIKoZIzj0DAAQDLgAElLO61AJb9aoaaSPNopC72fGNAwKQ
-t+ep4bO0skGHS7R0TPqlBwQdyM6yynU=
+MEAwEAYHKoZIzj0CAQYFZysBBAUDLAAEB83NhYHyRmrDZTHCTQw6zUBJYQNXBw+I
+s6hHnZgt7njLu9v0qVRdj6Yo
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_c2pnb176v1:BOB_c2pnb176v1_PUB
+PrivPubKeyPair = BOB_wap-wsg-idm-ecid-wtls5:BOB_wap-wsg-idm-ecid-wtls5_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_c2pnb176v1
-PeerKey=BOB_c2pnb176v1_PUB
-SharedSecret=b204734417542df762e09013d6ba958940837a2aa25a
+Availablein = default
+Derive=ALICE_wap-wsg-idm-ecid-wtls5
+PeerKey=BOB_wap-wsg-idm-ecid-wtls5_PUB
+SharedSecret=066091c591278f5b949106052b2546aacc20917c20
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_c2pnb176v1
-PeerKey=ALICE_c2pnb176v1_PUB
-SharedSecret=b204734417542df762e09013d6ba958940837a2aa25a
+Availablein = default
+Derive=BOB_wap-wsg-idm-ecid-wtls5
+PeerKey=ALICE_wap-wsg-idm-ecid-wtls5_PUB
+SharedSecret=066091c591278f5b949106052b2546aacc20917c20
 
-# TEST CURVE c2tnb191v1
+# TEST CURVE wap-wsg-idm-ecid-wtls6
 
-PrivateKey=ALICE_c2tnb191v1
+PrivateKey=ALICE_wap-wsg-idm-ecid-wtls6
 -----BEGIN PRIVATE KEY-----
-MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAUEVTBTAgEBBBgYgpO+wgirUtuqHF00
-2o02Vc7xQjKgSzChNAMyAAQ2ae+5tDQ2CDaV5XPdC+RtLgcHS5lTOclTClr/WSpP
-TlMt2TGh/KRrD859oXg6KYY=
+ME4CAQAwEAYHKoZIzj0CAQYFZysBBAYENzA1AgEBBA5LJwRNrPNMwGyoBP95a6Eg
+Ax4ABMZxFi711Wl5r7tb1XJ9fJ3H1W1MKvVrYvfmNFo=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_c2tnb191v1_PUB
+PublicKey=ALICE_wap-wsg-idm-ecid-wtls6_PUB
 -----BEGIN PUBLIC KEY-----
-MEkwEwYHKoZIzj0CAQYIKoZIzj0DAAUDMgAENmnvubQ0Ngg2leVz3QvkbS4HB0uZ
-UznJUwpa/1kqT05TLdkxofykaw/OfaF4OimG
+MDIwEAYHKoZIzj0CAQYFZysBBAYDHgAExnEWLvXVaXmvu1vVcn18ncfVbUwq9Wti
+9+Y0Wg==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_c2tnb191v1:ALICE_c2tnb191v1_PUB
+PrivPubKeyPair = ALICE_wap-wsg-idm-ecid-wtls6:ALICE_wap-wsg-idm-ecid-wtls6_PUB
 
 
-PrivateKey=BOB_c2tnb191v1
+PrivateKey=BOB_wap-wsg-idm-ecid-wtls6
 -----BEGIN PRIVATE KEY-----
-MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAUEVTBTAgEBBBguzm5uFNRy/lX3OKuJ
-j8i/vH/+viMd48yhNAMyAARka5rhdTmtbqQVRMWZQjUqsHUMX43siRt5f2WQSZfg
-+IQ2l/8veayyX9erUSt3gK4=
+ME4CAQAwEAYHKoZIzj0CAQYFZysBBAYENzA1AgEBBA63i1z4Kl8BEE1I3CYU9KEg
+Ax4ABG3Ft5F8wvnGimUAmGQrfqAlVJKdzhNSa3v47Kc=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_c2tnb191v1_PUB
+PublicKey=BOB_wap-wsg-idm-ecid-wtls6_PUB
 -----BEGIN PUBLIC KEY-----
-MEkwEwYHKoZIzj0CAQYIKoZIzj0DAAUDMgAEZGua4XU5rW6kFUTFmUI1KrB1DF+N
-7IkbeX9lkEmX4PiENpf/L3mssl/Xq1Erd4Cu
+MDIwEAYHKoZIzj0CAQYFZysBBAYDHgAEbcW3kXzC+caKZQCYZCt+oCVUkp3OE1Jr
+e/jspw==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_c2tnb191v1:BOB_c2tnb191v1_PUB
+PrivPubKeyPair = BOB_wap-wsg-idm-ecid-wtls6:BOB_wap-wsg-idm-ecid-wtls6_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_c2tnb191v1
-PeerKey=BOB_c2tnb191v1_PUB
-SharedSecret=7a30d30acd3b067f38bb3be9e8cdef739483df26455e36e1
+Availablein = default
+Derive=ALICE_wap-wsg-idm-ecid-wtls6
+PeerKey=BOB_wap-wsg-idm-ecid-wtls6_PUB
+SharedSecret=8d184455748c56115ba2183070b0
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_c2tnb191v1
-PeerKey=ALICE_c2tnb191v1_PUB
-SharedSecret=7a30d30acd3b067f38bb3be9e8cdef739483df26455e36e1
+Availablein = default
+Derive=BOB_wap-wsg-idm-ecid-wtls6
+PeerKey=ALICE_wap-wsg-idm-ecid-wtls6_PUB
+SharedSecret=8d184455748c56115ba2183070b0
 
-# TEST CURVE c2tnb191v2
+# TEST CURVE wap-wsg-idm-ecid-wtls7
 
-PrivateKey=ALICE_c2tnb191v2
+PrivateKey=ALICE_wap-wsg-idm-ecid-wtls7
 -----BEGIN PRIVATE KEY-----
-MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAYEVTBTAgEBBBgOlslgJ0XSK3vKC5Ls
-QmYxZfr8OEKXRQ2hNAMyAAQAHivLhSwW2SJZtUPhuV1p9fQSfz7w9SJY8dJOpVf8
-9DevPUlJMPcaSGyjX+3nJZc=
+MGECAQAwEAYHKoZIzj0CAQYFZysBBAcESjBIAgEBBBUAueoisiN+luJEy0wdiI7j
+cALlTqChLAMqAAQ/FWsGxD8vuvEFWXfWReOqvBzqWrF9mdMeTeOE1y9r9POOIUVJ
+PNtL
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_c2tnb191v2_PUB
+PublicKey=ALICE_wap-wsg-idm-ecid-wtls7_PUB
 -----BEGIN PUBLIC KEY-----
-MEkwEwYHKoZIzj0CAQYIKoZIzj0DAAYDMgAEAB4ry4UsFtkiWbVD4bldafX0En8+
-8PUiWPHSTqVX/PQ3rz1JSTD3Gkhso1/t5yWX
+MD4wEAYHKoZIzj0CAQYFZysBBAcDKgAEPxVrBsQ/L7rxBVl31kXjqrwc6lqxfZnT
+Hk3jhNcva/TzjiFFSTzbSw==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_c2tnb191v2:ALICE_c2tnb191v2_PUB
+PrivPubKeyPair = ALICE_wap-wsg-idm-ecid-wtls7:ALICE_wap-wsg-idm-ecid-wtls7_PUB
 
 
-PrivateKey=BOB_c2tnb191v2
+PrivateKey=BOB_wap-wsg-idm-ecid-wtls7
 -----BEGIN PRIVATE KEY-----
-MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAYEVTBTAgEBBBgK9QaS2SDU6yz7uXqO
-+/+C+baTTVMAGVGhNAMyAAQiR0t9plm77ezfXvJzDNdlyYC0pWX+QmJ8EavgEElk
-ky/M+YXb5ufkFzFXIEfU9pM=
+MGECAQAwEAYHKoZIzj0CAQYFZysBBAcESjBIAgEBBBUAr42vKjbUXFak2mVzFYpu
+yhN/cDyhLAMqAASJZpuFg+n8vscuq+pqfFFPYemnfLdhdAB4JodfR3J5Bzu67hEm
+bIKQ
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_c2tnb191v2_PUB
+PublicKey=BOB_wap-wsg-idm-ecid-wtls7_PUB
 -----BEGIN PUBLIC KEY-----
-MEkwEwYHKoZIzj0CAQYIKoZIzj0DAAYDMgAEIkdLfaZZu+3s317ycwzXZcmAtKVl
-/kJifBGr4BBJZJMvzPmF2+bn5BcxVyBH1PaT
+MD4wEAYHKoZIzj0CAQYFZysBBAcDKgAEiWabhYPp/L7HLqvqanxRT2Hpp3y3YXQA
+eCaHX0dyeQc7uu4RJmyCkA==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_c2tnb191v2:BOB_c2tnb191v2_PUB
+PrivPubKeyPair = BOB_wap-wsg-idm-ecid-wtls7:BOB_wap-wsg-idm-ecid-wtls7_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_c2tnb191v2
-PeerKey=BOB_c2tnb191v2_PUB
-SharedSecret=5ec2b6ccd193620dbad302c4ad8f8909a40698bf454d7534
+Availablein = default
+Derive=ALICE_wap-wsg-idm-ecid-wtls7
+PeerKey=BOB_wap-wsg-idm-ecid-wtls7_PUB
+SharedSecret=990eda6a0406caef965018b97c94d0faa200f6e4
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_c2tnb191v2
-PeerKey=ALICE_c2tnb191v2_PUB
-SharedSecret=5ec2b6ccd193620dbad302c4ad8f8909a40698bf454d7534
+Availablein = default
+Derive=BOB_wap-wsg-idm-ecid-wtls7
+PeerKey=ALICE_wap-wsg-idm-ecid-wtls7_PUB
+SharedSecret=990eda6a0406caef965018b97c94d0faa200f6e4
 
-# TEST CURVE c2tnb191v3
+# TEST CURVE wap-wsg-idm-ecid-wtls8
 
-PrivateKey=ALICE_c2tnb191v3
+PrivateKey=ALICE_wap-wsg-idm-ecid-wtls8
 -----BEGIN PRIVATE KEY-----
-MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAcEVTBTAgEBBBgSaBOQyq6XX3hZVVgV
-FlRrxTuvgtv33C6hNAMyAARL+Fup8jOnixQYPx8pU/b066PHrhTXfiNerFEYA/5O
-XCKCEkdRCpuDJnyqpmaC2vw=
+ME8CAQAwEAYHKoZIzj0CAQYFZysBBAgEODA2AgEBBA8A1m62ffl6niuM46XOUyih
+IAMeAAT4mqYAoe7NEtKfEMQs2ofInhZRZCFrFU5cjEWi
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_c2tnb191v3_PUB
+PublicKey=ALICE_wap-wsg-idm-ecid-wtls8_PUB
 -----BEGIN PUBLIC KEY-----
-MEkwEwYHKoZIzj0CAQYIKoZIzj0DAAcDMgAES/hbqfIzp4sUGD8fKVP29Oujx64U
-134jXqxRGAP+TlwighJHUQqbgyZ8qqZmgtr8
+MDIwEAYHKoZIzj0CAQYFZysBBAgDHgAE+JqmAKHuzRLSnxDELNqHyJ4WUWQhaxVO
+XIxFog==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_c2tnb191v3:ALICE_c2tnb191v3_PUB
-
+PrivPubKeyPair = ALICE_wap-wsg-idm-ecid-wtls8:ALICE_wap-wsg-idm-ecid-wtls8_PUB
 
-PrivateKey=BOB_c2tnb191v3
+PrivateKey=BOB_wap-wsg-idm-ecid-wtls8
 -----BEGIN PRIVATE KEY-----
-MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAcEVTBTAgEBBBgEE8Ls7pc1/q3/0ruR
-gMrWGhGIr4VLt4uhNAMyAAQHAZsjkAXanwGbXR3SKkoKli6rSfSiu0lU2XHDiZdt
-LaPN+Eihz4KeG2YM/p3m1do=
+ME8CAQAwEAYHKoZIzj0CAQYFZysBBAgEODA2AgEBBA8AegTrLoMRyPl4U4xOdg6h
+IAMeAATQKkyQ3jL2Eku6C+vSQazbjjSkzNe67Occqj2P
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_c2tnb191v3_PUB
+PublicKey=BOB_wap-wsg-idm-ecid-wtls8_PUB
 -----BEGIN PUBLIC KEY-----
-MEkwEwYHKoZIzj0CAQYIKoZIzj0DAAcDMgAEBwGbI5AF2p8Bm10d0ipKCpYuq0n0
-ortJVNlxw4mXbS2jzfhIoc+CnhtmDP6d5tXa
+MDIwEAYHKoZIzj0CAQYFZysBBAgDHgAE0CpMkN4y9hJLugvr0kGs2440pMzXuuzn
+HKo9jw==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_c2tnb191v3:BOB_c2tnb191v3_PUB
-
+PrivPubKeyPair = BOB_wap-wsg-idm-ecid-wtls8:BOB_wap-wsg-idm-ecid-wtls8_PUB
 
-# ECDH Alice with Bob peer
 
-Derive=ALICE_c2tnb191v3
-PeerKey=BOB_c2tnb191v3_PUB
-SharedSecret=39093dc8a2e6724a6206ed41bb99490d527d80c902c41891
+# ECDH Alice with Bob peer
+
+Availablein = default
+Derive=ALICE_wap-wsg-idm-ecid-wtls8
+PeerKey=BOB_wap-wsg-idm-ecid-wtls8_PUB
+SharedSecret=7524c547bd6b26644ce70571cb06
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_c2tnb191v3
-PeerKey=ALICE_c2tnb191v3_PUB
-SharedSecret=39093dc8a2e6724a6206ed41bb99490d527d80c902c41891
+Availablein = default
+Derive=BOB_wap-wsg-idm-ecid-wtls8
+PeerKey=ALICE_wap-wsg-idm-ecid-wtls8_PUB
+SharedSecret=7524c547bd6b26644ce70571cb06
 
-# TEST CURVE c2pnb208w1
+# TEST CURVE wap-wsg-idm-ecid-wtls9
 
-PrivateKey=ALICE_c2pnb208w1
+PrivateKey=ALICE_wap-wsg-idm-ecid-wtls9
 -----BEGIN PRIVATE KEY-----
-MHQCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAoEWjBYAgEBBBkAbfnNboX6Dk+NLoBO
-6qBB2aE1srmTgS96oTgDNgAEFLHciAu4excYB0mty8rF442ULXZfqL90IkgP5G2z
-wzY1mAlEBFMg83izeRaCJ/vRihZDJw==
+MGECAQAwEAYHKoZIzj0CAQYFZysBBAkESjBIAgEBBBUAE0376NvzsIXi6XadrVn4
+06obTRChLAMqAARbC1yw9f1uBOVlMf5ZFQewTgyc81Aqh2TFMSRfujCIhdvGTYgR
+tu6F
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_c2pnb208w1_PUB
+PublicKey=ALICE_wap-wsg-idm-ecid-wtls9_PUB
 -----BEGIN PUBLIC KEY-----
-ME0wEwYHKoZIzj0CAQYIKoZIzj0DAAoDNgAEFLHciAu4excYB0mty8rF442ULXZf
-qL90IkgP5G2zwzY1mAlEBFMg83izeRaCJ/vRihZDJw==
+MD4wEAYHKoZIzj0CAQYFZysBBAkDKgAEWwtcsPX9bgTlZTH+WRUHsE4MnPNQKodk
+xTEkX7owiIXbxk2IEbbuhQ==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_c2pnb208w1:ALICE_c2pnb208w1_PUB
+PrivPubKeyPair = ALICE_wap-wsg-idm-ecid-wtls9:ALICE_wap-wsg-idm-ecid-wtls9_PUB
 
 
-PrivateKey=BOB_c2pnb208w1
+PrivateKey=BOB_wap-wsg-idm-ecid-wtls9
 -----BEGIN PRIVATE KEY-----
-MHQCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAAoEWjBYAgEBBBkAwjGFJOPkZqQPZ+mI
-Ae3G12zpUia40tRjoTgDNgAEDxaP6u0phDLfM4RsZhgIfZy8CurR4/IPtqMGxbfz
-pPKPMZXV12F6MrWrorSFDZ8KFd58Ww==
+MGECAQAwEAYHKoZIzj0CAQYFZysBBAkESjBIAgEBBBUAd2kfMclaJU2bg8ayTrjZ
+oolI82yhLAMqAAQ0NeW9TKhQeFrrTyMR9Gb55+BneCQSByAShM8Dn3V1FFYz7n0y
+bvBX
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_c2pnb208w1_PUB
+PublicKey=BOB_wap-wsg-idm-ecid-wtls9_PUB
 -----BEGIN PUBLIC KEY-----
-ME0wEwYHKoZIzj0CAQYIKoZIzj0DAAoDNgAEDxaP6u0phDLfM4RsZhgIfZy8CurR
-4/IPtqMGxbfzpPKPMZXV12F6MrWrorSFDZ8KFd58Ww==
+MD4wEAYHKoZIzj0CAQYFZysBBAkDKgAENDXlvUyoUHha608jEfRm+efgZ3gkEgcg
+EoTPA591dRRWM+59Mm7wVw==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_c2pnb208w1:BOB_c2pnb208w1_PUB
+PrivPubKeyPair = BOB_wap-wsg-idm-ecid-wtls9:BOB_wap-wsg-idm-ecid-wtls9_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_c2pnb208w1
-PeerKey=BOB_c2pnb208w1_PUB
-SharedSecret=59bf3c91bd168d4d4d900d9ce155933045e0fd16dcf0511bb5af
+Availablein = default
+Derive=ALICE_wap-wsg-idm-ecid-wtls9
+PeerKey=BOB_wap-wsg-idm-ecid-wtls9_PUB
+SharedSecret=5ca1d9eed44def2c390fd5bbb16ca2c3a09eb7b1
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_c2pnb208w1
-PeerKey=ALICE_c2pnb208w1_PUB
-SharedSecret=59bf3c91bd168d4d4d900d9ce155933045e0fd16dcf0511bb5af
+Availablein = default
+Derive=BOB_wap-wsg-idm-ecid-wtls9
+PeerKey=ALICE_wap-wsg-idm-ecid-wtls9_PUB
+SharedSecret=5ca1d9eed44def2c390fd5bbb16ca2c3a09eb7b1
 
-# TEST CURVE c2tnb239v1
+# TEST CURVE wap-wsg-idm-ecid-wtls10
 
-PrivateKey=ALICE_c2tnb239v1
+PrivateKey=ALICE_wap-wsg-idm-ecid-wtls10
 -----BEGIN PRIVATE KEY-----
-MIGBAgEAMBMGByqGSM49AgEGCCqGSM49AwALBGcwZQIBAQQeE4CCwXEKsP3CfLC/
-DLSSF9lfyOaNSuQXmq9rzLqwoUADPgAEM6oQIsXJs+ANKQpF3DzBdG4FdS5DS+qp
-c5fVTsZiI4FAWCXUvzzPTRAex3wwvF/4JrYK6cKVh8i1EOrN
+MH0CAQAwEAYHKoZIzj0CAQYFZysBBAoEZjBkAgEBBB01TDgjIGd+gXPZ4esQnWzz
+/y1vzJniUBM5XNyPq6FAAz4ABAHVs5gYpbJzqyO8Lk3nkTwhu4BuXb4wtrgGcY2L
+TwGxkC4Zq4aqLowsexGjVa0IjGKdWz5/TfwLwGpN4A==
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_c2tnb239v1_PUB
+PublicKey=ALICE_wap-wsg-idm-ecid-wtls10_PUB
 -----BEGIN PUBLIC KEY-----
-MFUwEwYHKoZIzj0CAQYIKoZIzj0DAAsDPgAEM6oQIsXJs+ANKQpF3DzBdG4FdS5D
-S+qpc5fVTsZiI4FAWCXUvzzPTRAex3wwvF/4JrYK6cKVh8i1EOrN
+MFIwEAYHKoZIzj0CAQYFZysBBAoDPgAEAdWzmBilsnOrI7wuTeeRPCG7gG5dvjC2
+uAZxjYtPAbGQLhmrhqoujCx7EaNVrQiMYp1bPn9N/AvAak3g
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_c2tnb239v1:ALICE_c2tnb239v1_PUB
+PrivPubKeyPair = ALICE_wap-wsg-idm-ecid-wtls10:ALICE_wap-wsg-idm-ecid-wtls10_PUB
 
 
-PrivateKey=BOB_c2tnb239v1
+PrivateKey=BOB_wap-wsg-idm-ecid-wtls10
 -----BEGIN PRIVATE KEY-----
-MIGBAgEAMBMGByqGSM49AgEGCCqGSM49AwALBGcwZQIBAQQeAGDYCGAXqD03x510
-h35JSzlgReW6W/T8lYPEA42doUADPgAECk6Uyh8ULkOVOxZSNZYGwtko/oy7ZLDP
-F8dbsEZTeYIBpQ6hWqZ/4Nz3RyzfoukyfCb3b8OMtpq+Qgio
+MH0CAQAwEAYHKoZIzj0CAQYFZysBBAoEZjBkAgEBBB0mTqwYwByRuu4zcU1QLKcG
+m8wewuaoKqVSpp8xQaFAAz4ABAEF4xTrWAIF1EacNMqTG3kwxwartAKFFqyOle+w
+BwDi6gra7cFVedD1p5RwD4gZU4QzgCLSwa7xZbBzgg==
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_c2tnb239v1_PUB
+PublicKey=BOB_wap-wsg-idm-ecid-wtls10_PUB
 -----BEGIN PUBLIC KEY-----
-MFUwEwYHKoZIzj0CAQYIKoZIzj0DAAsDPgAECk6Uyh8ULkOVOxZSNZYGwtko/oy7
-ZLDPF8dbsEZTeYIBpQ6hWqZ/4Nz3RyzfoukyfCb3b8OMtpq+Qgio
+MFIwEAYHKoZIzj0CAQYFZysBBAoDPgAEAQXjFOtYAgXURpw0ypMbeTDHBqu0AoUW
+rI6V77AHAOLqCtrtwVV50PWnlHAPiBlThDOAItLBrvFlsHOC
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_c2tnb239v1:BOB_c2tnb239v1_PUB
+PrivPubKeyPair = BOB_wap-wsg-idm-ecid-wtls10:BOB_wap-wsg-idm-ecid-wtls10_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_c2tnb239v1
-PeerKey=BOB_c2tnb239v1_PUB
-SharedSecret=78c42256900725df9a47bb042cef7dad9f639b32e3010738a144e7472d1a
+Availablein = default
+Derive=ALICE_wap-wsg-idm-ecid-wtls10
+PeerKey=BOB_wap-wsg-idm-ecid-wtls10_PUB
+SharedSecret=0199de137bc263e25b543994d6315b5a3f1e38e7e1f60662cb5cbaab5f98
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_c2tnb239v1
-PeerKey=ALICE_c2tnb239v1_PUB
-SharedSecret=78c42256900725df9a47bb042cef7dad9f639b32e3010738a144e7472d1a
+Availablein = default
+Derive=BOB_wap-wsg-idm-ecid-wtls10
+PeerKey=ALICE_wap-wsg-idm-ecid-wtls10_PUB
+SharedSecret=0199de137bc263e25b543994d6315b5a3f1e38e7e1f60662cb5cbaab5f98
 
-# TEST CURVE c2tnb239v2
+# TEST CURVE wap-wsg-idm-ecid-wtls11
 
-PrivateKey=ALICE_c2tnb239v2
+PrivateKey=ALICE_wap-wsg-idm-ecid-wtls11
 -----BEGIN PRIVATE KEY-----
-MIGBAgEAMBMGByqGSM49AgEGCCqGSM49AwAMBGcwZQIBAQQeE8kBjHLjFeC+Z2gZ
-q0snwR3UgEgWMW0xilhJNjW2oUADPgAEQ+ubIYhh82VohwKSVz70PkHsjmYWDvDU
-/SBRk8AiP71CM9D7XEKK5tnU94MtK2Kscx5nWZFc+oIh1+sY
+MH4CAQAwEAYHKoZIzj0CAQYFZysBBAsEZzBlAgEBBB4Au6lrzC3RIk3jXmtbeOAp
+LZPR0NUrr6dTf1lSCGqhQAM+AAQBl73V2TEZ8BO4QC+YiBlJ0GmW8WLc3RtS3iIr
+/oUAaDQQAGVJFD3GghjBPfI9KVBcZ2P8tUXUv5ifrWc=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_c2tnb239v2_PUB
+PublicKey=ALICE_wap-wsg-idm-ecid-wtls11_PUB
 -----BEGIN PUBLIC KEY-----
-MFUwEwYHKoZIzj0CAQYIKoZIzj0DAAwDPgAEQ+ubIYhh82VohwKSVz70PkHsjmYW
-DvDU/SBRk8AiP71CM9D7XEKK5tnU94MtK2Kscx5nWZFc+oIh1+sY
+MFIwEAYHKoZIzj0CAQYFZysBBAsDPgAEAZe91dkxGfATuEAvmIgZSdBplvFi3N0b
+Ut4iK/6FAGg0EABlSRQ9xoIYwT3yPSlQXGdj/LVF1L+Yn61n
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_c2tnb239v2:ALICE_c2tnb239v2_PUB
+PrivPubKeyPair = ALICE_wap-wsg-idm-ecid-wtls11:ALICE_wap-wsg-idm-ecid-wtls11_PUB
 
 
-PrivateKey=BOB_c2tnb239v2
+PrivateKey=BOB_wap-wsg-idm-ecid-wtls11
 -----BEGIN PRIVATE KEY-----
-MIGBAgEAMBMGByqGSM49AgEGCCqGSM49AwAMBGcwZQIBAQQeE7bhzKZZUm780c0e
-3EBWY1GxD90Mzu7zrQMi7bAzoUADPgAEYgV7bokY6iLMzZTG10c6NDaW11plAm0T
-NKVVwzPqe3ylhsQmmm02LHKX0gN4E1dUS0uClBbMGNq2mhln
+MH4CAQAwEAYHKoZIzj0CAQYFZysBBAsEZzBlAgEBBB4AGJuGtQI1FvHfp2AsdKb3
+NVWawjpZQuyM1aelws2hQAM+AAQAdTW3xU6Ijf/Y835Z2hS4fOn6Xmp3O6iblXHr
+nKoBORuxHVRfXkfdL5TqfFpuDghzCyAS6ZMSWhjGV5o=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_c2tnb239v2_PUB
+PublicKey=BOB_wap-wsg-idm-ecid-wtls11_PUB
 -----BEGIN PUBLIC KEY-----
-MFUwEwYHKoZIzj0CAQYIKoZIzj0DAAwDPgAEYgV7bokY6iLMzZTG10c6NDaW11pl
-Am0TNKVVwzPqe3ylhsQmmm02LHKX0gN4E1dUS0uClBbMGNq2mhln
+MFIwEAYHKoZIzj0CAQYFZysBBAsDPgAEAHU1t8VOiI3/2PN+WdoUuHzp+l5qdzuo
+m5Vx65yqATkbsR1UX15H3S+U6nxabg4IcwsgEumTEloYxlea
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_c2tnb239v2:BOB_c2tnb239v2_PUB
+PrivPubKeyPair = BOB_wap-wsg-idm-ecid-wtls11:BOB_wap-wsg-idm-ecid-wtls11_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_c2tnb239v2
-PeerKey=BOB_c2tnb239v2_PUB
-SharedSecret=4ba2ecfa8ec7a375594d1673886cccf96d7763c55611b3c9008a35160192
+Availablein = default
+Derive=ALICE_wap-wsg-idm-ecid-wtls11
+PeerKey=BOB_wap-wsg-idm-ecid-wtls11_PUB
+SharedSecret=01ee4b517d8a64be5ee32e10152c7bbcb8cde73a3da8e9643bce173011f7
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_c2tnb239v2
-PeerKey=ALICE_c2tnb239v2_PUB
-SharedSecret=4ba2ecfa8ec7a375594d1673886cccf96d7763c55611b3c9008a35160192
+Availablein = default
+Derive=BOB_wap-wsg-idm-ecid-wtls11
+PeerKey=ALICE_wap-wsg-idm-ecid-wtls11_PUB
+SharedSecret=01ee4b517d8a64be5ee32e10152c7bbcb8cde73a3da8e9643bce173011f7
 
-# TEST CURVE c2tnb239v3
+# TEST CURVE wap-wsg-idm-ecid-wtls12
 
-PrivateKey=ALICE_c2tnb239v3
+PrivateKey=ALICE_wap-wsg-idm-ecid-wtls12
 -----BEGIN PRIVATE KEY-----
-MIGBAgEAMBMGByqGSM49AgEGCCqGSM49AwANBGcwZQIBAQQeCxiC5lbHYL1QYbb2
-izZiSoLPnWCZIds811J1N7KtoUADPgAEdHMz+tsuO7VcO9IFgsSWTweLoB1ah5WI
-g6cWrtcUfmO7EGfPwNni4Bf8No7rGGMwbisW0v6Jv2pkTSM8
+MHgCAQAwEAYHKoZIzj0CAQYFZysBBAwEYTBfAgEBBByAnUvQZhZr1lgTRixSMIx0
+KHuV4t8cbXCW415soTwDOgAE3G8wIl9SJ0mAmuIMWbJpFjf9wO8gKNu6nApye39Y
+hpXeYRL/nm7G6HmiiA5O1iudWC3hDbBH0cc=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_c2tnb239v3_PUB
+PublicKey=ALICE_wap-wsg-idm-ecid-wtls12_PUB
 -----BEGIN PUBLIC KEY-----
-MFUwEwYHKoZIzj0CAQYIKoZIzj0DAA0DPgAEdHMz+tsuO7VcO9IFgsSWTweLoB1a
-h5WIg6cWrtcUfmO7EGfPwNni4Bf8No7rGGMwbisW0v6Jv2pkTSM8
+ME4wEAYHKoZIzj0CAQYFZysBBAwDOgAE3G8wIl9SJ0mAmuIMWbJpFjf9wO8gKNu6
+nApye39YhpXeYRL/nm7G6HmiiA5O1iudWC3hDbBH0cc=
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_c2tnb239v3:ALICE_c2tnb239v3_PUB
+PrivPubKeyPair = ALICE_wap-wsg-idm-ecid-wtls12:ALICE_wap-wsg-idm-ecid-wtls12_PUB
 
 
-PrivateKey=BOB_c2tnb239v3
+PrivateKey=BOB_wap-wsg-idm-ecid-wtls12
 -----BEGIN PRIVATE KEY-----
-MIGBAgEAMBMGByqGSM49AgEGCCqGSM49AwANBGcwZQIBAQQeBBPxdeU3MohZc5Jx
-7WadLuPSeXeOg75rXC1ElexsoUADPgAEaHwiwQmoqbPij8+l6hLHVQz0AZLBT5uX
-hAh8fhTABKqI7qYShICAAX0tvu3EvQ8BQLP14grxUsSoEqAF
+MHgCAQAwEAYHKoZIzj0CAQYFZysBBAwEYTBfAgEBBBzZ7nt4CrPrk2m5iR64vpkj
+95JHOmzWf4VhRZqdoTwDOgAEukz40I4gWpUmXCM+PLmWGd0IO0XIPQa9KXzXvhbL
+dJH0yFkJ+ClSboOC26gtMTICiPhEgYjeKEQ=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_c2tnb239v3_PUB
+PublicKey=BOB_wap-wsg-idm-ecid-wtls12_PUB
 -----BEGIN PUBLIC KEY-----
-MFUwEwYHKoZIzj0CAQYIKoZIzj0DAA0DPgAEaHwiwQmoqbPij8+l6hLHVQz0AZLB
-T5uXhAh8fhTABKqI7qYShICAAX0tvu3EvQ8BQLP14grxUsSoEqAF
+ME4wEAYHKoZIzj0CAQYFZysBBAwDOgAEukz40I4gWpUmXCM+PLmWGd0IO0XIPQa9
+KXzXvhbLdJH0yFkJ+ClSboOC26gtMTICiPhEgYjeKEQ=
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_c2tnb239v3:BOB_c2tnb239v3_PUB
+PrivPubKeyPair = BOB_wap-wsg-idm-ecid-wtls12:BOB_wap-wsg-idm-ecid-wtls12_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_c2tnb239v3
-PeerKey=BOB_c2tnb239v3_PUB
-SharedSecret=47ad60e5480375fccd9246c93ab04da8e5da83e1dbf5f177f10a47cb54a0
+Availablein = default
+Derive=ALICE_wap-wsg-idm-ecid-wtls12
+PeerKey=BOB_wap-wsg-idm-ecid-wtls12_PUB
+SharedSecret=c75a8283a73312de82c8f99d41a9173a43b8f921e8161dd140131b36
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_c2tnb239v3
-PeerKey=ALICE_c2tnb239v3_PUB
-SharedSecret=47ad60e5480375fccd9246c93ab04da8e5da83e1dbf5f177f10a47cb54a0
+Availablein = default
+Derive=BOB_wap-wsg-idm-ecid-wtls12
+PeerKey=ALICE_wap-wsg-idm-ecid-wtls12_PUB
+SharedSecret=c75a8283a73312de82c8f99d41a9173a43b8f921e8161dd140131b36
 
-# TEST CURVE c2pnb272w1
+# EC P-256 key
 
-PrivateKey=ALICE_c2pnb272w1
+PrivateKey=P-256
 -----BEGIN PRIVATE KEY-----
-MIGMAgEAMBMGByqGSM49AgEGCCqGSM49AwAQBHIwcAIBAQQhAKMtKddENVGjzTU4
-w+hW0SgDOtIElcs52wb40S08j6gMoUgDRgAEfGvSzQo+00VXIDXV7iiGXpI16kzs
-6C8rkchA5sVBBY56nSCp0n4FpIXRzafiFQklJD9OrJzA6PXc7tp2n2XhIwvuOmI=
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgiocvtiiTxNH/xbnw
++RdYBp+DUuCPoFpJ+NuSbLVyhyWhRANCAAQsFQ9CnOcPIWwlLPXgYs4fY5zV0WXH
++JQkBywnGX14szuSDpXNtmTpkNzwz+oNlOKo5q+dDlgFbmUxBJJbn+bJ
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_c2pnb272w1_PUB
+# EC public key for above
+
+PublicKey=P-256-PUBLIC
 -----BEGIN PUBLIC KEY-----
-MF0wEwYHKoZIzj0CAQYIKoZIzj0DABADRgAEfGvSzQo+00VXIDXV7iiGXpI16kzs
-6C8rkchA5sVBBY56nSCp0n4FpIXRzafiFQklJD9OrJzA6PXc7tp2n2XhIwvuOmI=
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAELBUPQpznDyFsJSz14GLOH2Oc1dFl
+x/iUJAcsJxl9eLM7kg6VzbZk6ZDc8M/qDZTiqOavnQ5YBW5lMQSSW5/myQ==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_c2pnb272w1:ALICE_c2pnb272w1_PUB
-
+PrivPubKeyPair = P-256:P-256-PUBLIC
 
-PrivateKey=BOB_c2pnb272w1
+# Additional EC key for ECDH
+PrivateKey=P-256-Peer
 -----BEGIN PRIVATE KEY-----
-MIGMAgEAMBMGByqGSM49AgEGCCqGSM49AwAQBHIwcAIBAQQhAFAKPByX1wlYUpU4
-mECDAxg+VM5aFo4JPlqEzR0b9hI6oUgDRgAEL8+863IU4uxbEY8jVBjhsrG4W6AF
-MF6t+aGvoiKHtEMLQa6U158TRapDWp4eRurm6Idvv7hepCPqOMEGySDUwMECiQM=
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg/URzu1TDNwUFWZ3i
+dLISAZpEY0vfJ2pLB7f+Xnjyl2OhRANCAAQgBuXhSgeKpz+4piXlYSVLvy0NT+wK
+uZWUI3LqUUCV07wg+RLLMY8yNK9kjqcgZDs/cB+bet64nQq+dNnvtpxG
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_c2pnb272w1_PUB
+PublicKey=P-256-Peer-PUBLIC
 -----BEGIN PUBLIC KEY-----
-MF0wEwYHKoZIzj0CAQYIKoZIzj0DABADRgAEL8+863IU4uxbEY8jVBjhsrG4W6AF
-MF6t+aGvoiKHtEMLQa6U158TRapDWp4eRurm6Idvv7hepCPqOMEGySDUwMECiQM=
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIAbl4UoHiqc/uKYl5WElS78tDU/s
+CrmVlCNy6lFAldO8IPkSyzGPMjSvZI6nIGQ7P3Afm3reuJ0KvnTZ77acRg==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_c2pnb272w1:BOB_c2pnb272w1_PUB
+PrivPubKeyPair = P-256-Peer:P-256-Peer-PUBLIC
 
+Title = ECDH tests
 
-# ECDH Alice with Bob peer
 
-Derive=ALICE_c2pnb272w1
-PeerKey=BOB_c2pnb272w1_PUB
-SharedSecret=3ae063b2bed6ba8aa28ff35e9bd2673f22ee8087860c86b89429a5b52538216632a3
+Derive=P-256
+PeerKey=P-256-Peer-PUBLIC
+SharedSecret=E3CC07DFBDDE76A1139811DB9FF5FAF9D17EF39944F1E77D1F6A208524BF7B1B
 
-# ECDH Bob with Alice peer
 
-Derive=BOB_c2pnb272w1
-PeerKey=ALICE_c2pnb272w1_PUB
-SharedSecret=3ae063b2bed6ba8aa28ff35e9bd2673f22ee8087860c86b89429a5b52538216632a3
+Derive=P-256-Peer
+PeerKey=P-256-PUBLIC
+SharedSecret=E3CC07DFBDDE76A1139811DB9FF5FAF9D17EF39944F1E77D1F6A208524BF7B1B
 
-# TEST CURVE c2pnb304w1
+# TEST CURVE secp224r1
 
-PrivateKey=ALICE_c2pnb304w1
+PrivateKey=ALICE_secp224r1
 -----BEGIN PRIVATE KEY-----
-MIGYAgEAMBMGByqGSM49AgEGCCqGSM49AwARBH4wfAIBAQQlAOKzfcV2XOvVsSUh
-oVz3SHGzSCf0q9i+ilz5ZfBxc+5ssjK7jKFQA04ABDc4zQNFaZukj9iz3iXTYdza
-tCOYZvrfOjrbgzl/8PoFxt5q6yJTu35Vu9XVp5pTCtjpDEpywBj0xb07RRuVDEk8
-TthFP5vGeTIWLD4=
+MHgCAQAwEAYHKoZIzj0CAQYFK4EEACEEYTBfAgEBBBxLKkXFJXYqGUlTsmgjlesi
+kwqejrekrkSTbehyoTwDOgAEUcEh0Ggy/rD+Nj9JQozzI+qzPtiU7b2D2HtdCa4h
+fbVPXngcRH2B2xN8W+dcHoIxrxO2UFXy4xo=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_c2pnb304w1_PUB
+PublicKey=ALICE_secp224r1_PUB
 -----BEGIN PUBLIC KEY-----
-MGUwEwYHKoZIzj0CAQYIKoZIzj0DABEDTgAENzjNA0Vpm6SP2LPeJdNh3Nq0I5hm
-+t86OtuDOX/w+gXG3mrrIlO7flW71dWnmlMK2OkMSnLAGPTFvTtFG5UMSTxO2EU/
-m8Z5MhYsPg==
+ME4wEAYHKoZIzj0CAQYFK4EEACEDOgAEUcEh0Ggy/rD+Nj9JQozzI+qzPtiU7b2D
+2HtdCa4hfbVPXngcRH2B2xN8W+dcHoIxrxO2UFXy4xo=
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_c2pnb304w1:ALICE_c2pnb304w1_PUB
+PrivPubKeyPair = ALICE_secp224r1:ALICE_secp224r1_PUB
 
 
-PrivateKey=BOB_c2pnb304w1
+PrivateKey=BOB_secp224r1
 -----BEGIN PRIVATE KEY-----
-MIGYAgEAMBMGByqGSM49AgEGCCqGSM49AwARBH4wfAIBAQQlAPP4hz6sa+KdTJ4h
-fBeCUiJBfshcZoapkZMFrhI1vdcRY7MeAaFQA04ABMHRUzLiUY7O4nEBdmex31U4
-l6TO/dD+5MV/tVNizVsWjkTvi2fs772lZ9MeNp6QnGMZ5n5subHsa0QOJL1LpmXX
-K0UIWGbW0nQb52g=
+MHgCAQAwEAYHKoZIzj0CAQYFK4EEACEEYTBfAgEBBBzOHGGUR3fZYg3GSaUN6pxo
+NQtAlOzM3UclEhMzoTwDOgAEdwFklK/YoDRU6bM7X2ulNLwqx9TUETMFUM6VV9DB
+4YcvAzv6pQgVwYEU7IahmSKpX19chbPt2I0=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_c2pnb304w1_PUB
+PublicKey=BOB_secp224r1_PUB
 -----BEGIN PUBLIC KEY-----
-MGUwEwYHKoZIzj0CAQYIKoZIzj0DABEDTgAEwdFTMuJRjs7icQF2Z7HfVTiXpM79
-0P7kxX+1U2LNWxaORO+LZ+zvvaVn0x42npCcYxnmfmy5sexrRA4kvUumZdcrRQhY
-ZtbSdBvnaA==
+ME4wEAYHKoZIzj0CAQYFK4EEACEDOgAEdwFklK/YoDRU6bM7X2ulNLwqx9TUETMF
+UM6VV9DB4YcvAzv6pQgVwYEU7IahmSKpX19chbPt2I0=
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_c2pnb304w1:BOB_c2pnb304w1_PUB
+PrivPubKeyPair = BOB_secp224r1:BOB_secp224r1_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_c2pnb304w1
-PeerKey=BOB_c2pnb304w1_PUB
-SharedSecret=6df88b20de9f095c7632234291ea4658a9265cd2293424e11ed56705b09a069f09dc4e055eb7
+Derive=ALICE_secp224r1
+PeerKey=BOB_secp224r1_PUB
+SharedSecret=34ea06d16d82f0d1725de47f3639ac0c23db7d7ed68f01488539a2a5
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_c2pnb304w1
-PeerKey=ALICE_c2pnb304w1_PUB
-SharedSecret=6df88b20de9f095c7632234291ea4658a9265cd2293424e11ed56705b09a069f09dc4e055eb7
+Derive=BOB_secp224r1
+PeerKey=ALICE_secp224r1_PUB
+SharedSecret=34ea06d16d82f0d1725de47f3639ac0c23db7d7ed68f01488539a2a5
 
-# TEST CURVE c2tnb359v1
+# TEST CURVE secp384r1
 
-PrivateKey=ALICE_c2tnb359v1
+PrivateKey=ALICE_secp384r1
 -----BEGIN PRIVATE KEY-----
-MIGwAgEAMBMGByqGSM49AgEGCCqGSM49AwASBIGVMIGSAgEBBC0BeMU97SvjsIvQ
-1v+Ztf56OCL8JXHxRJDQZ5gWEa4c2b3FZXFVC4CwEPd7cB+hXgNcAAQOBgLp0TzS
-4Hf/VYbJCFuj3OlRC5JMzFV7ox41ubhl5Ij+gHIodu1bQ6cqd0YAb2/30PxwX++N
-NpFvq8u8435zhPYXsut6txOPNU5ZzCeagy2xsKacXSZc7D0=
+MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDCxE7Q4m1dsK7M3Otxo
+cgY/ejX9JOKKdAtSnRiU4bnK3eFmALkMN7XIveQnWLB1PEKhZANiAAQaUsvUFr/u
+ISpAmYqYZIme4VassCtb0tNGU97s3qt4ozcogZ4z+fIzXZ4YXqfGoEa57+uQDgqr
++jNOTji7Gxopt6AqZ9EvwuVaCuunUi0pcx6cc8IuUfrwMwSFovV/7sM=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_c2tnb359v1_PUB
+PublicKey=ALICE_secp384r1_PUB
 -----BEGIN PUBLIC KEY-----
-MHMwEwYHKoZIzj0CAQYIKoZIzj0DABIDXAAEDgYC6dE80uB3/1WGyQhbo9zpUQuS
-TMxVe6MeNbm4ZeSI/oByKHbtW0OnKndGAG9v99D8cF/vjTaRb6vLvON+c4T2F7Lr
-ercTjzVOWcwnmoMtsbCmnF0mXOw9
+MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEGlLL1Ba/7iEqQJmKmGSJnuFWrLArW9LT
+RlPe7N6reKM3KIGeM/nyM12eGF6nxqBGue/rkA4Kq/ozTk44uxsaKbegKmfRL8Ll
+Wgrrp1ItKXMenHPCLlH68DMEhaL1f+7D
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_c2tnb359v1:ALICE_c2tnb359v1_PUB
+PrivPubKeyPair = ALICE_secp384r1:ALICE_secp384r1_PUB
 
 
-PrivateKey=BOB_c2tnb359v1
+PrivateKey=BOB_secp384r1
 -----BEGIN PRIVATE KEY-----
-MIGwAgEAMBMGByqGSM49AgEGCCqGSM49AwASBIGVMIGSAgEBBC0BRZ3IIh3mrLIX
-KBbh6Vj7TXNY5bzRuD5/ayHPlHQkJcd8K66dOqu7hgaN91GhXgNcAAQ7njbTQ2xY
-YZtkKswYr8E6P/R3Dg/XEZgQQ72B4qXnqbK/SgYsZAntFg7CRztcTkHjKAgdSz6f
-TRIc4///gwXN3Oi6D8PeswhzPJi/uLmCAHMm3GT6SUO3aTY=
+MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDBRiGXRsb5sUq0b3/dg
+Z+pA9kbrSivBMCUCXVwxno1d/30hI/Yy0Z5PWwbBgwTFprWhZANiAASp1FeUOBJF
+mzQCNbGiOz8He0kF+KIf24UGYVO5MC7u5rV9hpoYsbcgmwxALskPN18os2ygK1Pn
+f/h+WALIsG2RknSTbiyvBYkoIhJV9cflvEDpMeaWSLF7qJ5YjEIf9PM=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_c2tnb359v1_PUB
+PublicKey=BOB_secp384r1_PUB
 -----BEGIN PUBLIC KEY-----
-MHMwEwYHKoZIzj0CAQYIKoZIzj0DABIDXAAEO54200NsWGGbZCrMGK/BOj/0dw4P
-1xGYEEO9geKl56myv0oGLGQJ7RYOwkc7XE5B4ygIHUs+n00SHOP//4MFzdzoug/D
-3rMIczyYv7i5ggBzJtxk+klDt2k2
+MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEqdRXlDgSRZs0AjWxojs/B3tJBfiiH9uF
+BmFTuTAu7ua1fYaaGLG3IJsMQC7JDzdfKLNsoCtT53/4flgCyLBtkZJ0k24srwWJ
+KCISVfXH5bxA6THmlkixe6ieWIxCH/Tz
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_c2tnb359v1:BOB_c2tnb359v1_PUB
+PrivPubKeyPair = BOB_secp384r1:BOB_secp384r1_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_c2tnb359v1
-PeerKey=BOB_c2tnb359v1_PUB
-SharedSecret=1d3f3396492d130caea54233c79833e90a072fe883071bb08cec671ce0319f0bc39c68dda0199952152a5c3563
+Derive=ALICE_secp384r1
+PeerKey=BOB_secp384r1_PUB
+SharedSecret=2006ed49acbb991b8fbf8a15c3f263542496eaefe1e2952591b72fb929463eac7a403a5419cebbfb73734918eaed59fd
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_c2tnb359v1
-PeerKey=ALICE_c2tnb359v1_PUB
-SharedSecret=1d3f3396492d130caea54233c79833e90a072fe883071bb08cec671ce0319f0bc39c68dda0199952152a5c3563
+Derive=BOB_secp384r1
+PeerKey=ALICE_secp384r1_PUB
+SharedSecret=2006ed49acbb991b8fbf8a15c3f263542496eaefe1e2952591b72fb929463eac7a403a5419cebbfb73734918eaed59fd
 
-# TEST CURVE c2pnb368w1
+# TEST CURVE secp521r1
 
-PrivateKey=ALICE_c2pnb368w1
+PrivateKey=ALICE_secp521r1
 -----BEGIN PRIVATE KEY-----
-MIGyAgEAMBMGByqGSM49AgEGCCqGSM49AwATBIGXMIGUAgEBBC0AFagbth/4/M2s
-b1G4FpxbFEVLIulioS34v0hrClpZ38/Z+PHmIhOfEFminyehYANeAAQAU42w7mII
-jkyAdnCC4qoEPdH42fh3oVyCtnaRtKUmdhUdXm0IgSM4T4SYEOsx+aQZLGIjnhHJ
-CabcaKPQ0sai3dirUr2YsNXNDJiU93T7buUr+DnRPGsfBy/nEg==
+MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIAFBIz3FLAuX8VCWzM
+wu1f/tm8pf1QqnsdLqaIWCQAJa2W5ldpJTYfkj1gGxM44AD3qHnkXISvNLwwuxI1
+hr2+pOGhgYkDgYYABACWlOOFYk/p3AS2LxEQWBuMm6uIjo3XArjh1QrsLcUc5hhi
+82CIz6kKwKjCnYRDHq4iv1x63rVEzGGhQOM1g+cRVwHSpfbBpaxK7bMLkVFOOavv
+OdcdyRHaHsvxw2pREmdS/GwtfgT8odQrG06KMIwVeL+H08fGJSbPX0Zock0DOPCp
+aw==
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_c2pnb368w1_PUB
+PublicKey=ALICE_secp521r1_PUB
 -----BEGIN PUBLIC KEY-----
-MHUwEwYHKoZIzj0CAQYIKoZIzj0DABMDXgAEAFONsO5iCI5MgHZwguKqBD3R+Nn4
-d6FcgrZ2kbSlJnYVHV5tCIEjOE+EmBDrMfmkGSxiI54RyQmm3Gij0NLGot3Yq1K9
-mLDVzQyYlPd0+27lK/g50TxrHwcv5xI=
+MIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQAlpTjhWJP6dwEti8REFgbjJuriI6N
+1wK44dUK7C3FHOYYYvNgiM+pCsCowp2EQx6uIr9cet61RMxhoUDjNYPnEVcB0qX2
+waWsSu2zC5FRTjmr7znXHckR2h7L8cNqURJnUvxsLX4E/KHUKxtOijCMFXi/h9PH
+xiUmz19GaHJNAzjwqWs=
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_c2pnb368w1:ALICE_c2pnb368w1_PUB
+PrivPubKeyPair = ALICE_secp521r1:ALICE_secp521r1_PUB
 
 
-PrivateKey=BOB_c2pnb368w1
+PrivateKey=BOB_secp521r1
 -----BEGIN PRIVATE KEY-----
-MIGyAgEAMBMGByqGSM49AgEGCCqGSM49AwATBIGXMIGUAgEBBC0AA/woMzOFy8k2
-zBqBkubhkOIwc7sx0u+JadM9f7V45L4P8nK7bjJasOqrHRahYANeAATKE6jcstac
-H8yWzg/qBgvGoGan2PVwTN/U+68K4WxHO7+oPHviUh1OVF7ZxYjsVSdyno83iHE3
-3sq2Ej6j26f+uVs/fuWk19t8NpAQ6+sVETZszuMDm5adqtVZRQ==
+MIHuAgEAMBAGByqGSM49AgEGBSuBBAAjBIHWMIHTAgEBBEIA9C/sMWveRlHPr9P5
+cc3U+1L2/zB0VtHewKSQRWZ67SmS4+m7uXTqUVSLRHiQEgQid0cg77gSxXPlmV+z
+y0f3zd+hgYkDgYYABAE18N3SwDGtea3IOqUdh3j0JtnMeP41i/agEBlxK8/iEBXc
+Q61mkIrQIKcabRhoylEugXHiyNnqNQOD4DUa0bTKzAHtJ4UqqbEVno6byRmcUQwb
+mvG89eS8GLEmk5X/O2atHU4yIGTuTRQWn/BTJUCS+OgJz4FZdadscc5Z640EZqSD
+iw==
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_c2pnb368w1_PUB
+PublicKey=BOB_secp521r1_PUB
 -----BEGIN PUBLIC KEY-----
-MHUwEwYHKoZIzj0CAQYIKoZIzj0DABMDXgAEyhOo3LLWnB/Mls4P6gYLxqBmp9j1
-cEzf1PuvCuFsRzu/qDx74lIdTlRe2cWI7FUncp6PN4hxN97KthI+o9un/rlbP37l
-pNfbfDaQEOvrFRE2bM7jA5uWnarVWUU=
+MIGbMBAGByqGSM49AgEGBSuBBAAjA4GGAAQBNfDd0sAxrXmtyDqlHYd49CbZzHj+
+NYv2oBAZcSvP4hAV3EOtZpCK0CCnGm0YaMpRLoFx4sjZ6jUDg+A1GtG0yswB7SeF
+KqmxFZ6Om8kZnFEMG5rxvPXkvBixJpOV/ztmrR1OMiBk7k0UFp/wUyVAkvjoCc+B
+WXWnbHHOWeuNBGakg4s=
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_c2pnb368w1:BOB_c2pnb368w1_PUB
+PrivPubKeyPair = BOB_secp521r1:BOB_secp521r1_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_c2pnb368w1
-PeerKey=BOB_c2pnb368w1_PUB
-SharedSecret=d191710b156d1b1d14242843a7f0abf28060bbb9e655655b53852a8b0f250ef1eee37d59364d9791c8e1bc526cbb
+Derive=ALICE_secp521r1
+PeerKey=BOB_secp521r1_PUB
+SharedSecret=018c8f33e544a0fa8854dcd96bdba75b7687d1c42b2ff1bf0a06d49c424fee96d8a7f3af3119dcbfabc1c147477c50f7c72971956f9bb17ddec6d02b2187f06cf4be
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_c2pnb368w1
-PeerKey=ALICE_c2pnb368w1_PUB
-SharedSecret=d191710b156d1b1d14242843a7f0abf28060bbb9e655655b53852a8b0f250ef1eee37d59364d9791c8e1bc526cbb
+Derive=BOB_secp521r1
+PeerKey=ALICE_secp521r1_PUB
+SharedSecret=018c8f33e544a0fa8854dcd96bdba75b7687d1c42b2ff1bf0a06d49c424fee96d8a7f3af3119dcbfabc1c147477c50f7c72971956f9bb17ddec6d02b2187f06cf4be
 
-# TEST CURVE c2tnb431r1
+# TEST CURVE prime192v1
 
-PrivateKey=ALICE_c2tnb431r1
+PrivateKey=ALICE_prime192v1
 -----BEGIN PRIVATE KEY-----
-MIHKAgEAMBMGByqGSM49AgEGCCqGSM49AwAUBIGvMIGsAgEBBDUC18JhUt+NCIZ/
-q6kdjNZ7zX72UqpW4K6Uc2bAWu2PXK1aL573LNzu4oUlHfbvuE1BUrxNpaFwA24A
-BDrG8SG4lckR1rrvLRpXYf7Wspmh/fbql+Zpulyl896XtwQK2BkLVRkZ5ixTG4PU
-yb64OiffdSnvIaM++cb7LgJLBBgT3d5le8V1gtxWFFm0NggUyF6glmUqHQL0LuhX
-WS468O6w05KS0AL6vQ==
+MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQEEVTBTAgEBBBjxfXvSFNqD2UzFVN1L
+bQrPlzop7dxQq/ehNAMyAATibpGuYzCjkT1tWLYEogpKz74WqhvbQtZPkCYQCin1
+cmZuNW+BZ0jyVEpGlpnZPMg=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_c2tnb431r1_PUB
+PublicKey=ALICE_prime192v1_PUB
 -----BEGIN PUBLIC KEY-----
-MIGFMBMGByqGSM49AgEGCCqGSM49AwAUA24ABDrG8SG4lckR1rrvLRpXYf7Wspmh
-/fbql+Zpulyl896XtwQK2BkLVRkZ5ixTG4PUyb64OiffdSnvIaM++cb7LgJLBBgT
-3d5le8V1gtxWFFm0NggUyF6glmUqHQL0LuhXWS468O6w05KS0AL6vQ==
+MEkwEwYHKoZIzj0CAQYIKoZIzj0DAQEDMgAE4m6RrmMwo5E9bVi2BKIKSs++Fqob
+20LWT5AmEAop9XJmbjVvgWdI8lRKRpaZ2TzI
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_c2tnb431r1:ALICE_c2tnb431r1_PUB
+PrivPubKeyPair = ALICE_prime192v1:ALICE_prime192v1_PUB
 
 
-PrivateKey=BOB_c2tnb431r1
+PrivateKey=BOB_prime192v1
 -----BEGIN PRIVATE KEY-----
-MIHKAgEAMBMGByqGSM49AgEGCCqGSM49AwAUBIGvMIGsAgEBBDUApanyPgvpfrAu
-1jNAKGpctH71v0+P/kFF9JxdFYarpWEwBBd4tz6CxoYKmvDZ9ukOOqBbX6FwA24A
-BGh3JXuYmh6dGGEmbRhoR2T5pVD/5Mq2ZKKzfzY2NOoKiIs6rVzv2SW7S6BScYlR
-qRWiXCeZVFvT0crDY/5uodkHbcRw6B/Yo/iMN8wLI257Tjm9/C5G+JPCLopCcLIL
-gTwAJM2ZhtPnc08LyQ==
+MG8CAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQEEVTBTAgEBBBhewaqXNZlYyqnmuEEE
+Y/oUXe3/jpzhmyGhNAMyAASkpwNJEP/1FuuWKCDDUm26iyqrs+zKwayZnaF77YC6
+qCtgia7yNcSl9tlWHh3gQgw=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_c2tnb431r1_PUB
+PublicKey=BOB_prime192v1_PUB
 -----BEGIN PUBLIC KEY-----
-MIGFMBMGByqGSM49AgEGCCqGSM49AwAUA24ABGh3JXuYmh6dGGEmbRhoR2T5pVD/
-5Mq2ZKKzfzY2NOoKiIs6rVzv2SW7S6BScYlRqRWiXCeZVFvT0crDY/5uodkHbcRw
-6B/Yo/iMN8wLI257Tjm9/C5G+JPCLopCcLILgTwAJM2ZhtPnc08LyQ==
+MEkwEwYHKoZIzj0CAQYIKoZIzj0DAQEDMgAEpKcDSRD/9Rbrliggw1Jtuosqq7Ps
+ysGsmZ2he+2AuqgrYImu8jXEpfbZVh4d4EIM
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_c2tnb431r1:BOB_c2tnb431r1_PUB
+PrivPubKeyPair = BOB_prime192v1:BOB_prime192v1_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_c2tnb431r1
-PeerKey=BOB_c2tnb431r1_PUB
-SharedSecret=4c4d7d387843ff5152f22f101b0609238819357fae2ccc9097b818e383ef6809cb46671fb514009d4d1d3d0119fba265107302e95748
+Availablein = default
+Derive=ALICE_prime192v1
+PeerKey=BOB_prime192v1_PUB
+SharedSecret=be2a779b587f8f5d7c9d8f006e0a6d0e996c9c63c255f861
+
+# Negative test: A weak curve with a strength < 112 fails in FIPS mode.
+Availablein = fips
+Derive=ALICE_prime192v1
+Securitycheck = 1
+PeerKey=BOB_prime192v1_PUB
+Result = DERIVE_SET_PEER_ERROR
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_c2tnb431r1
-PeerKey=ALICE_c2tnb431r1_PUB
-SharedSecret=4c4d7d387843ff5152f22f101b0609238819357fae2ccc9097b818e383ef6809cb46671fb514009d4d1d3d0119fba265107302e95748
+Availablein = default
+Derive=BOB_prime192v1
+PeerKey=ALICE_prime192v1_PUB
+SharedSecret=be2a779b587f8f5d7c9d8f006e0a6d0e996c9c63c255f861
 
-# TEST CURVE wap-wsg-idm-ecid-wtls1
+# TEST CURVE prime256v1
 
-PrivateKey=ALICE_wap-wsg-idm-ecid-wtls1
+PrivateKey=ALICE_prime256v1
 -----BEGIN PRIVATE KEY-----
-MFACAQAwEAYHKoZIzj0CAQYFZysBBAEEOTA3AgEBBA5Xu91qBwxTDmhD/30Kf6Ei
-AyAABAFQSZ0G+afa1x4KwUzBjQEWFNdZoF6UNYGkCRINyg==
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQglUPDk8gQ8lMj38V7
+0jPBZDfQUx5pNOVSKOMTqlh04POhRANCAARq87w+K0q9b1mzJGh309kjNvYTS02m
+YkHKxAewiZwmt/5w+5uywz/+0130SdAWbXtECjaHUK94YEHzp0G/PCl5
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_wap-wsg-idm-ecid-wtls1_PUB
+PublicKey=ALICE_prime256v1_PUB
 -----BEGIN PUBLIC KEY-----
-MDQwEAYHKoZIzj0CAQYFZysBBAEDIAAEAVBJnQb5p9rXHgrBTMGNARYU11mgXpQ1
-gaQJEg3K
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEavO8PitKvW9ZsyRod9PZIzb2E0tN
+pmJBysQHsImcJrf+cPubssM//tNd9EnQFm17RAo2h1CveGBB86dBvzwpeQ==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_wap-wsg-idm-ecid-wtls1:ALICE_wap-wsg-idm-ecid-wtls1_PUB
+PrivPubKeyPair = ALICE_prime256v1:ALICE_prime256v1_PUB
 
 
-PrivateKey=BOB_wap-wsg-idm-ecid-wtls1
+PrivateKey=BOB_prime256v1
 -----BEGIN PRIVATE KEY-----
-MFACAQAwEAYHKoZIzj0CAQYFZysBBAEEOTA3AgEBBA5aU6CQ474Z1fH3xAtn/6Ei
-AyAABAFpb4GTc+5vf5nkt4zLxwGZQ6qSbYlH8pUbpvwcqA==
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgNsLfn/sRZfm9ZcM7
+xURiUHT7+w8Jgk9SbwTVDjpLYYmhRANCAASRmyKNgUbADGxkIOAVh9T7IXv2ZDT6
+I5YMW6wOs27VMOAD0AiNLrv7sW1TdqxkUtF17/GFpLvFOuZcbdX4p3i/
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_wap-wsg-idm-ecid-wtls1_PUB
+PublicKey=BOB_prime256v1_PUB
 -----BEGIN PUBLIC KEY-----
-MDQwEAYHKoZIzj0CAQYFZysBBAEDIAAEAWlvgZNz7m9/meS3jMvHAZlDqpJtiUfy
-lRum/Byo
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEkZsijYFGwAxsZCDgFYfU+yF79mQ0
++iOWDFusDrNu1TDgA9AIjS67+7FtU3asZFLRde/xhaS7xTrmXG3V+Kd4vw==
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_wap-wsg-idm-ecid-wtls1:BOB_wap-wsg-idm-ecid-wtls1_PUB
+PrivPubKeyPair = BOB_prime256v1:BOB_prime256v1_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_wap-wsg-idm-ecid-wtls1
-PeerKey=BOB_wap-wsg-idm-ecid-wtls1_PUB
-SharedSecret=0000fc6e280987e8b9bf6e3c7fa003
+Derive=ALICE_prime256v1
+PeerKey=BOB_prime256v1_PUB
+SharedSecret=390021fbca00d959c1adaf7e9cedef0e65a582489eab9adbe739ef66bf82adb4
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_wap-wsg-idm-ecid-wtls1
-PeerKey=ALICE_wap-wsg-idm-ecid-wtls1_PUB
-SharedSecret=0000fc6e280987e8b9bf6e3c7fa003
+Derive=BOB_prime256v1
+PeerKey=ALICE_prime256v1_PUB
+SharedSecret=390021fbca00d959c1adaf7e9cedef0e65a582489eab9adbe739ef66bf82adb4
 
-# TEST CURVE wap-wsg-idm-ecid-wtls3
+# TEST CURVE sect163k1
 
-PrivateKey=ALICE_wap-wsg-idm-ecid-wtls3
+PrivateKey=ALICE_sect163k1
 -----BEGIN PRIVATE KEY-----
-MGMCAQAwEAYHKoZIzj0CAQYFZysBBAMETDBKAgEBBBUBN2FFgQiz4KPJ9GEsrj5B
-m908ifuhLgMsAAQBV21Tx3v8+1wFKq7PiloR1CxzmlUDvnyXrs4mNmc5Ns38mzPe
-NueQNo0=
+MGMCAQAwEAYHKoZIzj0CAQYFK4EEAAEETDBKAgEBBBUBxkeGOXE86PAijpk8trN/
+f3kl4UmhLgMsAAQD1hrDCJ2MSFKZ6Q11cTllX/l5HY0Hg5XZCxMFC84AaczwPtNJ
+YNCxfCk=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_wap-wsg-idm-ecid-wtls3_PUB
+PublicKey=ALICE_sect163k1_PUB
 -----BEGIN PUBLIC KEY-----
-MEAwEAYHKoZIzj0CAQYFZysBBAMDLAAEAVdtU8d7/PtcBSquz4paEdQsc5pVA758
-l67OJjZnOTbN/Jsz3jbnkDaN
+MEAwEAYHKoZIzj0CAQYFK4EEAAEDLAAEA9YawwidjEhSmekNdXE5ZV/5eR2NB4OV
+2QsTBQvOAGnM8D7TSWDQsXwp
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_wap-wsg-idm-ecid-wtls3:ALICE_wap-wsg-idm-ecid-wtls3_PUB
-
+PrivPubKeyPair = ALICE_sect163k1:ALICE_sect163k1_PUB
 
-PrivateKey=BOB_wap-wsg-idm-ecid-wtls3
+PrivateKey=BOB_sect163k1
 -----BEGIN PRIVATE KEY-----
-MGMCAQAwEAYHKoZIzj0CAQYFZysBBAMETDBKAgEBBBUA/0Ust7IoJ526zn2wiWBu
-rR5NeSWhLgMsAAQB7d+/zMMti4djhlVnaGqaqonbmo4Cv+iKT1cF3nzXV/KXHSJI
-p9iZeas=
+MGMCAQAwEAYHKoZIzj0CAQYFK4EEAAEETDBKAgEBBBUCUJ5kItSfXidHXsgokcS7
+nzPFbOShLgMsAAQGrYNJ1qgdb3A9ISOmTujfS+WYFKwBXXrJEluAkeNh3jXnDq8X
++XBB0k8=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_wap-wsg-idm-ecid-wtls3_PUB
+PublicKey=BOB_sect163k1_PUB
 -----BEGIN PUBLIC KEY-----
-MEAwEAYHKoZIzj0CAQYFZysBBAMDLAAEAe3fv8zDLYuHY4ZVZ2hqmqqJ25qOAr/o
-ik9XBd5811fylx0iSKfYmXmr
+MEAwEAYHKoZIzj0CAQYFK4EEAAEDLAAEBq2DSdaoHW9wPSEjpk7o30vlmBSsAV16
+yRJbgJHjYd415w6vF/lwQdJP
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_wap-wsg-idm-ecid-wtls3:BOB_wap-wsg-idm-ecid-wtls3_PUB
+PrivPubKeyPair = BOB_sect163k1:BOB_sect163k1_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_wap-wsg-idm-ecid-wtls3
-PeerKey=BOB_wap-wsg-idm-ecid-wtls3_PUB
-SharedSecret=00cf1d850f396436be68f1e5502935853ed054511f
+Availablein = default
+Derive=ALICE_sect163k1
+PeerKey=BOB_sect163k1_PUB
+SharedSecret=07bfdf00759b383aa7741ae4634400f8ddf2047092
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_wap-wsg-idm-ecid-wtls3
-PeerKey=ALICE_wap-wsg-idm-ecid-wtls3_PUB
-SharedSecret=00cf1d850f396436be68f1e5502935853ed054511f
+Availablein = default
+Derive=BOB_sect163k1
+PeerKey=ALICE_sect163k1_PUB
+SharedSecret=07bfdf00759b383aa7741ae4634400f8ddf2047092
 
-# TEST CURVE wap-wsg-idm-ecid-wtls4
+# TEST CURVE sect163r2
 
-PrivateKey=ALICE_wap-wsg-idm-ecid-wtls4
+PrivateKey=ALICE_sect163r2
 -----BEGIN PRIVATE KEY-----
-MFECAQAwEAYHKoZIzj0CAQYFZysBBAQEOjA4AgEBBA8AsuEGufSNSrDPu3Y1Namh
-IgMgAAQAcvPRbArskeBs6W2oOesAHMQo8Lk/FHcYKUfMOKY=
+MGMCAQAwEAYHKoZIzj0CAQYFK4EEAA8ETDBKAgEBBBUDjH2G7BkPTBM4VtljaQr8
+sXVLNOqhLgMsAAQHHqWxJWR2KrHCPp/PSjZIdK88ET0A323/UOTxhYHwsLpR7rp3
+ahq1lQ8=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_wap-wsg-idm-ecid-wtls4_PUB
+PublicKey=ALICE_sect163r2_PUB
 -----BEGIN PUBLIC KEY-----
-MDQwEAYHKoZIzj0CAQYFZysBBAQDIAAEAHLz0WwK7JHgbOltqDnrABzEKPC5PxR3
-GClHzDim
+MEAwEAYHKoZIzj0CAQYFK4EEAA8DLAAEBx6lsSVkdiqxwj6fz0o2SHSvPBE9AN9t
+/1Dk8YWB8LC6Ue66d2oatZUP
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_wap-wsg-idm-ecid-wtls4:ALICE_wap-wsg-idm-ecid-wtls4_PUB
+PrivPubKeyPair = ALICE_sect163r2:ALICE_sect163r2_PUB
 
 
-PrivateKey=BOB_wap-wsg-idm-ecid-wtls4
+PrivateKey=BOB_sect163r2
 -----BEGIN PRIVATE KEY-----
-MFECAQAwEAYHKoZIzj0CAQYFZysBBAQEOjA4AgEBBA8AFJwmUkKbWdmzvqv+AbWh
-IgMgAAQBriOJSyRL4ro55CbCwekBluEKwIfP64OfJCEfWTU=
+MGMCAQAwEAYHKoZIzj0CAQYFK4EEAA8ETDBKAgEBBBUBXOM9Tm6sKXUlRLlW0HgC
+NTDxW2ihLgMsAAQGxa8xRcC+TIcDgGtehDVEV1PoBokBwtILj16NPYC0aBZI8/nF
+F4jhgmc=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_wap-wsg-idm-ecid-wtls4_PUB
+PublicKey=BOB_sect163r2_PUB
 -----BEGIN PUBLIC KEY-----
-MDQwEAYHKoZIzj0CAQYFZysBBAQDIAAEAa4jiUskS+K6OeQmwsHpAZbhCsCHz+uD
-nyQhH1k1
+MEAwEAYHKoZIzj0CAQYFK4EEAA8DLAAEBsWvMUXAvkyHA4BrXoQ1RFdT6AaJAcLS
+C49ejT2AtGgWSPP5xReI4YJn
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_wap-wsg-idm-ecid-wtls4:BOB_wap-wsg-idm-ecid-wtls4_PUB
+PrivPubKeyPair = BOB_sect163r2:BOB_sect163r2_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_wap-wsg-idm-ecid-wtls4
-PeerKey=BOB_wap-wsg-idm-ecid-wtls4_PUB
-SharedSecret=01076232302ca32b5f3daf075e5213
+Availablein = default
+Derive=ALICE_sect163r2
+PeerKey=BOB_sect163r2_PUB
+SharedSecret=040df54e6df412790ef5c0fafbbfcba5136b872951
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_wap-wsg-idm-ecid-wtls4
-PeerKey=ALICE_wap-wsg-idm-ecid-wtls4_PUB
-SharedSecret=01076232302ca32b5f3daf075e5213
+Availablein = default
+Derive=BOB_sect163r2
+PeerKey=ALICE_sect163r2_PUB
+SharedSecret=040df54e6df412790ef5c0fafbbfcba5136b872951
 
-# TEST CURVE wap-wsg-idm-ecid-wtls5
+# TEST CURVE sect233k1
 
-PrivateKey=ALICE_wap-wsg-idm-ecid-wtls5
+PrivateKey=ALICE_sect233k1
 -----BEGIN PRIVATE KEY-----
-MGMCAQAwEAYHKoZIzj0CAQYFZysBBAUETDBKAgEBBBUCmngbaO2S//Ta0ZUhn/nb
-ZydTKD+hLgMsAAQA1792id3hLIu2z0KECkBCUbTSP9UFLu2FTJkLa8qP4ZIrBt5F
-XKJo2Dw=
+MH0CAQAwEAYHKoZIzj0CAQYFK4EEABoEZjBkAgEBBB1aR7qaKm1vmZWK2bGsJ1rX
+mH6BpTkW4t1L4zSf/KFAAz4ABADcDiv+bTvPVViqYLNz06VO5wodry+sGi6fnJIr
+QQCTfZ9d5whiIsbY5Thlcm7I0A/cIGoShA/6LumOVA==
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_wap-wsg-idm-ecid-wtls5_PUB
+PublicKey=ALICE_sect233k1_PUB
 -----BEGIN PUBLIC KEY-----
-MEAwEAYHKoZIzj0CAQYFZysBBAUDLAAEANe/dond4SyLts9ChApAQlG00j/VBS7t
-hUyZC2vKj+GSKwbeRVyiaNg8
+MFIwEAYHKoZIzj0CAQYFK4EEABoDPgAEANwOK/5tO89VWKpgs3PTpU7nCh2vL6wa
+Lp+ckitBAJN9n13nCGIixtjlOGVybsjQD9wgahKED/ou6Y5U
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_wap-wsg-idm-ecid-wtls5:ALICE_wap-wsg-idm-ecid-wtls5_PUB
+PrivPubKeyPair = ALICE_sect233k1:ALICE_sect233k1_PUB
 
 
-PrivateKey=BOB_wap-wsg-idm-ecid-wtls5
+PrivateKey=BOB_sect233k1
 -----BEGIN PRIVATE KEY-----
-MGMCAQAwEAYHKoZIzj0CAQYFZysBBAUETDBKAgEBBBUBraa4aeYxHd9HJ0vLIoCw
-auGKd9yhLgMsAAQHzc2FgfJGasNlMcJNDDrNQElhA1cHD4izqEedmC3ueMu72/Sp
-VF2Ppig=
+MH0CAQAwEAYHKoZIzj0CAQYFK4EEABoEZjBkAgEBBB0oa5BrzYxm6mn51Xyphn6X
+OUjKc9oMDHCowAyHTaFAAz4ABAGKiFuFJVQeymHYRVnt2LNF2MSaTMcL9JGSPn2z
+OwBis5MS4kgEFakWQl7KpGiy3vS89wmpblvHLJ/+IQ==
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_wap-wsg-idm-ecid-wtls5_PUB
+PublicKey=BOB_sect233k1_PUB
 -----BEGIN PUBLIC KEY-----
-MEAwEAYHKoZIzj0CAQYFZysBBAUDLAAEB83NhYHyRmrDZTHCTQw6zUBJYQNXBw+I
-s6hHnZgt7njLu9v0qVRdj6Yo
+MFIwEAYHKoZIzj0CAQYFK4EEABoDPgAEAYqIW4UlVB7KYdhFWe3Ys0XYxJpMxwv0
+kZI+fbM7AGKzkxLiSAQVqRZCXsqkaLLe9Lz3CaluW8csn/4h
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_wap-wsg-idm-ecid-wtls5:BOB_wap-wsg-idm-ecid-wtls5_PUB
+PrivPubKeyPair = BOB_sect233k1:BOB_sect233k1_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_wap-wsg-idm-ecid-wtls5
-PeerKey=BOB_wap-wsg-idm-ecid-wtls5_PUB
-SharedSecret=066091c591278f5b949106052b2546aacc20917c20
+Derive=ALICE_sect233k1
+PeerKey=BOB_sect233k1_PUB
+SharedSecret=00a5e5f2e992f4360d530dd365d14f5c6013212e14f4ea258c91c71f1512
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_wap-wsg-idm-ecid-wtls5
-PeerKey=ALICE_wap-wsg-idm-ecid-wtls5_PUB
-SharedSecret=066091c591278f5b949106052b2546aacc20917c20
+Derive=BOB_sect233k1
+PeerKey=ALICE_sect233k1_PUB
+SharedSecret=00a5e5f2e992f4360d530dd365d14f5c6013212e14f4ea258c91c71f1512
 
-# TEST CURVE wap-wsg-idm-ecid-wtls6
+# TEST CURVE sect233r1
 
-PrivateKey=ALICE_wap-wsg-idm-ecid-wtls6
+PrivateKey=ALICE_sect233r1
 -----BEGIN PRIVATE KEY-----
-ME4CAQAwEAYHKoZIzj0CAQYFZysBBAYENzA1AgEBBA5LJwRNrPNMwGyoBP95a6Eg
-Ax4ABMZxFi711Wl5r7tb1XJ9fJ3H1W1MKvVrYvfmNFo=
+MH4CAQAwEAYHKoZIzj0CAQYFK4EEABsEZzBlAgEBBB4AEN6fePR2gizyXzU6kIgU
+Gijp5+IQAXoNBfKnVeChQAM+AAQB0kEwu2fwQWo1v1j7XQ8uJT3iMwRC8w+cxgxx
+GQ4B/FyjrhIUpEDWaMqfV23McZ6WdbIUe3MZ7K5pG38=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_wap-wsg-idm-ecid-wtls6_PUB
+PublicKey=ALICE_sect233r1_PUB
 -----BEGIN PUBLIC KEY-----
-MDIwEAYHKoZIzj0CAQYFZysBBAYDHgAExnEWLvXVaXmvu1vVcn18ncfVbUwq9Wti
-9+Y0Wg==
+MFIwEAYHKoZIzj0CAQYFK4EEABsDPgAEAdJBMLtn8EFqNb9Y+10PLiU94jMEQvMP
+nMYMcRkOAfxco64SFKRA1mjKn1dtzHGelnWyFHtzGeyuaRt/
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_wap-wsg-idm-ecid-wtls6:ALICE_wap-wsg-idm-ecid-wtls6_PUB
+PrivPubKeyPair = ALICE_sect233r1:ALICE_sect233r1_PUB
 
 
-PrivateKey=BOB_wap-wsg-idm-ecid-wtls6
+PrivateKey=BOB_sect233r1
 -----BEGIN PRIVATE KEY-----
-ME4CAQAwEAYHKoZIzj0CAQYFZysBBAYENzA1AgEBBA63i1z4Kl8BEE1I3CYU9KEg
-Ax4ABG3Ft5F8wvnGimUAmGQrfqAlVJKdzhNSa3v47Kc=
+MH4CAQAwEAYHKoZIzj0CAQYFK4EEABsEZzBlAgEBBB4AXHWOeS6fG0XCH3FnHDuS
+IcELUeDG+AYNNeLVZd6hQAM+AAQAYRRYH017uxcaMPF3GOsL4bvodW1yZLEtL3pm
+CkcAfqJI/4niCr8uHKh0gBa2JBjBWMV1u8Mpf60uvok=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_wap-wsg-idm-ecid-wtls6_PUB
+PublicKey=BOB_sect233r1_PUB
 -----BEGIN PUBLIC KEY-----
-MDIwEAYHKoZIzj0CAQYFZysBBAYDHgAEbcW3kXzC+caKZQCYZCt+oCVUkp3OE1Jr
-e/jspw==
+MFIwEAYHKoZIzj0CAQYFK4EEABsDPgAEAGEUWB9Ne7sXGjDxdxjrC+G76HVtcmSx
+LS96ZgpHAH6iSP+J4gq/LhyodIAWtiQYwVjFdbvDKX+tLr6J
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_wap-wsg-idm-ecid-wtls6:BOB_wap-wsg-idm-ecid-wtls6_PUB
+PrivPubKeyPair = BOB_sect233r1:BOB_sect233r1_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_wap-wsg-idm-ecid-wtls6
-PeerKey=BOB_wap-wsg-idm-ecid-wtls6_PUB
-SharedSecret=8d184455748c56115ba2183070b0
+Derive=ALICE_sect233r1
+PeerKey=BOB_sect233r1_PUB
+SharedSecret=01625f3fcd367ee7cd74c67cca02dccfce6c3b19ef07e358ed943d17a8e2
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_wap-wsg-idm-ecid-wtls6
-PeerKey=ALICE_wap-wsg-idm-ecid-wtls6_PUB
-SharedSecret=8d184455748c56115ba2183070b0
+Derive=BOB_sect233r1
+PeerKey=ALICE_sect233r1_PUB
+SharedSecret=01625f3fcd367ee7cd74c67cca02dccfce6c3b19ef07e358ed943d17a8e2
 
-# TEST CURVE wap-wsg-idm-ecid-wtls7
+# TEST CURVE sect283k1
 
-PrivateKey=ALICE_wap-wsg-idm-ecid-wtls7
+PrivateKey=ALICE_sect283k1
 -----BEGIN PRIVATE KEY-----
-MGECAQAwEAYHKoZIzj0CAQYFZysBBAcESjBIAgEBBBUAueoisiN+luJEy0wdiI7j
-cALlTqChLAMqAAQ/FWsGxD8vuvEFWXfWReOqvBzqWrF9mdMeTeOE1y9r9POOIUVJ
-PNtL
+MIGQAgEAMBAGByqGSM49AgEGBSuBBAAQBHkwdwIBAQQkAGhnsmZ2UDKV3QKmq3k+
+33LQ6n5aCYvKXcMgiZlBS/RrVgIRoUwDSgAEBSgpOw5TMTc4O8HHhw5atJl5mrnW
+uC6oWVYRYpD1IMvPNTRsAYo4SYRmPIfgzVv/ESVcHVaD1lPNo+eq0HN1qhvRX+4r
+mGO7
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_wap-wsg-idm-ecid-wtls7_PUB
+PublicKey=ALICE_sect283k1_PUB
 -----BEGIN PUBLIC KEY-----
-MD4wEAYHKoZIzj0CAQYFZysBBAcDKgAEPxVrBsQ/L7rxBVl31kXjqrwc6lqxfZnT
-Hk3jhNcva/TzjiFFSTzbSw==
+MF4wEAYHKoZIzj0CAQYFK4EEABADSgAEBSgpOw5TMTc4O8HHhw5atJl5mrnWuC6o
+WVYRYpD1IMvPNTRsAYo4SYRmPIfgzVv/ESVcHVaD1lPNo+eq0HN1qhvRX+4rmGO7
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_wap-wsg-idm-ecid-wtls7:ALICE_wap-wsg-idm-ecid-wtls7_PUB
+PrivPubKeyPair = ALICE_sect283k1:ALICE_sect283k1_PUB
 
 
-PrivateKey=BOB_wap-wsg-idm-ecid-wtls7
+PrivateKey=BOB_sect283k1
 -----BEGIN PRIVATE KEY-----
-MGECAQAwEAYHKoZIzj0CAQYFZysBBAcESjBIAgEBBBUAr42vKjbUXFak2mVzFYpu
-yhN/cDyhLAMqAASJZpuFg+n8vscuq+pqfFFPYemnfLdhdAB4JodfR3J5Bzu67hEm
-bIKQ
+MIGQAgEAMBAGByqGSM49AgEGBSuBBAAQBHkwdwIBAQQkAAJXIwfWjYbiM5jEcNw8
+8/1kbEnhVjWGivO7zDPts7AuKSMkoUwDSgAEA5Ause5pdH6ks7PdyPeoPbYAkz6V
+D5v8KTV1b97PiYmZNDeoBY78FQyHRSvdSo+oRew2RacpaCAntRoiWHyN1nAdDSzj
+CN/m
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_wap-wsg-idm-ecid-wtls7_PUB
+PublicKey=BOB_sect283k1_PUB
 -----BEGIN PUBLIC KEY-----
-MD4wEAYHKoZIzj0CAQYFZysBBAcDKgAEiWabhYPp/L7HLqvqanxRT2Hpp3y3YXQA
-eCaHX0dyeQc7uu4RJmyCkA==
+MF4wEAYHKoZIzj0CAQYFK4EEABADSgAEA5Ause5pdH6ks7PdyPeoPbYAkz6VD5v8
+KTV1b97PiYmZNDeoBY78FQyHRSvdSo+oRew2RacpaCAntRoiWHyN1nAdDSzjCN/m
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_wap-wsg-idm-ecid-wtls7:BOB_wap-wsg-idm-ecid-wtls7_PUB
+PrivPubKeyPair = BOB_sect283k1:BOB_sect283k1_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_wap-wsg-idm-ecid-wtls7
-PeerKey=BOB_wap-wsg-idm-ecid-wtls7_PUB
-SharedSecret=990eda6a0406caef965018b97c94d0faa200f6e4
+Derive=ALICE_sect283k1
+PeerKey=BOB_sect283k1_PUB
+SharedSecret=02f2e682c2f60d7261624f3661a5e85fca920443b72aa4dd5a540082e65e552302d8f825
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_wap-wsg-idm-ecid-wtls7
-PeerKey=ALICE_wap-wsg-idm-ecid-wtls7_PUB
-SharedSecret=990eda6a0406caef965018b97c94d0faa200f6e4
+Derive=BOB_sect283k1
+PeerKey=ALICE_sect283k1_PUB
+SharedSecret=02f2e682c2f60d7261624f3661a5e85fca920443b72aa4dd5a540082e65e552302d8f825
 
-# TEST CURVE wap-wsg-idm-ecid-wtls8
+# TEST CURVE sect283r1
 
-PrivateKey=ALICE_wap-wsg-idm-ecid-wtls8
+PrivateKey=ALICE_sect283r1
 -----BEGIN PRIVATE KEY-----
-ME8CAQAwEAYHKoZIzj0CAQYFZysBBAgEODA2AgEBBA8A1m62ffl6niuM46XOUyih
-IAMeAAT4mqYAoe7NEtKfEMQs2ofInhZRZCFrFU5cjEWi
+MIGQAgEAMBAGByqGSM49AgEGBSuBBAARBHkwdwIBAQQkAi4Jrhu19kt7H8jw1FO7
+VzCxh6p0pI0ogl3q9ev5NFkufZkZoUwDSgAEAHx6cwnWw+9l3oZHpx+R8nu7SLqU
+S40TU2uL0W6VTNANIvcJB1b++3okH0FJgFAahbaotafYTyfqCoY11VaxnVqU5/aE
+7jsD
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_wap-wsg-idm-ecid-wtls8_PUB
+PublicKey=ALICE_sect283r1_PUB
 -----BEGIN PUBLIC KEY-----
-MDIwEAYHKoZIzj0CAQYFZysBBAgDHgAE+JqmAKHuzRLSnxDELNqHyJ4WUWQhaxVO
-XIxFog==
+MF4wEAYHKoZIzj0CAQYFK4EEABEDSgAEAHx6cwnWw+9l3oZHpx+R8nu7SLqUS40T
+U2uL0W6VTNANIvcJB1b++3okH0FJgFAahbaotafYTyfqCoY11VaxnVqU5/aE7jsD
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_wap-wsg-idm-ecid-wtls8:ALICE_wap-wsg-idm-ecid-wtls8_PUB
+PrivPubKeyPair = ALICE_sect283r1:ALICE_sect283r1_PUB
 
-PrivateKey=BOB_wap-wsg-idm-ecid-wtls8
+
+PrivateKey=BOB_sect283r1
 -----BEGIN PRIVATE KEY-----
-ME8CAQAwEAYHKoZIzj0CAQYFZysBBAgEODA2AgEBBA8AegTrLoMRyPl4U4xOdg6h
-IAMeAATQKkyQ3jL2Eku6C+vSQazbjjSkzNe67Occqj2P
+MIGQAgEAMBAGByqGSM49AgEGBSuBBAARBHkwdwIBAQQkACD04gJaVfVxK/Dpbxjq
+rzZWc6B76a23MK/IQD1jMlGPQzzxoUwDSgAEA13mIYMvik12DBp8JkdETMB1ewOw
+22C/xhnzLEHmgrG0ewxeANVAoIZy2uv5t0VUJIp4PYdLNaqIguN+9v6U78O4lass
+Iq5I
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_wap-wsg-idm-ecid-wtls8_PUB
+PublicKey=BOB_sect283r1_PUB
 -----BEGIN PUBLIC KEY-----
-MDIwEAYHKoZIzj0CAQYFZysBBAgDHgAE0CpMkN4y9hJLugvr0kGs2440pMzXuuzn
-HKo9jw==
+MF4wEAYHKoZIzj0CAQYFK4EEABEDSgAEA13mIYMvik12DBp8JkdETMB1ewOw22C/
+xhnzLEHmgrG0ewxeANVAoIZy2uv5t0VUJIp4PYdLNaqIguN+9v6U78O4lassIq5I
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_wap-wsg-idm-ecid-wtls8:BOB_wap-wsg-idm-ecid-wtls8_PUB
+PrivPubKeyPair = BOB_sect283r1:BOB_sect283r1_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_wap-wsg-idm-ecid-wtls8
-PeerKey=BOB_wap-wsg-idm-ecid-wtls8_PUB
-SharedSecret=7524c547bd6b26644ce70571cb06
+Derive=ALICE_sect283r1
+PeerKey=BOB_sect283r1_PUB
+SharedSecret=05778bc1afcf38d7dddb2150cacbfe4d38dc588968fd8b2e859c28ae2629d3435f89f6cc
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_wap-wsg-idm-ecid-wtls8
-PeerKey=ALICE_wap-wsg-idm-ecid-wtls8_PUB
-SharedSecret=7524c547bd6b26644ce70571cb06
+Derive=BOB_sect283r1
+PeerKey=ALICE_sect283r1_PUB
+SharedSecret=05778bc1afcf38d7dddb2150cacbfe4d38dc588968fd8b2e859c28ae2629d3435f89f6cc
 
-# TEST CURVE wap-wsg-idm-ecid-wtls9
+# TEST CURVE sect409k1
 
-PrivateKey=ALICE_wap-wsg-idm-ecid-wtls9
+PrivateKey=ALICE_sect409k1
 -----BEGIN PRIVATE KEY-----
-MGECAQAwEAYHKoZIzj0CAQYFZysBBAkESjBIAgEBBBUAE0376NvzsIXi6XadrVn4
-06obTRChLAMqAARbC1yw9f1uBOVlMf5ZFQewTgyc81Aqh2TFMSRfujCIhdvGTYgR
-tu6F
+MIHBAgEAMBAGByqGSM49AgEGBSuBBAAkBIGpMIGmAgEBBDMg1vV7wiPe1ovX+ukz
+VfwPZoqvyj/vdif04Opi9PcjV5mPBEZgSFBg8hbutNxZJdVLrxShbANqAAQACe1I
+J5ilSk1pPLvbcjEZIE6abC9LZ9WmHuNJxM9LAW1OuLvJGi72AsGYUOGpX0WGmK6C
+AYaqZb2Qeedq/yUIljDHYi66J+26owYl7lOMpRzZ9U2QDJrZ7TYuxeMUui6re0B+
+JuZdYw==
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_wap-wsg-idm-ecid-wtls9_PUB
+PublicKey=ALICE_sect409k1_PUB
 -----BEGIN PUBLIC KEY-----
-MD4wEAYHKoZIzj0CAQYFZysBBAkDKgAEWwtcsPX9bgTlZTH+WRUHsE4MnPNQKodk
-xTEkX7owiIXbxk2IEbbuhQ==
+MH4wEAYHKoZIzj0CAQYFK4EEACQDagAEAAntSCeYpUpNaTy723IxGSBOmmwvS2fV
+ph7jScTPSwFtTri7yRou9gLBmFDhqV9FhpiuggGGqmW9kHnnav8lCJYwx2Iuuift
+uqMGJe5TjKUc2fVNkAya2e02LsXjFLouq3tAfibmXWM=
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_wap-wsg-idm-ecid-wtls9:ALICE_wap-wsg-idm-ecid-wtls9_PUB
+PrivPubKeyPair = ALICE_sect409k1:ALICE_sect409k1_PUB
 
 
-PrivateKey=BOB_wap-wsg-idm-ecid-wtls9
+PrivateKey=BOB_sect409k1
 -----BEGIN PRIVATE KEY-----
-MGECAQAwEAYHKoZIzj0CAQYFZysBBAkESjBIAgEBBBUAd2kfMclaJU2bg8ayTrjZ
-oolI82yhLAMqAAQ0NeW9TKhQeFrrTyMR9Gb55+BneCQSByAShM8Dn3V1FFYz7n0y
-bvBX
+MIHBAgEAMBAGByqGSM49AgEGBSuBBAAkBIGpMIGmAgEBBDMIYBGZZcZz4qCdhAV9
+vqpfe8vV+vJEhjawR52JUV1rumWEBPAx0o6E+gaxHBr5hzVGkIKhbANqAAQAAQKK
+s60CTUUkltsT+lIBukjz850pkGGLltJ4eaZn4k9AtN/lFTCq6Vgqe2sDrjA3b45q
+AdWjf1vRaP0wawJ13SjApJmyXg5hQks6d0Zqz2OHYhGEGiM159VtTlStK067dVe1
+fGVDeg==
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_wap-wsg-idm-ecid-wtls9_PUB
+PublicKey=BOB_sect409k1_PUB
 -----BEGIN PUBLIC KEY-----
-MD4wEAYHKoZIzj0CAQYFZysBBAkDKgAENDXlvUyoUHha608jEfRm+efgZ3gkEgcg
-EoTPA591dRRWM+59Mm7wVw==
+MH4wEAYHKoZIzj0CAQYFK4EEACQDagAEAAECirOtAk1FJJbbE/pSAbpI8/OdKZBh
+i5bSeHmmZ+JPQLTf5RUwqulYKntrA64wN2+OagHVo39b0Wj9MGsCdd0owKSZsl4O
+YUJLOndGas9jh2IRhBojNefVbU5UrStOu3VXtXxlQ3o=
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_wap-wsg-idm-ecid-wtls9:BOB_wap-wsg-idm-ecid-wtls9_PUB
+PrivPubKeyPair = BOB_sect409k1:BOB_sect409k1_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_wap-wsg-idm-ecid-wtls9
-PeerKey=BOB_wap-wsg-idm-ecid-wtls9_PUB
-SharedSecret=5ca1d9eed44def2c390fd5bbb16ca2c3a09eb7b1
+Derive=ALICE_sect409k1
+PeerKey=BOB_sect409k1_PUB
+SharedSecret=01523ec40ad40226a57281a4c423801ae9495dcf736eddd667023b1390977d018ce79313fb99c503f39cbee80f5c1968f3bd02e0
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_wap-wsg-idm-ecid-wtls9
-PeerKey=ALICE_wap-wsg-idm-ecid-wtls9_PUB
-SharedSecret=5ca1d9eed44def2c390fd5bbb16ca2c3a09eb7b1
+Derive=BOB_sect409k1
+PeerKey=ALICE_sect409k1_PUB
+SharedSecret=01523ec40ad40226a57281a4c423801ae9495dcf736eddd667023b1390977d018ce79313fb99c503f39cbee80f5c1968f3bd02e0
 
-# TEST CURVE wap-wsg-idm-ecid-wtls10
+# TEST CURVE sect409r1
 
-PrivateKey=ALICE_wap-wsg-idm-ecid-wtls10
+PrivateKey=ALICE_sect409r1
 -----BEGIN PRIVATE KEY-----
-MH0CAQAwEAYHKoZIzj0CAQYFZysBBAoEZjBkAgEBBB01TDgjIGd+gXPZ4esQnWzz
-/y1vzJniUBM5XNyPq6FAAz4ABAHVs5gYpbJzqyO8Lk3nkTwhu4BuXb4wtrgGcY2L
-TwGxkC4Zq4aqLowsexGjVa0IjGKdWz5/TfwLwGpN4A==
+MIHCAgEAMBAGByqGSM49AgEGBSuBBAAlBIGqMIGnAgEBBDQAYTMsTpey51D2ULnd
+pN+AAWnJLy9pTerziakhjii8OyWKpUVfpDFNneCCd2oQTDcPX5vdoWwDagAEAYfk
+3ZejxpVYCG7dYHTVhhcqILEyTYoQa4YehGPxKcbmgpqW4Wev1tEDVI3JIowICYGU
+owHXXzgDXoJeR79wgb7ySAlXJXgQ8Ficr7i0CaqyAuIpFw9FWJT3jheFwnbpDTvI
+eIozlf4=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_wap-wsg-idm-ecid-wtls10_PUB
+PublicKey=ALICE_sect409r1_PUB
 -----BEGIN PUBLIC KEY-----
-MFIwEAYHKoZIzj0CAQYFZysBBAoDPgAEAdWzmBilsnOrI7wuTeeRPCG7gG5dvjC2
-uAZxjYtPAbGQLhmrhqoujCx7EaNVrQiMYp1bPn9N/AvAak3g
+MH4wEAYHKoZIzj0CAQYFK4EEACUDagAEAYfk3ZejxpVYCG7dYHTVhhcqILEyTYoQ
+a4YehGPxKcbmgpqW4Wev1tEDVI3JIowICYGUowHXXzgDXoJeR79wgb7ySAlXJXgQ
+8Ficr7i0CaqyAuIpFw9FWJT3jheFwnbpDTvIeIozlf4=
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_wap-wsg-idm-ecid-wtls10:ALICE_wap-wsg-idm-ecid-wtls10_PUB
+PrivPubKeyPair = ALICE_sect409r1:ALICE_sect409r1_PUB
 
 
-PrivateKey=BOB_wap-wsg-idm-ecid-wtls10
+PrivateKey=BOB_sect409r1
 -----BEGIN PRIVATE KEY-----
-MH0CAQAwEAYHKoZIzj0CAQYFZysBBAoEZjBkAgEBBB0mTqwYwByRuu4zcU1QLKcG
-m8wewuaoKqVSpp8xQaFAAz4ABAEF4xTrWAIF1EacNMqTG3kwxwartAKFFqyOle+w
-BwDi6gra7cFVedD1p5RwD4gZU4QzgCLSwa7xZbBzgg==
+MIHCAgEAMBAGByqGSM49AgEGBSuBBAAlBIGqMIGnAgEBBDQAsCs1nRgwW97TdKIH
+PRcsqmK1e8TIZ00e6rqLb3nD4sIe+Gw/fGhSUER9akQ7lAluEUnfoWwDagAEAfM2
+fvBEic+7jV4oC+v8GfsunD9Zp9rzNgMp3dJ+ZU7r6Bp+ZH3dL9Uvv8kUiB89UlDl
+LwBm/W6TlzGuh1FnzXYKVnhnXpzSlRZQsPCceKukbV46Asl8O23b2+DPJgQBGbMf
+WsgK+KA=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_wap-wsg-idm-ecid-wtls10_PUB
+PublicKey=BOB_sect409r1_PUB
 -----BEGIN PUBLIC KEY-----
-MFIwEAYHKoZIzj0CAQYFZysBBAoDPgAEAQXjFOtYAgXURpw0ypMbeTDHBqu0AoUW
-rI6V77AHAOLqCtrtwVV50PWnlHAPiBlThDOAItLBrvFlsHOC
+MH4wEAYHKoZIzj0CAQYFK4EEACUDagAEAfM2fvBEic+7jV4oC+v8GfsunD9Zp9rz
+NgMp3dJ+ZU7r6Bp+ZH3dL9Uvv8kUiB89UlDlLwBm/W6TlzGuh1FnzXYKVnhnXpzS
+lRZQsPCceKukbV46Asl8O23b2+DPJgQBGbMfWsgK+KA=
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_wap-wsg-idm-ecid-wtls10:BOB_wap-wsg-idm-ecid-wtls10_PUB
+PrivPubKeyPair = BOB_sect409r1:BOB_sect409r1_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_wap-wsg-idm-ecid-wtls10
-PeerKey=BOB_wap-wsg-idm-ecid-wtls10_PUB
-SharedSecret=0199de137bc263e25b543994d6315b5a3f1e38e7e1f60662cb5cbaab5f98
+Derive=ALICE_sect409r1
+PeerKey=BOB_sect409r1_PUB
+SharedSecret=019dc849870dc6f79978aca8e1fc6aa6836c8fcb25bbfe3d5ab41ea53eae2c7329952280efb30f9097a31a774191e476dbd842d5
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_wap-wsg-idm-ecid-wtls10
-PeerKey=ALICE_wap-wsg-idm-ecid-wtls10_PUB
-SharedSecret=0199de137bc263e25b543994d6315b5a3f1e38e7e1f60662cb5cbaab5f98
+Derive=BOB_sect409r1
+PeerKey=ALICE_sect409r1_PUB
+SharedSecret=019dc849870dc6f79978aca8e1fc6aa6836c8fcb25bbfe3d5ab41ea53eae2c7329952280efb30f9097a31a774191e476dbd842d5
 
-# TEST CURVE wap-wsg-idm-ecid-wtls11
+# TEST CURVE sect571k1
 
-PrivateKey=ALICE_wap-wsg-idm-ecid-wtls11
+PrivateKey=ALICE_sect571k1
 -----BEGIN PRIVATE KEY-----
-MH4CAQAwEAYHKoZIzj0CAQYFZysBBAsEZzBlAgEBBB4Au6lrzC3RIk3jXmtbeOAp
-LZPR0NUrr6dTf1lSCGqhQAM+AAQBl73V2TEZ8BO4QC+YiBlJ0GmW8WLc3RtS3iIr
-/oUAaDQQAGVJFD3GghjBPfI9KVBcZ2P8tUXUv5ifrWc=
+MIIBAAIBADAQBgcqhkjOPQIBBgUrgQQAJgSB6DCB5QIBAQRIARO8hI8j6TZ556/d
+RcdGYvdblnALD2XZCKu2c3C5yQIeA8Tidi+f8n6cCnb5FtJNTYKqP8tRfHlwAZtW
+/giXi/4yF5K2twS3oYGVA4GSAAQAtiuUbz7v6njhujnDhanD4iV84K0LQd9wP1+k
+v0Bn833nKtFrZComgrip2SwUaEYOE6IcPyCJ48vWOKvIR6fU11tWwsFRPU0Cct0S
+qVbANAJzwL1umwuKNPblJ6ZEwcBdgw7hWFL6sh+0ayAQ3a8zOizhViJPCnaKR/Oo
+AtaUpCWLSTHDF1gK4/kmlwEx+8o=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_wap-wsg-idm-ecid-wtls11_PUB
+PublicKey=ALICE_sect571k1_PUB
 -----BEGIN PUBLIC KEY-----
-MFIwEAYHKoZIzj0CAQYFZysBBAsDPgAEAZe91dkxGfATuEAvmIgZSdBplvFi3N0b
-Ut4iK/6FAGg0EABlSRQ9xoIYwT3yPSlQXGdj/LVF1L+Yn61n
+MIGnMBAGByqGSM49AgEGBSuBBAAmA4GSAAQAtiuUbz7v6njhujnDhanD4iV84K0L
+Qd9wP1+kv0Bn833nKtFrZComgrip2SwUaEYOE6IcPyCJ48vWOKvIR6fU11tWwsFR
+PU0Cct0SqVbANAJzwL1umwuKNPblJ6ZEwcBdgw7hWFL6sh+0ayAQ3a8zOizhViJP
+CnaKR/OoAtaUpCWLSTHDF1gK4/kmlwEx+8o=
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_wap-wsg-idm-ecid-wtls11:ALICE_wap-wsg-idm-ecid-wtls11_PUB
+PrivPubKeyPair = ALICE_sect571k1:ALICE_sect571k1_PUB
 
 
-PrivateKey=BOB_wap-wsg-idm-ecid-wtls11
+PrivateKey=BOB_sect571k1
 -----BEGIN PRIVATE KEY-----
-MH4CAQAwEAYHKoZIzj0CAQYFZysBBAsEZzBlAgEBBB4AGJuGtQI1FvHfp2AsdKb3
-NVWawjpZQuyM1aelws2hQAM+AAQAdTW3xU6Ijf/Y835Z2hS4fOn6Xmp3O6iblXHr
-nKoBORuxHVRfXkfdL5TqfFpuDghzCyAS6ZMSWhjGV5o=
+MIIBAAIBADAQBgcqhkjOPQIBBgUrgQQAJgSB6DCB5QIBAQRIAVZT4tnX9dMWS6Vd
+YCoYRl9o/j/Hz7KGqF4Ujk9n9b4+mXbJ37tobpjnpNqKlJfI04w80JPp+NxpoBR3
+8p1bcc9iL4Smh48YoYGVA4GSAAQARzAx9yVkHL8pbe1myosILIhhLLURYRDHmopO
+IijLQmTATV9pYO7CrFBPBjaKNRjPpw/cVOs89X9Jdzx/bolkGqVAsjLN1tsCrqET
+31F4mpnfsPwcM6zbp6lE4N2gL5cakKMmyPNM4d3m8xl1f6e56LBYfaxOaqcYzbXC
+Q/Aiij13H06qKhuFM4iiB/0D164=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_wap-wsg-idm-ecid-wtls11_PUB
+PublicKey=BOB_sect571k1_PUB
 -----BEGIN PUBLIC KEY-----
-MFIwEAYHKoZIzj0CAQYFZysBBAsDPgAEAHU1t8VOiI3/2PN+WdoUuHzp+l5qdzuo
-m5Vx65yqATkbsR1UX15H3S+U6nxabg4IcwsgEumTEloYxlea
+MIGnMBAGByqGSM49AgEGBSuBBAAmA4GSAAQARzAx9yVkHL8pbe1myosILIhhLLUR
+YRDHmopOIijLQmTATV9pYO7CrFBPBjaKNRjPpw/cVOs89X9Jdzx/bolkGqVAsjLN
+1tsCrqET31F4mpnfsPwcM6zbp6lE4N2gL5cakKMmyPNM4d3m8xl1f6e56LBYfaxO
+aqcYzbXCQ/Aiij13H06qKhuFM4iiB/0D164=
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_wap-wsg-idm-ecid-wtls11:BOB_wap-wsg-idm-ecid-wtls11_PUB
+PrivPubKeyPair = BOB_sect571k1:BOB_sect571k1_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_wap-wsg-idm-ecid-wtls11
-PeerKey=BOB_wap-wsg-idm-ecid-wtls11_PUB
-SharedSecret=01ee4b517d8a64be5ee32e10152c7bbcb8cde73a3da8e9643bce173011f7
+Derive=ALICE_sect571k1
+PeerKey=BOB_sect571k1_PUB
+SharedSecret=05a423515fcc91b3171c83edd5c4085ff729a8ff0a3fa1578ebf769523ded0f5c1e387cf63109f2fbd95e117345b788b4577fdc6b6e727230bfc73eae0d4e851cb6f6e616eddb13e
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_wap-wsg-idm-ecid-wtls11
-PeerKey=ALICE_wap-wsg-idm-ecid-wtls11_PUB
-SharedSecret=01ee4b517d8a64be5ee32e10152c7bbcb8cde73a3da8e9643bce173011f7
+Derive=BOB_sect571k1
+PeerKey=ALICE_sect571k1_PUB
+SharedSecret=05a423515fcc91b3171c83edd5c4085ff729a8ff0a3fa1578ebf769523ded0f5c1e387cf63109f2fbd95e117345b788b4577fdc6b6e727230bfc73eae0d4e851cb6f6e616eddb13e
 
-# TEST CURVE wap-wsg-idm-ecid-wtls12
+# TEST CURVE sect571r1
 
-PrivateKey=ALICE_wap-wsg-idm-ecid-wtls12
+PrivateKey=ALICE_sect571r1
 -----BEGIN PRIVATE KEY-----
-MHgCAQAwEAYHKoZIzj0CAQYFZysBBAwEYTBfAgEBBByAnUvQZhZr1lgTRixSMIx0
-KHuV4t8cbXCW415soTwDOgAE3G8wIl9SJ0mAmuIMWbJpFjf9wO8gKNu6nApye39Y
-hpXeYRL/nm7G6HmiiA5O1iudWC3hDbBH0cc=
+MIIBAAIBADAQBgcqhkjOPQIBBgUrgQQAJwSB6DCB5QIBAQRIArsi//Zp9veeURYV
+zGYHn4MlNIxNt6U6vtmTPS/NaoiaavxbOimpHgxYPCjpoPYhM33Z2VBh7pl2aoRW
+3GBepLFLoF8oiQaLoYGVA4GSAAQDRG2b7KCUKbGDTWVgW0qqNC3oYcz4f/AwTHmo
+US1mzdRZj/Sf6IU+7mITGnQ6lg1EkTas/X6TK1hNMV7tAjSeowdN75wzd8YF32SF
+HMIcWew5g56oF961qv3IvICZnRAOmWyGHeHdYwHxMBSBPNgua42QGoJz6J6dYAUe
+vE+F3N29p/tRBGNzMFIqoDdW+NA=
 -----END PRIVATE KEY-----
 
-PublicKey=ALICE_wap-wsg-idm-ecid-wtls12_PUB
+PublicKey=ALICE_sect571r1_PUB
 -----BEGIN PUBLIC KEY-----
-ME4wEAYHKoZIzj0CAQYFZysBBAwDOgAE3G8wIl9SJ0mAmuIMWbJpFjf9wO8gKNu6
-nApye39YhpXeYRL/nm7G6HmiiA5O1iudWC3hDbBH0cc=
+MIGnMBAGByqGSM49AgEGBSuBBAAnA4GSAAQDRG2b7KCUKbGDTWVgW0qqNC3oYcz4
+f/AwTHmoUS1mzdRZj/Sf6IU+7mITGnQ6lg1EkTas/X6TK1hNMV7tAjSeowdN75wz
+d8YF32SFHMIcWew5g56oF961qv3IvICZnRAOmWyGHeHdYwHxMBSBPNgua42QGoJz
+6J6dYAUevE+F3N29p/tRBGNzMFIqoDdW+NA=
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = ALICE_wap-wsg-idm-ecid-wtls12:ALICE_wap-wsg-idm-ecid-wtls12_PUB
+PrivPubKeyPair = ALICE_sect571r1:ALICE_sect571r1_PUB
 
 
-PrivateKey=BOB_wap-wsg-idm-ecid-wtls12
+PrivateKey=BOB_sect571r1
 -----BEGIN PRIVATE KEY-----
-MHgCAQAwEAYHKoZIzj0CAQYFZysBBAwEYTBfAgEBBBzZ7nt4CrPrk2m5iR64vpkj
-95JHOmzWf4VhRZqdoTwDOgAEukz40I4gWpUmXCM+PLmWGd0IO0XIPQa9KXzXvhbL
-dJH0yFkJ+ClSboOC26gtMTICiPhEgYjeKEQ=
+MIIBAAIBADAQBgcqhkjOPQIBBgUrgQQAJwSB6DCB5QIBAQRIAYj65N5XJTQusn+h
+Z9xj/dgZ4qR1GDC1Ij7jYuow+TvGrG2wz/WT76/lLNtlCLfDW2kODDUmDAJeK/e+
+VMO7suJTXGnrGFHioYGVA4GSAAQGxykYFxqz7jZxcBbiPLYfJEhXlf2SYmMKve74
+trOT+qjIm35+uUAcg2krOzH7X/8wH6bVSn/UKG/k27wZrAnWzZ5XKd8QI70H8aHv
+LgrCoMoqOno+h6J4TgvlDq7FIGZ8fvDaM7YJ8dHPX5FC8Vyphu82TcNdnNATBqom
+6WDWc7RTFZ4sijL5ywVhovwJ1gA=
 -----END PRIVATE KEY-----
 
-PublicKey=BOB_wap-wsg-idm-ecid-wtls12_PUB
+PublicKey=BOB_sect571r1_PUB
 -----BEGIN PUBLIC KEY-----
-ME4wEAYHKoZIzj0CAQYFZysBBAwDOgAEukz40I4gWpUmXCM+PLmWGd0IO0XIPQa9
-KXzXvhbLdJH0yFkJ+ClSboOC26gtMTICiPhEgYjeKEQ=
+MIGnMBAGByqGSM49AgEGBSuBBAAnA4GSAAQGxykYFxqz7jZxcBbiPLYfJEhXlf2S
+YmMKve74trOT+qjIm35+uUAcg2krOzH7X/8wH6bVSn/UKG/k27wZrAnWzZ5XKd8Q
+I70H8aHvLgrCoMoqOno+h6J4TgvlDq7FIGZ8fvDaM7YJ8dHPX5FC8Vyphu82TcNd
+nNATBqom6WDWc7RTFZ4sijL5ywVhovwJ1gA=
 -----END PUBLIC KEY-----
 
-PrivPubKeyPair = BOB_wap-wsg-idm-ecid-wtls12:BOB_wap-wsg-idm-ecid-wtls12_PUB
+PrivPubKeyPair = BOB_sect571r1:BOB_sect571r1_PUB
 
 
 # ECDH Alice with Bob peer
 
-Derive=ALICE_wap-wsg-idm-ecid-wtls12
-PeerKey=BOB_wap-wsg-idm-ecid-wtls12_PUB
-SharedSecret=c75a8283a73312de82c8f99d41a9173a43b8f921e8161dd140131b36
+Derive=ALICE_sect571r1
+PeerKey=BOB_sect571r1_PUB
+SharedSecret=004b397e564055e2c7d87648183c948655ccb0ebb20bd441f9b11635cf461cb5815ff060eab33091b9f7aed67bec8ba1bb7b22437ece3c92c7cf76124408fb951595dfb4a512b2ae
 
 # ECDH Bob with Alice peer
 
-Derive=BOB_wap-wsg-idm-ecid-wtls12
-PeerKey=ALICE_wap-wsg-idm-ecid-wtls12_PUB
-SharedSecret=c75a8283a73312de82c8f99d41a9173a43b8f921e8161dd140131b36
-
+Derive=BOB_sect571r1
+PeerKey=ALICE_sect571r1_PUB
+SharedSecret=004b397e564055e2c7d87648183c948655ccb0ebb20bd441f9b11635cf461cb5815ff060eab33091b9f7aed67bec8ba1bb7b22437ece3c92c7cf76124408fb951595dfb4a512b2ae
 
 Title = ECDH KATs (from RFC 5114, 5903, 7027)
 
@@ -3132,12 +3291,12 @@ MEkwEwYHKoZIzj0CAQYIKoZIzj0DAQEDMgAEUZoSFoDgBFRmuiHfLu5H9Zc7UAV3
 
 PrivPubKeyPair = PRIME192V1_RFC5114-Peer:PRIME192V1_RFC5114-Peer-PUBLIC
 
-
-
+Availablein = default
 Derive=PRIME192V1_RFC5114
 PeerKey=PRIME192V1_RFC5114-Peer-PUBLIC
 SharedSecret=AD420182633F8526BFE954ACDA376F05E5FF4F837F54FEBE
 
+Availablein = default
 Derive=PRIME192V1_RFC5114-Peer
 PeerKey=PRIME192V1_RFC5114-PUBLIC
 SharedSecret=AD420182633F8526BFE954ACDA376F05E5FF4F837F54FEBE
@@ -3173,9 +3332,6 @@ zUKiB9SRvpnCE6fRyjcG3r/jBfNhr8uzPiYJyLFhitU=
 
 PrivPubKeyPair = SECP224R1_RFC5114-Peer:SECP224R1_RFC5114-Peer-PUBLIC
 
-
-
-
 Derive=SECP224R1_RFC5114
 PeerKey=SECP224R1_RFC5114-Peer-PUBLIC
 SharedSecret=52272F50F46F4EDC9151569092F46DF2D96ECC3B6DC1714A4EA949FA
@@ -3216,9 +3372,6 @@ n6d1s6sHFfbOUbCfG37s4g17XtjsaF+j8HHYNycCcJKoQROFw03eVwiytg==
 
 PrivPubKeyPair = PRIME256V1_RFC5114-Peer:PRIME256V1_RFC5114-Peer-PUBLIC
 
-
-
-
 Derive=PRIME256V1_RFC5114
 PeerKey=PRIME256V1_RFC5114-Peer-PUBLIC
 SharedSecret=DD0F5396219D1EA393310412D19A08F1F5811E9DC8EC8EEA7F80D21C820C2788
@@ -3263,9 +3416,6 @@ DOyhY1bKkzJAvehyNBWo7OA1sO3zZ1Xe
 
 PrivPubKeyPair = SECP384R1_RFC5114-Peer:SECP384R1_RFC5114-Peer-PUBLIC
 
-
-
-
 Derive=SECP384R1_RFC5114
 PeerKey=SECP384R1_RFC5114-Peer-PUBLIC
 SharedSecret=5EA1FC4AF7256D2055981B110575E0A8CAE53160137D904C59D926EB1B8456E427AA8A4540884C37DE159A58028ABC0E
@@ -3316,9 +3466,6 @@ Kg5gcRvlcpFfvU/vJpU=
 
 PrivPubKeyPair = SECP521R1_RFC5114-Peer:SECP521R1_RFC5114-Peer-PUBLIC
 
-
-
-
 Derive=SECP521R1_RFC5114
 PeerKey=SECP521R1_RFC5114-Peer-PUBLIC
 SharedSecret=00CDEA89621CFA46B132F9E4CFE2261CDE2D4368EB5656634C7CC98C7A00CDE54ED1866A0DD3E6126C9D2F845DAFF82CEB1DA08F5D87521BB0EBECA77911169C20CC
@@ -3360,9 +3507,6 @@ zLdMc2/HVUSUv2NW+/PKNmzCPoFXhUwTxY1qrCPwRq2jD4NT508zA5hyqw==
 
 PrivPubKeyPair = PRIME256V1_RFC5903-Peer:PRIME256V1_RFC5903-Peer-PUBLIC
 
-
-
-
 Derive=PRIME256V1_RFC5903
 PeerKey=PRIME256V1_RFC5903-Peer-PUBLIC
 SharedSecret=D6840F6B42F6EDAFD13116E0E12565202FEF8E9ECE7DCE03812464D04B9442DE
@@ -3407,8 +3551,6 @@ g8+kFzK8UJ0NGsQ6Azbe+W/aQdB3SjVx3PvseqzzGWRyFp6DhDA2f2buvjxucMQW
 
 PrivPubKeyPair = SECP384R1_RFC5903-Peer:SECP384R1_RFC5903-Peer-PUBLIC
 
-
-
 Derive=SECP384R1_RFC5903
 PeerKey=SECP384R1_RFC5903-Peer-PUBLIC
 SharedSecret=11187331C279962D93D604243FD592CB9D0A926F422E47187521287E7156C5C4D603135569B9E9D09CF5D4A270F59746
@@ -3464,7 +3606,6 @@ Derive=SECP521R1_RFC5903
 PeerKey=SECP521R1_RFC5903-Peer-PUBLIC
 SharedSecret=01144C7D79AE6956BC8EDB8E7C787C4521CB086FA64407F97894E5E6B2D79B04D1427E73CA4BAA240A34786859810C06B3C715A3A8CC3151F2BEE417996D19F3DDEA
 
-
 Derive=SECP521R1_RFC5903-Peer
 PeerKey=SECP521R1_RFC5903-PUBLIC
 SharedSecret=01144C7D79AE6956BC8EDB8E7C787C4521CB086FA64407F97894E5E6B2D79B04D1427E73CA4BAA240A34786859810C06B3C715A3A8CC3151F2BEE417996D19F3DDEA
index 1800f3b..5bd6872 100644 (file)
@@ -172,6 +172,7 @@ Title = FIPS Negative tests (using different curves and digests)
 # Test that a explicit curve is not allowed in fips mode
 Availablein = fips
 DigestVerify = SHA256
+Securitycheck = 1
 Key = EC_EXPLICIT
 Input = "Hello World"
 Result = DIGESTVERIFYINIT_ERROR
@@ -179,6 +180,7 @@ Result = DIGESTVERIFYINIT_ERROR
 # Test that a curve with < 112 bits is not allowed in fips mode for signing
 Availablein = fips
 DigestSign = SHA3-512
+Securitycheck = 1
 Key = B-163
 Input = "Hello World"
 Result = DIGESTSIGNINIT_ERROR
@@ -186,6 +188,7 @@ Result = DIGESTSIGNINIT_ERROR
 # Test that a non nist curve is not allowed in fips mode
 Availablein = fips
 DigestSign = SHA3-512
+Securitycheck = 1
 Key = secp256k1
 Input = "Hello World"
 Result = DIGESTSIGNINIT_ERROR
index 32ffe34..ba10496 100644 (file)
@@ -52,6 +52,7 @@ SharedSecret=803d8ab2e5b6e6fca715737c3a82f7ce3c783124f6d51cd0
 
 Availablein = fips
 Derive=KAS-ECC-CDH_P-192_C0
+Securitycheck = 1
 PeerKey=KAS-ECC-CDH_P-192_C0-Peer-PUBLIC
 Result = DERIVE_SET_PEER_ERROR
 
index 55e3a8a..b56bc84 100644 (file)
@@ -1297,6 +1297,7 @@ Output = 80382819f51b197c42f9fc02a85198683d918059afc013ae155992442563dd289700829
 # Signing with SHA1 is not allowed in fips mode
 Availablein = fips
 DigestSign = SHA1
+Securitycheck = 1
 Key = RSA-2048
 Input = "Hello"
 Result = DIGESTSIGNINIT_ERROR
@@ -1304,6 +1305,7 @@ Result = DIGESTSIGNINIT_ERROR
 # Signing with a 1024 bit key is not allowed in fips mode
 Availablein = fips
 DigestSign = SHA256
+Securitycheck = 1
 Key = RSA-1024
 Input = "Hello"
 Result = DIGESTSIGNINIT_ERROR
@@ -1311,6 +1313,7 @@ Result = DIGESTSIGNINIT_ERROR
 # Verifying with a legacy digest in fips mode is not allowed
 Availablein = fips
 DigestVerify = MD5
+Securitycheck = 1
 Key = RSA-2048
 Input = "Hello"
 Result = DIGESTVERIFYINIT_ERROR
@@ -1318,6 +1321,7 @@ Result = DIGESTVERIFYINIT_ERROR
 # Verifying with a key smaller than 1024 bits in fips mode is not allowed
 Availablein = fips
 DigestVerify = SHA256
+Securitycheck = 1
 Key = RSA-512
 Input = "Hello"
 Result = DIGESTVERIFYINIT_ERROR