diff options
author | Nicola Tuveri <nic.tuv@gmail.com> | 2017-04-13 16:09:21 +0300 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2017-04-14 07:55:22 -0400 |
commit | a81c33ef65b4bd2a9c74c22c192c09972db77a52 (patch) | |
tree | f907d11ff03d9b69c6e83fa5455a505162352ebb /test | |
parent | 821d6c6d8132661b4fe2c2a44052330923bed68b (diff) |
Remove ecdhtest.c
All tests from ecdhtest.c have been ported to evptests.txt
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3219)
Diffstat (limited to 'test')
-rw-r--r-- | test/build.info | 6 | ||||
-rw-r--r-- | test/ecdhtest.c | 85 | ||||
-rw-r--r-- | test/recipes/15-test_ecdh.t | 12 |
3 files changed, 1 insertions, 102 deletions
diff --git a/test/build.info b/test/build.info index d946567080..2d290dfbd6 100644 --- a/test/build.info +++ b/test/build.info @@ -13,7 +13,7 @@ IF[{- !$disabled{tests} -}] PROGRAMS_NO_INST=\ aborttest test_test \ sanitytest exdatatest bntest \ - ectest ecdsatest ecdhtest gmdifftest pbelutest ideatest \ + ectest ecdsatest gmdifftest pbelutest ideatest \ md2test \ hmactest \ rc2test rc4test rc5test \ @@ -59,10 +59,6 @@ IF[{- !$disabled{tests} -}] INCLUDE[ecdsatest]=../include DEPEND[ecdsatest]=../libcrypto - SOURCE[ecdhtest]=ecdhtest.c - INCLUDE[ecdhtest]=../include - DEPEND[ecdhtest]=../libcrypto - SOURCE[gmdifftest]=gmdifftest.c testutil.c test_main.c INCLUDE[gmdifftest]=../include DEPEND[gmdifftest]=../libcrypto diff --git a/test/ecdhtest.c b/test/ecdhtest.c deleted file mode 100644 index 86d45af5fa..0000000000 --- a/test/ecdhtest.c +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. - * - * Licensed under the OpenSSL license (the "License"). You may not use - * this file except in compliance with the License. You can obtain a copy - * in the file LICENSE in the source distribution or at - * https://www.openssl.org/source/license.html - */ - -/* ==================================================================== - * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. - * - * The Elliptic Curve Public-Key Crypto Library (ECC Code) included - * herein is developed by SUN MICROSYSTEMS, INC., and is contributed - * to the OpenSSL project. - * - * The ECC Code is licensed pursuant to the OpenSSL open source - * license provided below. - * - * The ECDH software is originally written by Douglas Stebila of - * Sun Microsystems Laboratories. - * - */ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#include "../e_os.h" - -#include <openssl/opensslconf.h> /* for OPENSSL_NO_EC */ -#include <openssl/crypto.h> -#include <openssl/bio.h> -#include <openssl/bn.h> -#include <openssl/objects.h> -#include <openssl/rand.h> -#include <openssl/sha.h> -#include <openssl/err.h> - -#ifdef OPENSSL_NO_EC -int main(int argc, char *argv[]) -{ - printf("No ECDH support\n"); - return (0); -} -#else -# include <openssl/ec.h> - -static const char rnd_seed[] = - "string to make the random number generator think it has entropy"; - -int main(int argc, char *argv[]) -{ - int ret = 1; - BIO *out; - - CRYPTO_set_mem_debug(1); - CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); - - RAND_seed(rnd_seed, sizeof rnd_seed); - - out = BIO_new(BIO_s_file()); - if (out == NULL) - EXIT(1); - BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT); - - /* NAMED CURVES TESTS: moved to evptests.txt */ - - /* KATs: moved to evptests.txt */ - - /* NIST SP800-56A co-factor ECDH KATs: moved to evptests.txt */ - - ret = 0; - - err: - ERR_print_errors_fp(stderr); - BIO_free(out); - -#ifndef OPENSSL_NO_CRYPTO_MDEBUG - if (CRYPTO_mem_leaks_fp(stderr) <= 0) - ret = 1; -#endif - EXIT(ret); -} -#endif diff --git a/test/recipes/15-test_ecdh.t b/test/recipes/15-test_ecdh.t deleted file mode 100644 index f11cd06c9f..0000000000 --- a/test/recipes/15-test_ecdh.t +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env perl -# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved. -# -# Licensed under the OpenSSL license (the "License"). You may not use -# this file except in compliance with the License. You can obtain a copy -# in the file LICENSE in the source distribution or at -# https://www.openssl.org/source/license.html - - -use OpenSSL::Test::Simple; - -simple_test("test_ecdh", "ecdhtest", "ec"); |