From 2bfeb7dc831f0bbe4ba6f9347f792a45d72d1e20 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Thu, 29 Sep 2011 23:08:23 +0000 Subject: [PATCH] Add FIPS selftests for ECDH algorithm. --- CHANGES | 3 + fips/Makefile | 2 +- fips/ecdh/Makefile | 4 +- fips/ecdh/fips_ecdh_selftest.c | 294 +++++++++++++++++++++++++++++++++ fips/fips.h | 3 + fips/fips_post.c | 2 + fips/fips_test_suite.c | 7 + 7 files changed, 312 insertions(+), 3 deletions(-) create mode 100644 fips/ecdh/fips_ecdh_selftest.c diff --git a/CHANGES b/CHANGES index cdd1dc15ed..7c87976bb5 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,9 @@ Changes between 1.0.1 and 1.1.0 [xx XXX xxxx] + *) Add FIPS selftest for ECDH algorithm using P-224 and B-233 curves. + [Steve Henson] + *) Use separate DRBG fields for internal and external flags. New function FIPS_drbg_health_check() to perform on demand health checking. Add generation tests to fips_test_suite with reduced health check interval to diff --git a/fips/Makefile b/fips/Makefile index 23191d40c8..ff296230c1 100644 --- a/fips/Makefile +++ b/fips/Makefile @@ -45,7 +45,7 @@ LIBSRC=fips.c fips_post.c LIBOBJ=fips.o fips_post.o FIPS_OBJ_LISTS=sha/lib hmac/lib rand/lib des/lib aes/lib dsa/lib rsa/lib \ - dh/lib utl/lib ecdsa/lib cmac/lib + dh/lib utl/lib ecdsa/lib ecdh/lib cmac/lib SRC= $(LIBSRC) diff --git a/fips/ecdh/Makefile b/fips/ecdh/Makefile index 54ca9358f3..2605e4a6a1 100644 --- a/fips/ecdh/Makefile +++ b/fips/ecdh/Makefile @@ -22,8 +22,8 @@ TEST= fips_ecdhvs.c APPS= LIB=$(TOP)/libcrypto.a -LIBSRC= -LIBOBJ= +LIBSRC= fips_ecdh_selftest.c +LIBOBJ= fips_ecdh_selftest.o SRC= $(LIBSRC) diff --git a/fips/ecdh/fips_ecdh_selftest.c b/fips/ecdh/fips_ecdh_selftest.c new file mode 100644 index 0000000000..70e24d326a --- /dev/null +++ b/fips/ecdh/fips_ecdh_selftest.c @@ -0,0 +1,294 @@ +/* fips/ecdh/fips_ecdh_selftest.c */ +/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL + * project 2011. + */ +/* ==================================================================== + * Copyright (c) 2011 The OpenSSL Project. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. All advertising materials mentioning features or use of this + * software must display the following acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" + * + * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * licensing@OpenSSL.org. + * + * 5. Products derived from this software may not be called "OpenSSL" + * nor may "OpenSSL" appear in their names without prior written + * permission of the OpenSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * ==================================================================== + * + */ + +#define OPENSSL_FIPSAPI + +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef OPENSSL_FIPS + +#include "fips_locl.h" + +__fips_constseg +static const unsigned char p224_qcavsx[] = { + 0x3c,0x81,0x15,0x16,0xab,0xa6,0xad,0xd7,0xe5,0xf3,0xea,0x1f, + 0x88,0x57,0x43,0x29,0x35,0x6f,0x0a,0xd2,0x38,0xc7,0x11,0x8a, + 0x90,0xd1,0x46,0x63 +}; +__fips_constseg +static const unsigned char p224_qcavsy[] = { + 0x4a,0x87,0x54,0x7b,0x7d,0x69,0xdd,0xb8,0x48,0x73,0xb2,0x1e, + 0x33,0xfa,0xf6,0x32,0xb4,0x25,0x73,0x55,0x87,0x08,0x16,0xd2, + 0xdd,0xa6,0x77,0xcf +}; +__fips_constseg +static const unsigned char p224_qiutx[] = { + 0x23,0xff,0x15,0x91,0x83,0xd6,0xad,0x98,0x93,0x98,0xbd,0x2e, + 0x01,0xeb,0x5a,0x45,0xe2,0x2a,0xf9,0xc5,0x3b,0x37,0xe1,0x87, + 0x32,0xa5,0x16,0x5f +}; +__fips_constseg +static const unsigned char p224_qiuty[] = { + 0x5e,0x70,0xb7,0x9d,0x9e,0x55,0x2d,0x67,0x4e,0x29,0xa4,0x9d, + 0x06,0x81,0x11,0xb4,0xb4,0xab,0xe2,0xdf,0xdc,0xe4,0xf1,0x69, + 0x55,0x54,0xe3,0x37 +}; +__fips_constseg +static const unsigned char p224_qiutd[] = { + 0xd7,0xdc,0x9c,0x53,0x04,0x72,0x67,0x59,0x92,0x80,0x9e,0x6f, + 0xdd,0xe6,0x0b,0x35,0x09,0xe0,0x95,0x45,0xe6,0x13,0x0e,0x22, + 0x43,0x6a,0x63,0xef +}; +__fips_constseg +static const unsigned char p224_ziut[] = { + 0x84,0x37,0xcf,0x6d,0xfa,0x58,0xbd,0x1f,0x47,0x15,0x45,0x1f, + 0x2c,0x20,0x53,0x7a,0xf4,0xb0,0xe6,0x19,0xcc,0xa9,0x30,0xc6, + 0x5c,0x1a,0xf2,0xdd +}; + +#ifndef OPENSSL_NO_EC2M +__fips_constseg +static const unsigned char b233_qcavsx[] = { + 0x00,0x00,0x01,0x2d,0x9a,0x82,0xfb,0x33,0xc2,0x53,0x10,0x97, + 0x27,0xd1,0xe4,0xd2,0x15,0xe3,0x9f,0x60,0xee,0x97,0xca,0xbf, + 0x2a,0x9f,0xb0,0x4a,0xd4,0xcf,0x14,0x73 +}; +__fips_constseg +static const unsigned char b233_qcavsy[] = { + 0x00,0x00,0x01,0xf7,0xd5,0x6e,0xbd,0x86,0x68,0xae,0xec,0x3b, + 0x2e,0x44,0x99,0x44,0x8d,0x4c,0x14,0x34,0xb8,0x37,0xa1,0x45, + 0xe7,0xc6,0x04,0xbd,0x7b,0x0b,0xa6,0x41 +}; +__fips_constseg +static const unsigned char b233_qiutx[] = { + 0x01,0x2b,0xfd,0x0c,0x9b,0x46,0x61,0xe9,0x4e,0x1f,0x97,0xa1, + 0x1d,0x1c,0x9b,0xc4,0xd3,0xfd,0xd0,0xb4,0xc9,0xfc,0xb3,0x34, + 0xc0,0x1f,0xf8,0x6a,0xec,0x56 +}; +__fips_constseg +static const unsigned char b233_qiuty[] = { + 0x01,0x5f,0xc3,0x77,0x7c,0xd9,0xa6,0xec,0xf3,0x19,0x70,0x96, + 0xc0,0xeb,0x2c,0xad,0xa3,0xba,0x39,0xb1,0x57,0x8d,0x62,0xdc, + 0xc7,0x87,0xde,0xa6,0x29,0xe4 +}; +__fips_constseg +static const unsigned char b233_qiutd[] = { + 0xed,0x50,0xf5,0x9c,0xf3,0x36,0xcb,0xa3,0x6d,0xe9,0x95,0x44, + 0xa2,0x87,0x0d,0xd8,0x3e,0x0e,0x4c,0x25,0x18,0x82,0x92,0xe6, + 0xca,0x90,0xff,0xa8,0x82 +}; +__fips_constseg +static const unsigned char b233_ziut[] = { + 0x00,0xe1,0x13,0x2d,0x94,0xef,0x03,0x79,0xc0,0xd1,0x5f,0xd9, + 0x2a,0xd3,0xfe,0x1c,0xfc,0x32,0x7e,0x0a,0x60,0xe6,0x23,0x1e, + 0xb0,0xfa,0x1b,0x9e,0x5a,0x8d +}; +#endif + +typedef struct + { + int curve; + const unsigned char *x1; + size_t x1len; + const unsigned char *y1; + size_t y1len; + const unsigned char *d1; + size_t d1len; + const unsigned char *x2; + size_t x2len; + const unsigned char *y2; + size_t y2len; + const unsigned char *z; + size_t zlen; + } ECDH_SELFTEST_DATA; + +#define make_ecdh_test(nid, pr) { nid, \ + pr##_qiutx, sizeof(pr##_qiutx), \ + pr##_qiuty, sizeof(pr##_qiuty), \ + pr##_qiutd, sizeof(pr##_qiutd), \ + pr##_qcavsx, sizeof(pr##_qcavsx), \ + pr##_qcavsy, sizeof(pr##_qcavsy), \ + pr##_ziut, sizeof(pr##_ziut) } + +static ECDH_SELFTEST_DATA test_ecdh_data[] = + { + make_ecdh_test(NID_secp224r1, p224), +#ifndef OPENSSL_NO_EC2M + make_ecdh_test(NID_sect233r1, b233) +#endif + }; + +int FIPS_selftest_ecdh(void) + { + EC_KEY *ec1 = NULL, *ec2 = NULL; + const EC_POINT *ecp = NULL; + BIGNUM *x = NULL, *y = NULL, *d = NULL; + unsigned char *ztmp = NULL; + int rv = 1; + size_t i; + + for (i = 0; i < sizeof(test_ecdh_data)/sizeof(ECDH_SELFTEST_DATA); i++) + { + ECDH_SELFTEST_DATA *ecd = test_ecdh_data + i; + if (!fips_post_started(FIPS_TEST_ECDH, ecd->curve, 0)) + continue; + ztmp = OPENSSL_malloc(ecd->zlen); + + x = BN_bin2bn(ecd->x1, ecd->x1len, x); + y = BN_bin2bn(ecd->y1, ecd->y1len, y); + d = BN_bin2bn(ecd->d1, ecd->d1len, d); + + if (!x || !y || !d || !ztmp) + { + rv = -1; + goto err; + } + + ec1 = EC_KEY_new_by_curve_name(ecd->curve); + if (!ec1) + { + rv = -1; + goto err; + } + + if (!EC_KEY_set_public_key_affine_coordinates(ec1, x, y)) + { + rv = -1; + goto err; + } + + if (!EC_KEY_set_private_key(ec1, d)) + { + rv = -1; + goto err; + } + + x = BN_bin2bn(ecd->x2, ecd->x2len, x); + y = BN_bin2bn(ecd->y2, ecd->y2len, y); + + if (!x || !y) + { + rv = -1; + goto err; + } + + ec2 = EC_KEY_new_by_curve_name(ecd->curve); + if (!ec2) + { + rv = -1; + goto err; + } + + if (!EC_KEY_set_public_key_affine_coordinates(ec2, x, y)) + { + rv = -1; + goto err; + } + + ecp = EC_KEY_get0_public_key(ec2); + if (!ecp) + { + rv = -1; + goto err; + } + + if (!ECDH_compute_key(ztmp, ecd->zlen, ecp, ec1, 0)) + { + rv = -1; + goto err; + } + + if (memcmp(ztmp, ecd->z, ecd->zlen)) + { + fips_post_failed(FIPS_TEST_ECDH, ecd->curve, 0); + rv = 0; + } + else if (!fips_post_success(FIPS_TEST_ECDH, ecd->curve, 0)) + goto err; + + EC_KEY_free(ec1); + ec1 = NULL; + EC_KEY_free(ec2); + ec2 = NULL; + OPENSSL_free(ztmp); + ztmp = NULL; + } + + err: + + if (x) + BN_clear_free(x); + if (y) + BN_clear_free(y); + if (d) + BN_clear_free(d); + if (ec1) + EC_KEY_free(ec1); + if (ec2) + EC_KEY_free(ec2); + if (ztmp) + OPENSSL_free(ztmp); + + return rv; + + } + +#endif diff --git a/fips/fips.h b/fips/fips.h index 27242f1599..7a079ef7ff 100644 --- a/fips/fips.h +++ b/fips/fips.h @@ -96,6 +96,7 @@ int FIPS_selftest_des(void); int FIPS_selftest_rsa(void); int FIPS_selftest_dsa(void); int FIPS_selftest_ecdsa(void); +int FIPS_selftest_ecdh(void); void FIPS_corrupt_drbg(void); void FIPS_x931_stick(void); void FIPS_drbg_stick(void); @@ -170,6 +171,8 @@ void FIPS_get_timevec(unsigned char *buf, unsigned long *pctr); #define FIPS_TEST_PAIRWISE 12 /* Continuous PRNG test */ #define FIPS_TEST_CONTINUOUS 13 +/* ECDH test */ +#define FIPS_TEST_ECDH 14 void FIPS_post_set_callback( int (*post_cb)(int op, int id, int subid, void *ex)); diff --git a/fips/fips_post.c b/fips/fips_post.c index 392bd5543b..e55ec08407 100644 --- a/fips/fips_post.c +++ b/fips/fips_post.c @@ -186,6 +186,8 @@ int FIPS_selftest(void) rv = 0; if (!FIPS_selftest_dsa()) rv = 0; + if (!FIPS_selftest_ecdh()) + rv = 0; fips_post_end(); return rv; } diff --git a/fips/fips_test_suite.c b/fips/fips_test_suite.c index 447d1088bd..c768de75eb 100644 --- a/fips/fips_test_suite.c +++ b/fips/fips_test_suite.c @@ -796,6 +796,8 @@ POST_ID id_list[] = { {NID_aes_256_xts, "AES-256-XTS"}, {NID_des_ede3_cbc, "DES-EDE3-CBC"}, {NID_des_ede3_ecb, "DES-EDE3-ECB"}, + {NID_secp224r1, "P-224"}, + {NID_sect233r1, "B-233"}, {NID_X9_62_prime256v1, "P-256"}, {NID_secp384r1, "P-384"}, {NID_secp521r1, "P-521"}, @@ -914,6 +916,11 @@ static int post_cb(int op, int id, int subid, void *ex) idstr = "Continuous PRNG"; break; + case FIPS_TEST_ECDH: + idstr = "ECDH"; + exstr = lookup_id(subid); + break; + default: idstr = "Unknown"; break; -- 2.25.1