From 45e5f551acf65e1b2c36161e356637045cc5f793 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Mon, 24 Oct 2011 16:58:49 +0000 Subject: Prepare for RC2. --- README.FIPS | 2 +- fips/fips_locl.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.FIPS b/README.FIPS index cbd598c943..87253f6bfb 100644 --- a/README.FIPS +++ b/README.FIPS @@ -1,4 +1,4 @@ -Preliminary status and build information for FIPS module v2.0 rc1 +Preliminary status and build information for FIPS module v2.0 NB: if you are cross compiling you now need to use the latest "incore" script this can be found at util/incore in the tarballs. diff --git a/fips/fips_locl.h b/fips/fips_locl.h index 5af6c1f367..24743be6ab 100644 --- a/fips/fips_locl.h +++ b/fips/fips_locl.h @@ -67,8 +67,8 @@ int fips_post_failed(int id, int subid, void *ex); int fips_post_corrupt(int id, int subid, void *ex); int fips_post_status(void); -#define FIPS_MODULE_VERSION_NUMBER 0x20000001L -#define FIPS_MODULE_VERSION_TEXT "FIPS 2.0-rc1 unvalidated test module xx XXX xxxx" +#define FIPS_MODULE_VERSION_NUMBER 0x20000002L +#define FIPS_MODULE_VERSION_TEXT "FIPS 2.0-rc2-dev unvalidated test module xx XXX xxxx" #ifdef __cplusplus } -- cgit v1.2.3 From 9ab6d6813ec544a15f6aea3d4af83629fa1eb4e5 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Wed, 26 Oct 2011 16:46:20 +0000 Subject: PR: 2632 Submitted by: emmanuel.azencot@bull.net Reviewed by: steve Return -1 immediately if not affine coordinates as BN_CTX has not been set up. --- crypto/ec/ec2_smpl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/ec/ec2_smpl.c b/crypto/ec/ec2_smpl.c index f37347b5e1..9a9476f0c1 100644 --- a/crypto/ec/ec2_smpl.c +++ b/crypto/ec/ec2_smpl.c @@ -556,7 +556,7 @@ int ec_GF2m_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point, BN_ field_sqr = group->meth->field_sqr; /* only support affine coordinates */ - if (!point->Z_is_one) goto err; + if (!point->Z_is_one) return -1; if (ctx == NULL) { -- cgit v1.2.3