Commit 2d3d00dc authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Move ECDSA_SIG ASN.1 to crypto/ec 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 3475bc96

crypto/ec/ec_asn1.c

+11 −0
Original line number Diff line number Diff line
@@ -1302,3 +1302,14 @@ int i2o_ECPublicKey(EC_KEY *a, unsigned char **out) 
        *out += buf_len;

    return buf_len;

}



#include <openssl/ecdsa.h>



ASN1_SEQUENCE(ECDSA_SIG) = {

        ASN1_SIMPLE(ECDSA_SIG, r, CBIGNUM),

        ASN1_SIMPLE(ECDSA_SIG, s, CBIGNUM)

} static_ASN1_SEQUENCE_END(ECDSA_SIG)



DECLARE_ASN1_FUNCTIONS_const(ECDSA_SIG)

DECLARE_ASN1_ENCODE_FUNCTIONS_const(ECDSA_SIG, ECDSA_SIG)

IMPLEMENT_ASN1_FUNCTIONS_const(ECDSA_SIG)

crypto/ecdsa/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ CFLAGS= $(INCLUDES) $(CFLAG) 
GENERAL=Makefile



LIB=$(TOP)/libcrypto.a

LIBSRC=	ecs_lib.c ecs_asn1.c ecs_ossl.c ecs_sign.c ecs_vrf.c ecs_err.c

LIBSRC=	ecs_lib.c ecs_ossl.c ecs_sign.c ecs_vrf.c ecs_err.c



LIBOBJ=	ecs_lib.o ecs_asn1.o ecs_ossl.o ecs_sign.o ecs_vrf.o ecs_err.o

LIBOBJ=	ecs_lib.o ecs_ossl.o ecs_sign.o ecs_vrf.o ecs_err.o



SRC= $(LIBSRC)

crypto/ecdsa/ecs_asn1.c

deleted100644 → 0
+0 −67
Original line number Diff line number Diff line 
/* crypto/ecdsa/ecs_asn1.c */

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

 * Copyright (c) 2000-2002 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.

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

 *

 * This product includes cryptographic software written by Eric Young

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

 * Hudson (tjh@cryptsoft.com).

 *

 */



#include "ecs_locl.h"

#include <openssl/err.h>

#include <openssl/asn1t.h>



ASN1_SEQUENCE(ECDSA_SIG) = {

        ASN1_SIMPLE(ECDSA_SIG, r, CBIGNUM),

        ASN1_SIMPLE(ECDSA_SIG, s, CBIGNUM)

} static_ASN1_SEQUENCE_END(ECDSA_SIG)



DECLARE_ASN1_FUNCTIONS_const(ECDSA_SIG)

DECLARE_ASN1_ENCODE_FUNCTIONS_const(ECDSA_SIG, ECDSA_SIG)

IMPLEMENT_ASN1_FUNCTIONS_const(ECDSA_SIG)