ecdsa => ec (d4a8f90c) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

apps/Makefile.ssl

+28 −28

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ SCRIPTS=CA.sh CA.pl der_chop
		EXE= $(PROGRAM)$(EXE_EXT)

		E_EXE= verify asn1pars req dgst dh dhparam enc passwd gendh errstr \
		ca crl rsa rsautl dsa dsaparam ecdsa ecparam \
		ca crl rsa rsautl dsa dsaparam ec ecparam \
		x509 genrsa gendsa s_server s_client speed \
		s_time version pkcs7 crl2pkcs7 sess_id ciphers nseq pkcs12 \
		pkcs8 spkac smime rand engine ocsp
		@@ -58,14 +58,14 @@ RAND_SRC=app_rand.c

		E_OBJ= verify.o asn1pars.o req.o dgst.o dh.o dhparam.o enc.o passwd.o gendh.o errstr.o \
		ca.o pkcs7.o crl2p7.o crl.o \
		rsa.o rsautl.o dsa.o dsaparam.o ecdsa.o ecparam.o \
		rsa.o rsautl.o dsa.o dsaparam.o ec.o ecparam.o \
		x509.o genrsa.o gendsa.o s_server.o s_client.o speed.o \
		s_time.o $(A_OBJ) $(S_OBJ) $(RAND_OBJ) version.o sess_id.o \
		ciphers.o nseq.o pkcs12.o pkcs8.o spkac.o smime.o rand.o engine.o ocsp.o

		E_SRC= verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c ca.c \
		pkcs7.c crl2p7.c crl.c \
		rsa.c rsautl.c dsa.c dsaparam.c ecdsa.c ecparam.c \
		rsa.c rsautl.c dsa.c dsaparam.c ec.c ecparam.c \
		x509.c genrsa.c gendsa.c s_server.c s_client.c speed.c \
		s_time.c $(A_SRC) $(S_SRC) $(RAND_SRC) version.c sess_id.c \
		ciphers.c nseq.c pkcs12.c pkcs8.c spkac.c smime.c rand.c engine.c ocsp.c
		@@ -437,31 +437,31 @@ dsaparam.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
		dsaparam.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
		dsaparam.o: ../include/openssl/ui_compat.h ../include/openssl/x509.h
		dsaparam.o: ../include/openssl/x509_vfy.h apps.h dsaparam.c
		ecdsa.o: ../e_os.h ../include/openssl/aes.h ../include/openssl/asn1.h
		ecdsa.o: ../include/openssl/bio.h ../include/openssl/blowfish.h
		ecdsa.o: ../include/openssl/bn.h ../include/openssl/buffer.h
		ecdsa.o: ../include/openssl/cast.h ../include/openssl/conf.h
		ecdsa.o: ../include/openssl/crypto.h ../include/openssl/des.h
		ecdsa.o: ../include/openssl/des_old.h ../include/openssl/dh.h
		ecdsa.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
		ecdsa.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
		ecdsa.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
		ecdsa.o: ../include/openssl/err.h ../include/openssl/evp.h
		ecdsa.o: ../include/openssl/idea.h ../include/openssl/lhash.h
		ecdsa.o: ../include/openssl/md2.h ../include/openssl/md4.h
		ecdsa.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
		ecdsa.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
		ecdsa.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
		ecdsa.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
		ecdsa.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
		ecdsa.o: ../include/openssl/rand.h ../include/openssl/rc2.h
		ecdsa.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
		ecdsa.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
		ecdsa.o: ../include/openssl/safestack.h ../include/openssl/sha.h
		ecdsa.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
		ecdsa.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
		ecdsa.o: ../include/openssl/ui_compat.h ../include/openssl/x509.h
		ecdsa.o: ../include/openssl/x509_vfy.h apps.h ecdsa.c
		ec.o: ../e_os.h ../include/openssl/aes.h ../include/openssl/asn1.h
		ec.o: ../include/openssl/bio.h ../include/openssl/blowfish.h
		ec.o: ../include/openssl/bn.h ../include/openssl/buffer.h
		ec.o: ../include/openssl/cast.h ../include/openssl/conf.h
		ec.o: ../include/openssl/crypto.h ../include/openssl/des.h
		ec.o: ../include/openssl/des_old.h ../include/openssl/dh.h
		ec.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
		ec.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
		ec.o: ../include/openssl/ecdsa.h ../include/openssl/engine.h
		ec.o: ../include/openssl/err.h ../include/openssl/evp.h
		ec.o: ../include/openssl/idea.h ../include/openssl/lhash.h
		ec.o: ../include/openssl/md2.h ../include/openssl/md4.h
		ec.o: ../include/openssl/md5.h ../include/openssl/mdc2.h
		ec.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
		ec.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
		ec.o: ../include/openssl/ossl_typ.h ../include/openssl/pem.h
		ec.o: ../include/openssl/pem2.h ../include/openssl/pkcs7.h
		ec.o: ../include/openssl/rand.h ../include/openssl/rc2.h
		ec.o: ../include/openssl/rc4.h ../include/openssl/rc5.h
		ec.o: ../include/openssl/ripemd.h ../include/openssl/rsa.h
		ec.o: ../include/openssl/safestack.h ../include/openssl/sha.h
		ec.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
		ec.o: ../include/openssl/txt_db.h ../include/openssl/ui.h
		ec.o: ../include/openssl/ui_compat.h ../include/openssl/x509.h
		ec.o: ../include/openssl/x509_vfy.h apps.h ec.c
		ecparam.o: ../e_os.h ../include/openssl/aes.h ../include/openssl/asn1.h
		ecparam.o: ../include/openssl/bio.h ../include/openssl/blowfish.h
		ecparam.o: ../include/openssl/bn.h ../include/openssl/buffer.h

apps/ecdsa.c→apps/ec.c

+7 −6

Original line number	Diff line number	Diff line
		/* apps/ecdsa.c */
		/* apps/ec.c */
		/*
		* Written by Nils Larsch for the OpenSSL project.
		*/
		/* ====================================================================
		* Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
		*
		@@ -53,7 +56,7 @@
		*
		*/

		#ifndef OPENSSL_NO_ECDSA
		#ifndef OPENSSL_NO_EC
		#include <stdio.h>
		#include <stdlib.h>
		#include <string.h>
		@@ -61,12 +64,10 @@
		#include <openssl/bio.h>
		#include <openssl/err.h>
		#include <openssl/evp.h>
		#include <openssl/ecdsa.h>
		#include <openssl/x509.h>
		#include <openssl/pem.h>

		#undef PROG
		#define PROG ecdsa_main
		#define PROG ec_main

		/* -inform arg - input format - default PEM (one of DER, NET or PEM)
		* -outform arg - output format - default PEM
		@@ -275,7 +276,7 @@ bad:
		}
		}

		BIO_printf(bio_err, "read ECDSA key\n");
		BIO_printf(bio_err, "read EC key\n");
		if (informat == FORMAT_ASN1)
		{
		if (pubin)

apps/makeapps.com

+2 −2

Original line number	Diff line number	Diff line
		@@ -155,13 +155,13 @@ $! Define The Application Files.
		$!
		$ LIB_FILES = "VERIFY;ASN1PARS;REQ;DGST;DH;DHPARAM;ENC;PASSWD;GENDH;ERRSTR;"+-
		"CA;PKCS7;CRL2P7;CRL;"+-
		"RSA;RSAUTL;DSA;DSAPARAM;ECDSA;ECPARAM;"+-
		"RSA;RSAUTL;DSA;DSAPARAM;EC;ECPARAM;"+-
		"X509;GENRSA;GENDSA;S_SERVER;S_CLIENT;SPEED;"+-
		"S_TIME;APPS;S_CB;S_SOCKET;APP_RAND;VERSION;SESS_ID;"+-
		"CIPHERS;NSEQ;PKCS12;PKCS8;SPKAC;SMIME;RAND;ENGINE;OCSP"
		$ APP_FILES := OPENSSL,'OBJ_DIR'VERIFY.OBJ,ASN1PARS.OBJ,REQ.OBJ,DGST.OBJ,DH.OBJ,DHPARAM.OBJ,ENC.OBJ,PASSWD.OBJ,GENDH.OBJ,ERRSTR.OBJ,-
		CA.OBJ,PKCS7.OBJ,CRL2P7.OBJ,CRL.OBJ,-
		RSA.OBJ,RSAUTL.OBJ,DSA.OBJ,DSAPARAM.OBJ,ECDSA.OBJ,ECPARAM.OBJ,-
		RSA.OBJ,RSAUTL.OBJ,DSA.OBJ,DSAPARAM.OBJ,EC.OBJ,ECPARAM.OBJ,-
		X509.OBJ,GENRSA.OBJ,GENDSA.OBJ,S_SERVER.OBJ,S_CLIENT.OBJ,SPEED.OBJ,-
		S_TIME.OBJ,APPS.OBJ,S_CB.OBJ,S_SOCKET.OBJ,APP_RAND.OBJ,VERSION.OBJ,SESS_ID.OBJ,-
		CIPHERS.OBJ,NSEQ.OBJ,PKCS12.OBJ,PKCS8.OBJ,SPKAC.OBJ,SMIME.OBJ,RAND.OBJ,ENGINE.OBJ,OCSP.OBJ

apps/progs.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@ extern int rsa_main(int argc,char *argv[]);
		extern int rsautl_main(int argc,char *argv[]);
		extern int dsa_main(int argc,char *argv[]);
		extern int dsaparam_main(int argc,char *argv[]);
		extern int ecdsa_main(int argc,char *argv[]);
		extern int ec_main(int argc,char *argv[]);
		extern int ecparam_main(int argc,char *argv[]);
		extern int x509_main(int argc,char *argv[]);
		extern int genrsa_main(int argc,char *argv[]);
		@@ -81,10 +81,10 @@ FUNCTION functions[] = {
		#ifndef OPENSSL_NO_DSA
		{FUNC_TYPE_GENERAL,"dsaparam",dsaparam_main},
		#endif
		#ifndef OPENSSL_NO_ECDSA
		{FUNC_TYPE_GENERAL,"ecdsa",ecdsa_main},
		#ifndef OPENSSL_NO_EC
		{FUNC_TYPE_GENERAL,"ec",ec_main},
		#endif
		#ifndef OPENSSL_NO_ECDSA
		#ifndef OPENSSL_NO_EC
		{FUNC_TYPE_GENERAL,"ecparam",ecparam_main},
		#endif
		{FUNC_TYPE_GENERAL,"x509",x509_main},

apps/progs.pl

+2 −2

Original line number	Diff line number	Diff line
		@@ -33,8 +33,8 @@ foreach (@ARGV)
		{ print "#ifndef OPENSSL_NO_RSA\n${str}#endif\n"; }
		elsif ( ($_ =~ /^dsa$/) \|\| ($_ =~ /^gendsa$/) \|\| ($_ =~ /^dsaparam$/))
		{ print "#ifndef OPENSSL_NO_DSA\n${str}#endif\n"; }
		elsif ( ($_ =~ /^ecdsa$/) \|\| ($_ =~ /^ecdsaparam$/))
		{ print "#ifndef OPENSSL_NO_ECDSA\n${str}#endif\n";}
		elsif ( ($_ =~ /^ec$/) \|\| ($_ =~ /^ecparam$/))
		{ print "#ifndef OPENSSL_NO_EC\n${str}#endif\n";}
		elsif ( ($_ =~ /^dh$/) \|\| ($_ =~ /^gendh$/) \|\| ($_ =~ /^dhparam$/))
		{ print "#ifndef OPENSSL_NO_DH\n${str}#endif\n"; }
		elsif ( ($_ =~ /^pkcs12$/))