Commit c2e40d0f authored by Nils Larsch's avatar Nils Larsch
Browse files

remove unused recp method

parent 0abfd606

crypto/ec/Makefile

+2 −9
Original line number Diff line number Diff line
@@ -23,11 +23,11 @@ TEST=ectest.c 
APPS=



LIB=$(TOP)/libcrypto.a

LIBSRC=	ec_lib.c ecp_smpl.c ecp_mont.c ecp_recp.c ecp_nist.c ec_cvt.c ec_mult.c\

LIBSRC=	ec_lib.c ecp_smpl.c ecp_mont.c ecp_nist.c ec_cvt.c ec_mult.c\

	ec_err.c ec_curve.c ec_check.c ec_print.c ec_asn1.c ec_key.c\

	ec2_smpl.c ec2_smpt.c ec2_mult.c



LIBOBJ=	ec_lib.o ecp_smpl.o ecp_mont.o ecp_recp.o ecp_nist.o ec_cvt.o ec_mult.o\

LIBOBJ=	ec_lib.o ecp_smpl.o ecp_mont.o ecp_nist.o ec_cvt.o ec_mult.o\

	ec_err.o ec_curve.o ec_check.o ec_print.o ec_asn1.o ec_key.o\

	ec2_smpl.o ec2_mult.o
@@ -187,13 +187,6 @@ ecp_nist.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h 
ecp_nist.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

ecp_nist.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

ecp_nist.o: ../../include/openssl/symhacks.h ec_lcl.h ecp_nist.c

ecp_recp.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

ecp_recp.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h

ecp_recp.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h

ecp_recp.o: ../../include/openssl/obj_mac.h ../../include/openssl/opensslconf.h

ecp_recp.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h

ecp_recp.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h

ecp_recp.o: ../../include/openssl/symhacks.h ec_lcl.h ecp_recp.c

ecp_smpl.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

ecp_smpl.o: ../../include/openssl/bn.h ../../include/openssl/crypto.h

ecp_smpl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h

crypto/ec/ec.h

+0 −3
Original line number Diff line number Diff line
@@ -123,9 +123,6 @@ typedef struct ec_point_st EC_POINT; 
const EC_METHOD *EC_GFp_simple_method(void);

const EC_METHOD *EC_GFp_mont_method(void);

const EC_METHOD *EC_GFp_nist_method(void);

#if 0

const EC_METHOD *EC_GFp_recp_method(void); /* TODO */

#endif



/* EC_METHOD for curves over GF(2^m).

 */

crypto/ec/ec_lcl.h

+0 −10
Original line number Diff line number Diff line
@@ -324,16 +324,6 @@ int ec_GFp_mont_field_decode(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CT 
int ec_GFp_mont_field_set_to_one(const EC_GROUP *, BIGNUM *r, BN_CTX *);





/* method functions in ecp_recp.c */

int ec_GFp_recp_group_init(EC_GROUP *);

int ec_GFp_recp_group_set_curve(EC_GROUP *, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *);

void ec_GFp_recp_group_finish(EC_GROUP *);

void ec_GFp_recp_group_clear_finish(EC_GROUP *);

int ec_GFp_recp_group_copy(EC_GROUP *, const EC_GROUP *);

int ec_GFp_recp_field_mul(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *);

int ec_GFp_recp_field_sqr(const EC_GROUP *, BIGNUM *r, const BIGNUM *a, BN_CTX *);





/* method functions in ecp_nist.c */

int ec_GFp_nist_group_copy(EC_GROUP *dest, const EC_GROUP *src);

int ec_GFp_nist_group_set_curve(EC_GROUP *, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *);

crypto/ec/ecp_recp.c

deleted100644 → 0
+0 −146
Original line number Diff line number Diff line 
/* crypto/ec/ecp_recp.c */

/* ====================================================================

 * Copyright (c) 1998-2001 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

 *    openssl-core@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.

 * ====================================================================

 *

 * This product includes cryptographic software written by Eric Young

 * (eay@cryptsoft.com).  This product includes software written by Tim

 * Hudson (tjh@cryptsoft.com).

 *

 */

/* ====================================================================

 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.

 * Portions of this software developed by SUN MICROSYSTEMS, INC.,

 * and contributed to the OpenSSL project.

 */



#include "ec_lcl.h"



#if 0

const EC_METHOD *EC_GFp_recp_method(void)

	{

	static const EC_METHOD ret = {

		ec_GFp_recp_group_init,

		ec_GFp_recp_group_finish,

		ec_GFp_recp_group_clear_finish,

		ec_GFp_recp_group_copy,

		ec_GFp_recp_group_set_curve,

		ec_GFp_simple_group_get_curve,

		ec_GFp_simple_group_get_degree,

		ec_GFp_simple_group_set_generator,

		ec_GFp_simple_group_get0_generator,

		ec_GFp_simple_group_get_order,

		ec_GFp_simple_group_get_cofactor,

		ec_GFp_simple_group_check_discriminant,

		ec_GFp_simple_point_init,

		ec_GFp_simple_point_finish,

		ec_GFp_simple_point_clear_finish,

		ec_GFp_simple_point_copy,

		ec_GFp_simple_point_set_to_infinity,

		ec_GFp_simple_set_Jprojective_coordinates_GFp,

		ec_GFp_simple_get_Jprojective_coordinates_GFp,

		ec_GFp_simple_point_set_affine_coordinates,

		ec_GFp_simple_point_get_affine_coordinates,

		ec_GFp_simple_set_compressed_coordinates,

		ec_GFp_simple_point2oct,

		ec_GFp_simple_oct2point,

		ec_GFp_simple_add,

		ec_GFp_simple_dbl,

		ec_GFp_simple_invert,

		ec_GFp_simple_is_at_infinity,

		ec_GFp_simple_is_on_curve,

		ec_GFp_simple_cmp,

		ec_GFp_simple_make_affine,

		ec_GFp_simple_points_make_affine,

		0 /* mul */,

		0 /* precompute_mult */,

		0 /* have_precompute_mult */,	

		ec_GFp_recp_field_mul,

		ec_GFp_recp_field_sqr,

		0 /* field_div */,

		0 /* field_encode */,

		0 /* field_decode */,

		0 /* field_set_to_one */ };



	return &ret;

	}

#endif



int ec_GFp_recp_group_init(EC_GROUP *group)

	{

	int ok;



	ok = ec_GFp_simple_group_init(group);

	group->field_data1 = NULL;

	return ok;

	}



/* Avoid "redundant redeclaration" warnings */

#if 0

int ec_GFp_recp_group_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);

/* TODO */





void ec_GFp_recp_group_finish(EC_GROUP *group);

/* TODO */





void ec_GFp_recp_group_clear_finish(EC_GROUP *group);

/* TODO */





int ec_GFp_recp_group_copy(EC_GROUP *dest, const EC_GROUP *src);

/* TODO */





int ec_GFp_recp_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, const BIGNUM *b, BN_CTX *ctx);

/* TODO */





int ec_GFp_recp_field_sqr(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a, BN_CTX *ctx);

/* TODO */

#endif