Commit a8eda431 authored by Matt Caswell's avatar Matt Caswell
Browse files

Remove the GOST engine 

The GOST engine is now out of date and is removed by this commit. An up
to date GOST engine is now being maintained in an external repository.

See:
https://wiki.openssl.org/index.php/Binaries

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

CHANGES

+7 −0
Changes for CHANGES: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,13 @@ 


 Changes between 1.0.2e and 1.1.0  [xx XXX xxxx]



  *) The GOST engine was out of date and therefore it has been removed. An up

     to date GOST engine is now being maintained in an external repository.

     See: https://wiki.openssl.org/index.php/Binaries. Libssl still retains

     support for GOST ciphersuites (these are only activated if a GOST engine

     is present).

     [Matt Caswell]



  *) EGD is no longer supported by default; use enable-egd when

     configuring.

     [Ben Kaduk and Rich Salz]

Configure

+0 −1
Changes for Configure: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -1932,7 +1932,6 @@ while (<IN>) 
	$sdirs = 0 unless /\\$/;

        s/fips // if (/^DIRS=/ && !$fips);

        s/engines // if (/^DIRS=/ && $disabled{"engine"});

	s/ccgost// if (/^ENGDIRS=/ && $disabled{"gost"});

	s/^VERSION=.*/VERSION=$version/;

	s/^MAJOR=.*/MAJOR=$major/;

	s/^MINOR=.*/MINOR=$minor/;

Makefile.in

+1 −2
Changes for Makefile.in: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ FIPSCANLIB= 
BASEADDR=



DIRS=   crypto ssl engines apps test tools

ENGDIRS= ccgost

SHLIBDIRS= crypto ssl

INSTALL_SUBS= engines apps tools
@@ -212,7 +211,7 @@ BUILDENV= LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\ 
		AS='$(CC)' ASFLAG='$(CFLAG) -c'			\

		AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)'	\

		CROSS_COMPILE='$(CROSS_COMPILE)'	\

		PERL='$(PERL)' ENGDIRS='$(ENGDIRS)'		\

		PERL='$(PERL)'	\

		SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/$(LIBDIR)'	\

		INSTALL_PREFIX='$(INSTALL_PREFIX)'		\

		INSTALLTOP='$(INSTALLTOP)' OPENSSLDIR='$(OPENSSLDIR)'	\

crypto/engine/eng_all.c

+0 −3
Changes for crypto/engine/eng_all.c: 0 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -86,9 +86,6 @@ void ENGINE_load_builtin_engines(void) 
    ENGINE_load_padlock();

#  endif

# endif

# ifndef OPENSSL_NO_GOST

    ENGINE_load_gost();

# endif

# if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)

    ENGINE_load_capi();

# endif

engines/Makefile.in

+2 −16
Changes for engines/Makefile.in: 2 added lines, 16 removed lines.
Original line number Diff line number Diff line
@@ -12,12 +12,6 @@ INCLUDES= -I../include 
CFLAG=-g

MAKEFILE=	Makefile

AR=		ar r

ENGDIRS= ccgost



RECURSIVE_MAKE=	[ -z "$(ENGDIRS)" ] || for i in $(ENGDIRS) ; do \

		    (cd $$i && echo "making $$target in $(DIR)/$$i..." && \

		    $(MAKE) -e TOP=../.. DIR=$$i $$target ) || exit 1; \

		done;



ENGINES_ASM_OBJ=
@@ -60,7 +54,7 @@ ALL= $(GENERAL) $(SRC) $(HEADER) 
top:

	(cd ..; $(MAKE) DIRS=$(DIR) all)



all:	lib subdirs

all:	lib



lib:	$(LIBOBJ) $(TESTLIBOBJ)

	@if [ -n "$(SHARED_LIBS)" ]; then \
@@ -82,12 +76,8 @@ e_padlock-x86.s: asm/e_padlock-x86.pl 
e_padlock-x86_64.s:	asm/e_padlock-x86_64.pl

	$(PERL) asm/e_padlock-x86_64.pl $(PERLASM_SCHEME) > $@



subdirs:

	@target=all; $(RECURSIVE_MAKE)



files:

	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO

	@target=files; $(RECURSIVE_MAKE)



# XXXXX This currently only works on systems that use .so as suffix

# for shared libraries as well as for Cygwin which uses the
@@ -118,27 +108,23 @@ install: 
			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \

		done; \

	fi

	@target=install; $(RECURSIVE_MAKE)



errors:

	set -e; for l in $(LIBNAMES); do \

		$(PERL) ../util/mkerr.pl -conf e_$$l.ec \

			-nostatic -staticloader -write e_$$l.c; \

	done

	(cd ccgost; $(MAKE) PERL=$(PERL) errors)



update: local_depend

	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi

	@[ -z "$(THIS)" ] || (set -e; target=update; $(RECURSIVE_MAKE) )



depend: local_depend

	@if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi

	@[ -z "$(THIS)" ] || (set -e; target=depend; $(RECURSIVE_MAKE) )



local_depend:

	@[ -z "$(THIS)" ] || $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) $(TESTLIBSRC)



clean:

	rm -f *.s *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

	@target=clean; $(RECURSIVE_MAKE)



# DO NOT DELETE THIS LINE -- make depend depends on it.