From 8857b380e21b7140508cbcdd57abbcafdc658463 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Wed, 9 Mar 2011 23:44:06 +0000
Subject: Add ECDH to validated module.

---
 crypto/ecdh/ech_key.c  |  2 ++
 crypto/ecdh/ech_ossl.c | 13 +++++++++++++
 2 files changed, 15 insertions(+)

(limited to 'crypto/ecdh')

diff --git a/crypto/ecdh/ech_key.c b/crypto/ecdh/ech_key.c
index f44da9298b..52a4649dc6 100644
--- a/crypto/ecdh/ech_key.c
+++ b/crypto/ecdh/ech_key.c
@@ -67,6 +67,8 @@
  *
  */
 
+#define OPENSSL_FIPSAPI
+
 #include "ech_locl.h"
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
diff --git a/crypto/ecdh/ech_ossl.c b/crypto/ecdh/ech_ossl.c
index 4a30628fbc..ceaa2f06b6 100644
--- a/crypto/ecdh/ech_ossl.c
+++ b/crypto/ecdh/ech_ossl.c
@@ -67,6 +67,7 @@
  *
  */
 
+#define OPENSSL_FIPSAPI
 
 #include <string.h>
 #include <limits.h>
@@ -213,3 +214,15 @@ err:
 	if (buf) OPENSSL_free(buf);
 	return(ret);
 	}
+
+#ifdef OPENSSL_FIPSCANISTER
+/* FIPS stanadlone version of ecdh_check: just return FIPS method */
+ECDH_DATA *fips_ecdh_check(EC_KEY *key)
+	{
+	static ECDH_DATA rv = {
+		0,0,0,
+		&openssl_ecdh_meth
+		};
+	return &rv;
+	}
+#endif
-- 
cgit v1.2.3