Commit 8857b380 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add ECDH to validated module.

parent a6de7133

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 


 Changes between 1.0.1 and 1.1.0  [xx XXX xxxx]



  *) Add ECDH code to fips module and fips_ecdhvs for primitives only testing.

     [Steve Henson]



  *) New algorithm test program fips_dhvs to handle DH primitives only testing.

     [Steve Henson]

Makefile.fips

+4 −2
Original line number Diff line number Diff line
@@ -148,13 +148,13 @@ SHLIBDIRS= crypto 
SDIRS=  \

	sha hmac des aes modes \

	bn ec rsa dsa ecdsa dh \

	buffer rand evp # ecdh cmac

	buffer rand evp ecdh # cmac

# keep in mind that the above list is adjusted by ./Configure

# according to no-xxx arguments...



LINKDIRS=  \

	objects sha hmac des aes modes \

	bn ec rsa dsa ecdsa dh ecdh engine \

	bn ec rsa dsa ecdh ecdsa dh engine \

	buffer bio stack lhash rand err \

	evp asn1 ui cmac
@@ -325,6 +325,8 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \ 
	../crypto/ec/ecp_smpl.o \

	../crypto/ec/ec2_mult.o \

	../crypto/ec/ec2_smpl.o \

	../crypto/ecdh/ech_key.o \

	../crypto/ecdh/ech_ossl.o \

	../crypto/ecdsa/ecs_ossl.o \

	../crypto/evp/e_aes.o \

	../crypto/evp/e_des3.o \

Makefile.org

+2 −0
Original line number Diff line number Diff line
@@ -319,6 +319,8 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \ 
	../crypto/ec/ecp_smpl.o \

	../crypto/ec/ec2_mult.o \

	../crypto/ec/ec2_smpl.o \

	../crypto/ecdh/ech_key.o \

	../crypto/ecdh/ech_ossl.o \

	../crypto/ecdsa/ecs_ossl.o \

	../crypto/evp/e_aes.o \

	../crypto/evp/e_des3.o \

crypto/ecdh/ech_key.c

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ 
 *

 */



#define OPENSSL_FIPSAPI



#include "ech_locl.h"

#ifndef OPENSSL_NO_ENGINE

#include <openssl/engine.h>

crypto/ecdh/ech_ossl.c

+13 −0
Original line number Diff line number Diff line
@@ -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