Commit 6b6abd62 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Set flags in ECDH and ECDSA methods for FIPS.

parent 7eabad42

crypto/ecdh/ech_locl.h

+8 −0
Original line number Diff line number Diff line
@@ -75,6 +75,14 @@ struct ecdh_method 
	char *app_data;

	};



/* If this flag is set the ECDH method is FIPS compliant and can be used

 * in FIPS mode. This is set in the validated module method. If an

 * application sets this flag in its own methods it is its responsibility

 * to ensure the result is compliant.

 */



#define ECDH_FLAG_FIPS_METHOD	0x1



typedef struct ecdh_data_st {

	/* EC_KEY_METH_DATA part */

	int (*init)(EC_KEY *);

crypto/ecdh/ech_ossl.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static ECDH_METHOD openssl_ecdh_meth = { 
	NULL, /* init     */

	NULL, /* finish   */

#endif

	0,    /* flags    */

	ECDH_FLAG_FIPS_METHOD,    /* flags    */

	NULL  /* app_data */

};

crypto/ecdsa/ecs_locl.h

+8 −0
Original line number Diff line number Diff line
@@ -82,6 +82,14 @@ struct ecdsa_method 
	char *app_data;

	};



/* If this flag is set the ECDSA method is FIPS compliant and can be used

 * in FIPS mode. This is set in the validated module method. If an

 * application sets this flag in its own methods it is its responsibility

 * to ensure the result is compliant.

 */



#define ECDSA_FLAG_FIPS_METHOD	0x1



typedef struct ecdsa_data_st {

	/* EC_KEY_METH_DATA part */

	int (*init)(EC_KEY *);

crypto/ecdsa/ecs_ossl.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static ECDSA_METHOD openssl_ecdsa_meth = { 
	NULL, /* init     */

	NULL, /* finish   */

#endif

	0,    /* flags    */

	ECDSA_FLAG_FIPS_METHOD,    /* flags    */

	NULL  /* app_data */

};