From 38e3c5815c142e905f0a023d86c066283889cf4a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bodo=20M=C3=B6ller?= Date: Mon, 5 Mar 2001 20:31:49 +0000 Subject: [PATCH] Add yet another (still empty) source code file that I forgot. --- crypto/ec/Makefile.ssl | 7 +++-- crypto/ec/ec_cvt.c | 2 -- crypto/ec/ec_lcl.h | 2 ++ crypto/ec/ec_lib.c | 2 -- crypto/ec/ec_mult.c | 2 -- crypto/ec/ecp_mont.c | 2 -- crypto/ec/ecp_nist.c | 57 ++++++++++++++++++++++++++++++++++++ crypto/ec/ecp_recp.c | 2 -- crypto/ec/ecp_smpl.c | 2 -- crypto/objects/obj_dat.h | 10 +++---- crypto/rijndael/Makefile.ssl | 2 +- 11 files changed, 70 insertions(+), 20 deletions(-) create mode 100644 crypto/ec/ecp_nist.c diff --git a/crypto/ec/Makefile.ssl b/crypto/ec/Makefile.ssl index f3af851250..ac849d35a6 100644 --- a/crypto/ec/Makefile.ssl +++ b/crypto/ec/Makefile.ssl @@ -23,9 +23,9 @@ TEST=ectest.c APPS= LIB=$(TOP)/libcrypto.a -LIBSRC= ec_lib.c ecp_smpl.c ecp_mont.c ecp_recp.c ec_cvt.c ec_mult.c +LIBSRC= ec_lib.c ecp_smpl.c ecp_mont.c ecp_recp.c ecp_nist.c ec_cvt.c ec_mult.c -LIBOBJ= ec_lib.o ecp_smpl.o ecp_mont.o ecp_recp.o ec_cvt.o ec_mult.o +LIBOBJ= ec_lib.o ecp_smpl.o ecp_mont.o ecp_recp.o ecp_nist.o ec_cvt.o ec_mult.o SRC= $(LIBSRC) @@ -93,6 +93,9 @@ ec_mult.o: ec_lcl.h ec_mult.c ecp_mont.o: ../../include/openssl/bn.h ../../include/openssl/e_os2.h ecp_mont.o: ../../include/openssl/ec.h ../../include/openssl/opensslconf.h ecp_mont.o: ec_lcl.h ecp_mont.c +ecp_nist.o: ../../include/openssl/bn.h ../../include/openssl/e_os2.h +ecp_nist.o: ../../include/openssl/ec.h ../../include/openssl/opensslconf.h +ecp_nist.o: ec_lcl.h ecp_nist.c ecp_recp.o: ../../include/openssl/bn.h ../../include/openssl/e_os2.h ecp_recp.o: ../../include/openssl/ec.h ../../include/openssl/opensslconf.h ecp_recp.o: ec_lcl.h ecp_recp.c diff --git a/crypto/ec/ec_cvt.c b/crypto/ec/ec_cvt.c index 989f366053..be06d3d92f 100644 --- a/crypto/ec/ec_cvt.c +++ b/crypto/ec/ec_cvt.c @@ -54,6 +54,4 @@ * */ -#include - #include "ec_lcl.h" diff --git a/crypto/ec/ec_lcl.h b/crypto/ec/ec_lcl.h index 99809fb0e3..f1c414413e 100644 --- a/crypto/ec/ec_lcl.h +++ b/crypto/ec/ec_lcl.h @@ -53,3 +53,5 @@ * Hudson (tjh@cryptsoft.com). * */ + +#include diff --git a/crypto/ec/ec_lib.c b/crypto/ec/ec_lib.c index de6c8ab661..c218a8d130 100644 --- a/crypto/ec/ec_lib.c +++ b/crypto/ec/ec_lib.c @@ -54,6 +54,4 @@ * */ -#include - #include "ec_lcl.h" diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c index 88bd22ca31..d43bdc2ba5 100644 --- a/crypto/ec/ec_mult.c +++ b/crypto/ec/ec_mult.c @@ -54,6 +54,4 @@ * */ -#include - #include "ec_lcl.h" diff --git a/crypto/ec/ecp_mont.c b/crypto/ec/ecp_mont.c index bbc3c689dd..80476320b9 100644 --- a/crypto/ec/ecp_mont.c +++ b/crypto/ec/ecp_mont.c @@ -54,6 +54,4 @@ * */ -#include - #include "ec_lcl.h" diff --git a/crypto/ec/ecp_nist.c b/crypto/ec/ecp_nist.c new file mode 100644 index 0000000000..1ecab88f8e --- /dev/null +++ b/crypto/ec/ecp_nist.c @@ -0,0 +1,57 @@ +/* TODO */ +/* crypto/ec/ecp_nist.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). + * + */ + +#include "ec_lcl.h" diff --git a/crypto/ec/ecp_recp.c b/crypto/ec/ecp_recp.c index 89572875e0..1306b76f36 100644 --- a/crypto/ec/ecp_recp.c +++ b/crypto/ec/ecp_recp.c @@ -54,6 +54,4 @@ * */ -#include - #include "ec_lcl.h" diff --git a/crypto/ec/ecp_smpl.c b/crypto/ec/ecp_smpl.c index 30f1031b09..3d922ded13 100644 --- a/crypto/ec/ecp_smpl.c +++ b/crypto/ec/ecp_smpl.c @@ -54,6 +54,4 @@ * */ -#include - #include "ec_lcl.h" diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h index b39c141ae4..fd8c568895 100644 --- a/crypto/objects/obj_dat.h +++ b/crypto/objects/obj_dat.h @@ -1323,8 +1323,8 @@ static ASN1_OBJECT *sn_objs[NUM_SN]={ &(nid_objs[ 4]),/* "MD5" */ &(nid_objs[114]),/* "MD5-SHA1" */ &(nid_objs[95]),/* "MDC2" */ -&(nid_objs[393]),/* "NULL" */ &(nid_objs[118]),/* "NULL" */ +&(nid_objs[393]),/* "NULL" */ &(nid_objs[456]),/* "NULL" */ &(nid_objs[480]),/* "NULL" */ &(nid_objs[57]),/* "Netscape" */ @@ -1775,10 +1775,10 @@ static ASN1_OBJECT *ln_objs[NUM_LN]={ &(nid_objs[134]),/* "Microsoft Individual Code Signing" */ &(nid_objs[137]),/* "Microsoft Server Gated Crypto" */ &(nid_objs[136]),/* "Microsoft Trust List Signing" */ -&(nid_objs[480]),/* "NULL" */ +&(nid_objs[118]),/* "NULL" */ &(nid_objs[393]),/* "NULL" */ &(nid_objs[456]),/* "NULL" */ -&(nid_objs[118]),/* "NULL" */ +&(nid_objs[480]),/* "NULL" */ &(nid_objs[72]),/* "Netscape Base Url" */ &(nid_objs[76]),/* "Netscape CA Policy Url" */ &(nid_objs[74]),/* "Netscape CA Revocation Url" */ @@ -2548,9 +2548,9 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={ &(nid_objs[454]),/* OBJ_lastModifiedBy 0 9 2342 19200300 100 1 24 */ &(nid_objs[391]),/* OBJ_domainComponent 0 9 2342 19200300 100 1 25 */ &(nid_objs[455]),/* OBJ_aRecord 0 9 2342 19200300 100 1 26 */ -&(nid_objs[456]),/* OBJ_ 0 9 2342 19200300 100 1 27 */ -&(nid_objs[393]),/* OBJ_ 0 9 2342 19200300 100 1 27 */ &(nid_objs[118]),/* OBJ_ 0 9 2342 19200300 100 1 27 */ +&(nid_objs[393]),/* OBJ_ 0 9 2342 19200300 100 1 27 */ +&(nid_objs[456]),/* OBJ_ 0 9 2342 19200300 100 1 27 */ &(nid_objs[480]),/* OBJ_ 0 9 2342 19200300 100 1 27 */ &(nid_objs[457]),/* OBJ_mXRecord 0 9 2342 19200300 100 1 28 */ &(nid_objs[458]),/* OBJ_nSRecord 0 9 2342 19200300 100 1 29 */ diff --git a/crypto/rijndael/Makefile.ssl b/crypto/rijndael/Makefile.ssl index b467238310..ddc480e9d7 100644 --- a/crypto/rijndael/Makefile.ssl +++ b/crypto/rijndael/Makefile.ssl @@ -1,5 +1,5 @@ # -# SSLeay/crypto/blowfish/Makefile +# crypto/rijndael/Makefile # DIR= rijndael -- 2.25.1