aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/ecdh
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2014-10-18 23:59:37 +0100
committerDr. Stephen Henson <steve@openssl.org>2014-12-08 13:25:16 +0000
commitc603c723ce0007c78b154096f1b2f67cea786389 (patch)
treeeffef648a4c113453011513d53f46a4590bf00f2 /crypto/ecdh
parent225fce8a9867c638fb208a3a8062e8202355999a (diff)
downloadopenssl-c603c723ce0007c78b154096f1b2f67cea786389.tar.gz
Remove OPENSSL_FIPSCANISTER code.
OPENSSL_FIPSCANISTER is only set if the fips module is being built (as opposed to being used). Since the fips module wont be built in master this is redundant. Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/ecdh')
-rw-r--r--crypto/ecdh/ech_ossl.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/crypto/ecdh/ech_ossl.c b/crypto/ecdh/ech_ossl.c
index 2656797449..e25fd4f1d3 100644
--- a/crypto/ecdh/ech_ossl.c
+++ b/crypto/ecdh/ech_ossl.c
@@ -234,15 +234,3 @@ 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