Commit a81c33ef authored by Nicola Tuveri's avatar Nicola Tuveri Committed by Rich Salz
Browse files

Remove ecdhtest.c 



All tests from ecdhtest.c have been ported to evptests.txt

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3219)
parent 821d6c6d

test/build.info

+1 −5
Original line number Diff line number Diff line
@@ -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

test/ecdhtest.c

deleted100644 → 0
+0 −85
Original line number Diff line number Diff line 
/*

 * 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

test/recipes/15-test_ecdh.t

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
#! /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");