diff -up openssl-1.0.2a/crypto/ecdh/ecdhtest.c.fips-ec openssl-1.0.2a/crypto/ecdh/ecdhtest.c

--- openssl-1.0.2a/crypto/ecdh/ecdhtest.c.fips-ec	2015-03-19 14:30:36.000000000 +0100

+++ openssl-1.0.2a/crypto/ecdh/ecdhtest.c	2015-04-22 19:00:19.721884512 +0200

@@ -501,11 +501,13 @@ int main(int argc, char *argv[])

         goto err;

     /* NIST PRIME CURVES TESTS */

+# if 0

     if (!test_ecdh_curve

         (NID_X9_62_prime192v1, "NIST Prime-Curve P-192", ctx, out))

         goto err;

     if (!test_ecdh_curve(NID_secp224r1, "NIST Prime-Curve P-224", ctx, out))

         goto err;

+# endif

     if (!test_ecdh_curve

         (NID_X9_62_prime256v1, "NIST Prime-Curve P-256", ctx, out))

         goto err;

@@ -536,13 +538,14 @@ int main(int argc, char *argv[])

     if (!test_ecdh_curve(NID_sect571r1, "NIST Binary-Curve B-571", ctx, out))

         goto err;

 # endif

+# if 0

     if (!test_ecdh_kat(out, "Brainpool Prime-Curve brainpoolP256r1", 256))

         goto err;

     if (!test_ecdh_kat(out, "Brainpool Prime-Curve brainpoolP384r1", 384))

         goto err;

     if (!test_ecdh_kat(out, "Brainpool Prime-Curve brainpoolP512r1", 512))

         goto err;

-

+# endif

     ret = 0;

  err:

diff -up openssl-1.0.2a/crypto/ecdh/ech_lib.c.fips-ec openssl-1.0.2a/crypto/ecdh/ech_lib.c

--- openssl-1.0.2a/crypto/ecdh/ech_lib.c.fips-ec	2015-03-19 14:19:00.000000000 +0100

+++ openssl-1.0.2a/crypto/ecdh/ech_lib.c	2015-04-22 19:00:19.721884512 +0200

@@ -93,14 +93,7 @@ void ECDH_set_default_method(const ECDH_

 const ECDH_METHOD *ECDH_get_default_method(void)

 {

     if (!default_ECDH_method) {

-#ifdef OPENSSL_FIPS

-        if (FIPS_mode())

-            return FIPS_ecdh_openssl();

-        else

-            return ECDH_OpenSSL();

-#else

         default_ECDH_method = ECDH_OpenSSL();

-#endif

     }

     return default_ECDH_method;

 }

diff -up openssl-1.0.2a/crypto/ecdh/ech_ossl.c.fips-ec openssl-1.0.2a/crypto/ecdh/ech_ossl.c

--- openssl-1.0.2a/crypto/ecdh/ech_ossl.c.fips-ec	2015-03-19 14:30:36.000000000 +0100

+++ openssl-1.0.2a/crypto/ecdh/ech_ossl.c	2015-04-22 19:00:19.722884536 +0200

@@ -78,6 +78,10 @@

 #include <openssl/obj_mac.h>

 #include <openssl/bn.h>

+#ifdef OPENSSL_FIPS

+# include <openssl/fips.h>

+#endif

+

 static int ecdh_compute_key(void *out, size_t len, const EC_POINT *pub_key,

                             EC_KEY *ecdh,

                             void *(*KDF) (const void *in, size_t inlen,

@@ -90,7 +94,7 @@ static ECDH_METHOD openssl_ecdh_meth = {

     NULL,                       /* init */

     NULL,                       /* finish */

 #endif

-    0,                          /* flags */

+    ECDH_FLAG_FIPS_METHOD,      /* flags */

     NULL                        /* app_data */

 };

@@ -119,6 +123,13 @@ static int ecdh_compute_key(void *out, s

     size_t buflen, len;

     unsigned char *buf = NULL;

+#ifdef OPENSSL_FIPS

+    if (FIPS_selftest_failed()) {

+        FIPSerr(FIPS_F_ECDH_COMPUTE_KEY, FIPS_R_FIPS_SELFTEST_FAILED);

+        return -1;

+    }

+#endif

+

     if (outlen > INT_MAX) {

         ECDHerr(ECDH_F_ECDH_COMPUTE_KEY, ERR_R_MALLOC_FAILURE); /* sort of,

                                                                  * anyway */

diff -up openssl-1.0.2a/crypto/ecdsa/ecdsatest.c.fips-ec openssl-1.0.2a/crypto/ecdsa/ecdsatest.c

--- openssl-1.0.2a/crypto/ecdsa/ecdsatest.c.fips-ec	2015-03-19 14:19:00.000000000 +0100

+++ openssl-1.0.2a/crypto/ecdsa/ecdsatest.c	2015-04-22 19:00:19.722884536 +0200

@@ -138,11 +138,14 @@ int restore_rand(void)

 }

 static int fbytes_counter = 0;

-static const char *numbers[8] = {

+static const char *numbers[10] = {

+    "651056770906015076056810763456358567190100156695615665659",

     "651056770906015076056810763456358567190100156695615665659",

     "6140507067065001063065065565667405560006161556565665656654",

     "8763001015071075675010661307616710783570106710677817767166"

         "71676178726717",

+    "8763001015071075675010661307616710783570106710677817767166"

+        "71676178726717",

     "7000000175690566466555057817571571075705015757757057795755"

         "55657156756655",

     "1275552191113212300012030439187146164646146646466749494799",

@@ -158,7 +161,7 @@ int fbytes(unsigned char *buf, int num)

     int ret;

     BIGNUM *tmp = NULL;

-    if (fbytes_counter >= 8)

+    if (fbytes_counter >= 10)

         return 0;

     tmp = BN_new();

     if (!tmp)

@@ -532,8 +535,10 @@ int main(void)

     RAND_seed(rnd_seed, sizeof(rnd_seed));

     /* the tests */

+# if 0

     if (!x9_62_tests(out))

         goto err;

+# endif

     if (!test_builtin(out))

         goto err;

diff -up openssl-1.0.2a/crypto/ecdsa/ecs_lib.c.fips-ec openssl-1.0.2a/crypto/ecdsa/ecs_lib.c

--- openssl-1.0.2a/crypto/ecdsa/ecs_lib.c.fips-ec	2015-03-19 14:30:36.000000000 +0100

+++ openssl-1.0.2a/crypto/ecdsa/ecs_lib.c	2015-04-22 19:00:19.722884536 +0200

@@ -80,14 +80,7 @@ void ECDSA_set_default_method(const ECDS

 const ECDSA_METHOD *ECDSA_get_default_method(void)

 {

     if (!default_ECDSA_method) {

-#ifdef OPENSSL_FIPS

-        if (FIPS_mode())

-            return FIPS_ecdsa_openssl();

-        else

-            return ECDSA_OpenSSL();

-#else

         default_ECDSA_method = ECDSA_OpenSSL();

-#endif

     }

     return default_ECDSA_method;

 }

diff -up openssl-1.0.2a/crypto/ecdsa/ecs_ossl.c.fips-ec openssl-1.0.2a/crypto/ecdsa/ecs_ossl.c

--- openssl-1.0.2a/crypto/ecdsa/ecs_ossl.c.fips-ec	2015-03-19 14:30:36.000000000 +0100

+++ openssl-1.0.2a/crypto/ecdsa/ecs_ossl.c	2015-04-22 19:00:19.722884536 +0200

@@ -60,6 +60,9 @@

 #include <openssl/err.h>

 #include <openssl/obj_mac.h>

 #include <openssl/bn.h>

+#ifdef OPENSSL_FIPS

+# include <openssl/fips.h>

+#endif

 static ECDSA_SIG *ecdsa_do_sign(const unsigned char *dgst, int dlen,

                                 const BIGNUM *, const BIGNUM *,

@@ -78,7 +81,7 @@ static ECDSA_METHOD openssl_ecdsa_meth =

     NULL,                       /* init */

     NULL,                       /* finish */

 #endif

-    0,                          /* flags */

+    ECDSA_FLAG_FIPS_METHOD,     /* flags */

     NULL                        /* app_data */

 };

@@ -245,6 +248,13 @@ static ECDSA_SIG *ecdsa_do_sign(const un

     ECDSA_DATA *ecdsa;

     const BIGNUM *priv_key;

+#ifdef OPENSSL_FIPS

+    if (FIPS_selftest_failed()) {

+        FIPSerr(FIPS_F_ECDSA_DO_SIGN, FIPS_R_FIPS_SELFTEST_FAILED);

+        return NULL;

+    }

+#endif

+

     ecdsa = ecdsa_check(eckey);

     group = EC_KEY_get0_group(eckey);

     priv_key = EC_KEY_get0_private_key(eckey);

@@ -358,6 +368,13 @@ static int ecdsa_do_verify(const unsigne

     const EC_GROUP *group;

     const EC_POINT *pub_key;

+#ifdef OPENSSL_FIPS

+    if (FIPS_selftest_failed()) {

+        FIPSerr(FIPS_F_ECDSA_DO_VERIFY, FIPS_R_FIPS_SELFTEST_FAILED);

+        return -1;

+    }

+#endif

+

     /* check input values */

     if (eckey == NULL || (group = EC_KEY_get0_group(eckey)) == NULL ||

         (pub_key = EC_KEY_get0_public_key(eckey)) == NULL || sig == NULL) {

diff -up openssl-1.0.2a/crypto/ec/ec_cvt.c.fips-ec openssl-1.0.2a/crypto/ec/ec_cvt.c

--- openssl-1.0.2a/crypto/ec/ec_cvt.c.fips-ec	2015-03-19 14:30:36.000000000 +0100

+++ openssl-1.0.2a/crypto/ec/ec_cvt.c	2015-04-22 19:01:08.703040756 +0200

@@ -82,10 +82,6 @@ EC_GROUP *EC_GROUP_new_curve_GFp(const B

     const EC_METHOD *meth;

     EC_GROUP *ret;

-#ifdef OPENSSL_FIPS

-    if (FIPS_mode())

-        return FIPS_ec_group_new_curve_gfp(p, a, b, ctx);

-#endif

 #if defined(OPENSSL_BN_ASM_MONT)

     /*

      * This might appear controversial, but the fact is that generic

@@ -160,10 +156,6 @@ EC_GROUP *EC_GROUP_new_curve_GF2m(const

     const EC_METHOD *meth;

     EC_GROUP *ret;

-# ifdef OPENSSL_FIPS

-    if (FIPS_mode())

-        return FIPS_ec_group_new_curve_gf2m(p, a, b, ctx);

-# endif

     meth = EC_GF2m_simple_method();

     ret = EC_GROUP_new(meth);

diff -up openssl-1.0.2a/crypto/ec/ec_key.c.fips-ec openssl-1.0.2a/crypto/ec/ec_key.c

--- openssl-1.0.2a/crypto/ec/ec_key.c.fips-ec	2015-03-19 14:19:00.000000000 +0100

+++ openssl-1.0.2a/crypto/ec/ec_key.c	2015-04-22 19:00:19.722884536 +0200

@@ -64,9 +64,6 @@

 #include <string.h>

 #include "ec_lcl.h"

 #include <openssl/err.h>

-#ifdef OPENSSL_FIPS

-# include <openssl/fips.h>

-#endif

 EC_KEY *EC_KEY_new(void)

 {

@@ -227,6 +224,38 @@ int EC_KEY_up_ref(EC_KEY *r)

     return ((i > 1) ? 1 : 0);

 }

+#ifdef OPENSSL_FIPS

+

+# include <openssl/evp.h>

+# include <openssl/fips.h>

+# include <openssl/fips_rand.h>

+

+static int fips_check_ec(EC_KEY *key)

+{

+    EVP_PKEY *pk;

+    unsigned char tbs[] = "ECDSA Pairwise Check Data";

+    int ret = 0;

+

+    if ((pk = EVP_PKEY_new()) == NULL)

+        goto err;

+

+    EVP_PKEY_set1_EC_KEY(pk, key);

+

+    if (fips_pkey_signature_test(pk, tbs, -1, NULL, 0, NULL, 0, NULL))

+        ret = 1;

+

+ err:

+    if (ret == 0) {

+        FIPSerr(FIPS_F_FIPS_CHECK_EC, FIPS_R_PAIRWISE_TEST_FAILED);

+        fips_set_selftest_fail();

+    }

+    if (pk)

+        EVP_PKEY_free(pk);

+    return ret;

+}

+

+#endif

+

 int EC_KEY_generate_key(EC_KEY *eckey)

 {

     int ok = 0;

@@ -235,8 +264,10 @@ int EC_KEY_generate_key(EC_KEY *eckey)

     EC_POINT *pub_key = NULL;

 #ifdef OPENSSL_FIPS

-    if (FIPS_mode())

-        return FIPS_ec_key_generate_key(eckey);

+    if (FIPS_selftest_failed()) {

+        FIPSerr(FIPS_F_EC_KEY_GENERATE_KEY, FIPS_R_FIPS_SELFTEST_FAILED);

+        return 0;

+    }

 #endif

     if (!eckey || !eckey->group) {

@@ -277,6 +308,14 @@ int EC_KEY_generate_key(EC_KEY *eckey)

     eckey->priv_key = priv_key;

     eckey->pub_key = pub_key;

+#ifdef OPENSSL_FIPS

+    if (!fips_check_ec(eckey)) {

+        eckey->priv_key = NULL;

+        eckey->pub_key = NULL;

+        goto err;

+    }

+#endif

+

     ok = 1;

  err:

@@ -408,10 +447,12 @@ int EC_KEY_set_public_key_affine_coordin

             goto err;

     }

     /*

-     * Check if retrieved coordinates match originals: if not values are out

-     * of range.

+     * Check if retrieved coordinates match originals and are less

+     * than field order: if not values are out of range.

      */

-    if (BN_cmp(x, tx) || BN_cmp(y, ty)) {

+    if (BN_cmp(x, tx) || BN_cmp(y, ty)

+        || (BN_cmp(x, &key->group->field) >= 0)

+        || (BN_cmp(y, &key->group->field) >= 0)) {

         ECerr(EC_F_EC_KEY_SET_PUBLIC_KEY_AFFINE_COORDINATES,

               EC_R_COORDINATES_OUT_OF_RANGE);

         goto err;

diff -up openssl-1.0.2a/crypto/ec/ecp_mont.c.fips-ec openssl-1.0.2a/crypto/ec/ecp_mont.c

--- openssl-1.0.2a/crypto/ec/ecp_mont.c.fips-ec	2015-03-19 14:19:00.000000000 +0100

+++ openssl-1.0.2a/crypto/ec/ecp_mont.c	2015-04-22 19:00:19.722884536 +0200

@@ -63,10 +63,6 @@

 #include <openssl/err.h>

-#ifdef OPENSSL_FIPS

-# include <openssl/fips.h>

-#endif

-

 #include "ec_lcl.h"

 const EC_METHOD *EC_GFp_mont_method(void)

@@ -111,11 +107,6 @@ const EC_METHOD *EC_GFp_mont_method(void

         ec_GFp_mont_field_set_to_one

     };

-#ifdef OPENSSL_FIPS

-    if (FIPS_mode())

-        return fips_ec_gfp_mont_method();

-#endif

-

     return &ret;

 }

diff -up openssl-1.0.2a/crypto/ec/ecp_nist.c.fips-ec openssl-1.0.2a/crypto/ec/ecp_nist.c

--- openssl-1.0.2a/crypto/ec/ecp_nist.c.fips-ec	2015-03-19 14:19:00.000000000 +0100

+++ openssl-1.0.2a/crypto/ec/ecp_nist.c	2015-04-22 19:00:19.723884560 +0200

@@ -67,10 +67,6 @@

 #include <openssl/obj_mac.h>

 #include "ec_lcl.h"

-#ifdef OPENSSL_FIPS

-# include <openssl/fips.h>

-#endif

-

 const EC_METHOD *EC_GFp_nist_method(void)

 {

     static const EC_METHOD ret = {

@@ -113,11 +109,6 @@ const EC_METHOD *EC_GFp_nist_method(void

         0                       /* field_set_to_one */

     };

-#ifdef OPENSSL_FIPS

-    if (FIPS_mode())

-        return fips_ec_gfp_nist_method();

-#endif

-

     return &ret;

 }

diff -up openssl-1.0.2a/crypto/ec/ecp_smpl.c.fips-ec openssl-1.0.2a/crypto/ec/ecp_smpl.c

--- openssl-1.0.2a/crypto/ec/ecp_smpl.c.fips-ec	2015-03-19 14:19:00.000000000 +0100

+++ openssl-1.0.2a/crypto/ec/ecp_smpl.c	2015-04-22 19:00:19.723884560 +0200

@@ -66,10 +66,6 @@

 #include <openssl/err.h>

 #include <openssl/symhacks.h>

-#ifdef OPENSSL_FIPS

-# include <openssl/fips.h>

-#endif

-

 #include "ec_lcl.h"

 const EC_METHOD *EC_GFp_simple_method(void)

@@ -114,11 +110,6 @@ const EC_METHOD *EC_GFp_simple_method(vo

         0                       /* field_set_to_one */

     };

-#ifdef OPENSSL_FIPS

-    if (FIPS_mode())

-        return fips_ec_gfp_simple_method();

-#endif

-

     return &ret;

 }

@@ -187,6 +178,11 @@ int ec_GFp_simple_group_set_curve(EC_GRO

         return 0;

     }

+    if (BN_num_bits(p) < 256) {

+        ECerr(EC_F_EC_GFP_SIMPLE_GROUP_SET_CURVE, EC_R_UNSUPPORTED_FIELD);

+        return 0;

+    }

+

     if (ctx == NULL) {

         ctx = new_ctx = BN_CTX_new();

         if (ctx == NULL)

diff -up openssl-1.0.2a/crypto/evp/m_ecdsa.c.fips-ec openssl-1.0.2a/crypto/evp/m_ecdsa.c

--- openssl-1.0.2a/crypto/evp/m_ecdsa.c.fips-ec	2015-03-19 14:30:36.000000000 +0100

+++ openssl-1.0.2a/crypto/evp/m_ecdsa.c	2015-04-22 19:00:19.723884560 +0200

@@ -136,7 +136,7 @@ static const EVP_MD ecdsa_md = {

     NID_ecdsa_with_SHA1,

     NID_ecdsa_with_SHA1,

     SHA_DIGEST_LENGTH,

-    EVP_MD_FLAG_PKEY_DIGEST,

+    EVP_MD_FLAG_PKEY_DIGEST | EVP_MD_FLAG_FIPS,

     init,

     update,

     final,

diff -up openssl-1.0.2a/crypto/fips/cavs/fips_ecdhvs.c.fips-ec openssl-1.0.2a/crypto/fips/cavs/fips_ecdhvs.c

--- openssl-1.0.2a/crypto/fips/cavs/fips_ecdhvs.c.fips-ec	2015-04-22 19:00:19.723884560 +0200

+++ openssl-1.0.2a/crypto/fips/cavs/fips_ecdhvs.c	2015-04-22 19:00:19.723884560 +0200

@@ -0,0 +1,456 @@

+/* fips/ecdh/fips_ecdhvs.c */

+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL

+ * project.

+ */

+/* ====================================================================

+ * Copyright (c) 2011 The OpenSSL Project.  All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ *

+ * 1. Redistributions of source code must retain the above copyright

+ *    notice, this list of conditions and the following disclaimer. 

+ *

+ * 2. Redistributions in binary form must reproduce the above copyright

+ *    notice, this list of conditions and the following disclaimer in

+ *    the documentation and/or other materials provided with the

+ *    distribution.

+ *

+ * 3. All advertising materials mentioning features or use of this

+ *    software must display the following acknowledgment:

+ *    "This product includes software developed by the OpenSSL Project

+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"

+ *

+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to

+ *    endorse or promote products derived from this software without

+ *    prior written permission. For written permission, please contact

+ *    licensing@OpenSSL.org.

+ *

+ * 5. Products derived from this software may not be called "OpenSSL"

+ *    nor may "OpenSSL" appear in their names without prior written

+ *    permission of the OpenSSL Project.

+ *

+ * 6. Redistributions of any form whatsoever must retain the following

+ *    acknowledgment:

+ *    "This product includes software developed by the OpenSSL Project

+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY

+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR

+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED

+ * OF THE POSSIBILITY OF SUCH DAMAGE.

+ * ====================================================================

+ */

+

+#define OPENSSL_FIPSAPI

+#include <openssl/opensslconf.h>

+

+#ifndef OPENSSL_FIPS

+# include <stdio.h>

+

+int main(int argc, char **argv)

+{

+    printf("No FIPS ECDH support\n");

+    return (0);

+}

+#else

+

+# include <openssl/crypto.h>

+# include <openssl/bn.h>

+# include <openssl/ecdh.h>

+# include <openssl/fips.h>

+# include <openssl/err.h>

+# include <openssl/evp.h>

+# include <string.h>

+# include <ctype.h>

+

+# include "fips_utl.h"

+

+static const EVP_MD *eparse_md(char *line)

+{

+    char *p;

+    if (line[0] != '[' || line[1] != 'E')

+        return NULL;

+    p = strchr(line, '-');

+    if (!p)

+        return NULL;

+    line = p + 1;

+    p = strchr(line, ']');

+    if (!p)

+        return NULL;

+    *p = 0;

+    p = line;

+    while (isspace(*p))

+        p++;

+    if (!strcmp(p, "SHA1"))

+        return EVP_sha1();

+    else if (!strcmp(p, "SHA224"))

+        return EVP_sha224();

+    else if (!strcmp(p, "SHA256"))

+        return EVP_sha256();

+    else if (!strcmp(p, "SHA384"))

+        return EVP_sha384();

+    else if (!strcmp(p, "SHA512"))

+        return EVP_sha512();

+    else

+        return NULL;

+}

+

+static int lookup_curve2(char *cname)

+{

+    char *p;

+    p = strchr(cname, ']');

+    if (!p) {

+        fprintf(stderr, "Parse error: missing ]\n");

+        return NID_undef;

+    }

+    *p = 0;

+

+    if (!strcmp(cname, "B-163"))

+        return NID_sect163r2;

+    if (!strcmp(cname, "B-233"))

+        return NID_sect233r1;

+    if (!strcmp(cname, "B-283"))

+        return NID_sect283r1;

+    if (!strcmp(cname, "B-409"))

+        return NID_sect409r1;

+    if (!strcmp(cname, "B-571"))

+        return NID_sect571r1;

+    if (!strcmp(cname, "K-163"))

+        return NID_sect163k1;

+    if (!strcmp(cname, "K-233"))

+        return NID_sect233k1;

+    if (!strcmp(cname, "K-283"))

+        return NID_sect283k1;

+    if (!strcmp(cname, "K-409"))

+        return NID_sect409k1;

+    if (!strcmp(cname, "K-571"))

+        return NID_sect571k1;

+    if (!strcmp(cname, "P-192"))

+        return NID_X9_62_prime192v1;

+    if (!strcmp(cname, "P-224"))

+        return NID_secp224r1;

+    if (!strcmp(cname, "P-256"))

+        return NID_X9_62_prime256v1;

+    if (!strcmp(cname, "P-384"))

+        return NID_secp384r1;

+    if (!strcmp(cname, "P-521"))

+        return NID_secp521r1;

+

+    fprintf(stderr, "Unknown Curve name %s\n", cname);

+    return NID_undef;

+}

+

+static int lookup_curve(char *cname)

+{

+    char *p;

+    p = strchr(cname, ':');

+    if (!p) {

+        fprintf(stderr, "Parse error: missing :\n");

+        return NID_undef;

+    }

+    cname = p + 1;

+    while (isspace(*cname))

+        cname++;

+    return lookup_curve2(cname);

+}

+

+static EC_POINT *make_peer(EC_GROUP *group, BIGNUM *x, BIGNUM *y)

+{

+    EC_POINT *peer;

+    int rv;

+    BN_CTX *c;

+    peer = EC_POINT_new(group);

+    if (!peer)

+        return NULL;

+    c = BN_CTX_new();

+    if (EC_METHOD_get_field_type(EC_GROUP_method_of(group))

+        == NID_X9_62_prime_field)

+        rv = EC_POINT_set_affine_coordinates_GFp(group, peer, x, y, c);

+    else

+# ifdef OPENSSL_NO_EC2M

+    {

+        fprintf(stderr, "ERROR: GF2m not supported\n");

+        exit(1);

+    }

+# else

+        rv = EC_POINT_set_affine_coordinates_GF2m(group, peer, x, y, c);

+# endif

+

+    BN_CTX_free(c);

+    if (rv)

+        return peer;

+    EC_POINT_free(peer);

+    return NULL;

+}

+

+static int ec_print_key(FILE *out, EC_KEY *key, int add_e, int exout)

+{

+    const EC_POINT *pt;

+    const EC_GROUP *grp;

+    const EC_METHOD *meth;

+    int rv;

+    BIGNUM *tx, *ty;

+    const BIGNUM *d = NULL;

+    BN_CTX *ctx;

+    ctx = BN_CTX_new();

+    if (!ctx)

+        return 0;

+    tx = BN_CTX_get(ctx);

+    ty = BN_CTX_get(ctx);

+    if (!tx || !ty)

+        return 0;

+    grp = EC_KEY_get0_group(key);

+    pt = EC_KEY_get0_public_key(key);

+    if (exout)

+        d = EC_KEY_get0_private_key(key);

+    meth = EC_GROUP_method_of(grp);

+    if (EC_METHOD_get_field_type(meth) == NID_X9_62_prime_field)

+        rv = EC_POINT_get_affine_coordinates_GFp(grp, pt, tx, ty, ctx);

+    else

+# ifdef OPENSSL_NO_EC2M

+    {

+        fprintf(stderr, "ERROR: GF2m not supported\n");

+        exit(1);

+    }

+# else

+        rv = EC_POINT_get_affine_coordinates_GF2m(grp, pt, tx, ty, ctx);

+# endif

+

+    if (add_e) {

+        do_bn_print_name(out, "QeIUTx", tx);

+        do_bn_print_name(out, "QeIUTy", ty);

+        if (d)

+            do_bn_print_name(out, "QeIUTd", d);

+    } else {

+        do_bn_print_name(out, "QIUTx", tx);

+        do_bn_print_name(out, "QIUTy", ty);

+        if (d)

+            do_bn_print_name(out, "QIUTd", d);

+    }

+

+    BN_CTX_free(ctx);

+

+    return rv;

+

+}

+

+static void ec_output_Zhash(FILE *out, int exout, EC_GROUP *group,

+                            BIGNUM *ix, BIGNUM *iy, BIGNUM *id, BIGNUM *cx,

+                            BIGNUM *cy, const EVP_MD *md,

+                            unsigned char *rhash, size_t rhashlen)

+{

+    EC_KEY *ec = NULL;

+    EC_POINT *peerkey = NULL;

+    unsigned char *Z;

+    unsigned char chash[EVP_MAX_MD_SIZE];

+    int Zlen;

+    ec = EC_KEY_new();

+    EC_KEY_set_flags(ec, EC_FLAG_COFACTOR_ECDH);

+    EC_KEY_set_group(ec, group);

+    peerkey = make_peer(group, cx, cy);

+    if (rhash == NULL) {

+        if (md)

+            rhashlen = M_EVP_MD_size(md);

+        EC_KEY_generate_key(ec);

+        ec_print_key(out, ec, md ? 1 : 0, exout);

+    } else {

+        EC_KEY_set_public_key_affine_coordinates(ec, ix, iy);

+        EC_KEY_set_private_key(ec, id);

+    }

+    Zlen = (EC_GROUP_get_degree(group) + 7) / 8;

+    Z = OPENSSL_malloc(Zlen);

+    if (!Z)

+        exit(1);

+    ECDH_compute_key(Z, Zlen, peerkey, ec, 0);

+    if (md) {

+        if (exout)

+            OutputValue("Z", Z, Zlen, out, 0);

+        FIPS_digest(Z, Zlen, chash, NULL, md);

+        OutputValue(rhash ? "IUTHashZZ" : "HashZZ", chash, rhashlen, out, 0);

+        if (rhash) {

+            fprintf(out, "Result = %s\n",

+                    memcmp(chash, rhash, rhashlen) ? "F" : "P");

+        }

+    } else

+        OutputValue("ZIUT", Z, Zlen, out, 0);

+    OPENSSL_cleanse(Z, Zlen);

+    OPENSSL_free(Z);

+    EC_KEY_free(ec);

+    EC_POINT_free(peerkey);

+}

+

+# ifdef FIPS_ALGVS

+int fips_ecdhvs_main(int argc, char **argv)

+# else

+int main(int argc, char **argv)

+# endif

+{

+    char **args = argv + 1;