Commit 926c41bd authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Updated version of gost engine.

parent 1182301c

engines/ccgost/Makefile

+254 −107
Original line number Diff line number Diff line 
# OPENSSL_DIR is a root directory of openssl sources

THISDIR?=$(shell perl -MCwd -e 'print getcwd')

OPENSSL_DIR?=$(THISDIR)/../openssl

ENGINE_ID?=gost

TESTSUITE_DIR?=$(THISDIR)/test-suite

FOR?=$(HOST)

CC=gcc

CFLAGS=-fPIC -g -Wall -I$(OPENSSL_DIR)/include

LDFLAGS=-g -L $(OPENSSL_DIR) -static-libgcc

ifeq "$(FOR)" "s64"

CFLAGS+=-m64

LDFLAGS+=-m64

endif

OS:=$(shell uname -s)

ifeq "$(OS)" "FreeBSD" 

LIBDIR:=$(shell LD_LIBRARY_PATH=$(OPENSSL_DIR) $(OPENSSL_DIR)/apps/openssl version -d|sed -e 's/^[^"]*"//' -e 's/".*$$//')/lib

LDFLAGS+=-rpath $(LIBDIR)

endif





ifeq "$(FOR)" "w32"

ENGINE_LIB?=$(ENGINE_ID)$(DLLSUFFIX)

DLLSUFFIX=.dll

EXESUFFIX=.exe

CFLAGS+=-mno-cygwin

LDFLAGS+=-mno-cygwin

ifeq "$(OS)" "Linux"

CC=i586-mingw32msvc-gcc

endif

LIBS=-lcrypto.dll 

else

ENGINE_LIB?=lib$(ENGINE_ID)$(DLLSUFFIX)

LIBS=-lcrypto 

DLLSUFFIX=.so

endif

export DLLSUFFIX

export EXESUFFIX

ifneq "$(FOR)" ""

export FOR

endif

CFLAGS+=$(DEBUG_FLAGS)

export ENGINE_LIB

ENG_SOURCES=md_gost.c  gost_crypt.c  gost_asn1.c ameth.c pmeth.c\

	gost_crypt.c gost_sign.c gost2001.c md_gost.c gost_crypt.c\

	engine.c gost94_keyx.c keywrap.c gost2001_keyx.c

all: $(ENGINE_LIB) openssl.cnf

buildtests:

$(ENGINE_LIB): e_gost_err.o engine.o ameth.o pmeth.o params.o md_gost.o gosthash.o gost89.o gost_sign.o gost_crypt.o  keywrap.o  gost2001.o gost94_keyx.o gost2001_keyx.o gost_asn1.o

	$(CC) $(LDFLAGS) -shared -o $@ $+ $(LIBS) $(LDFLAGS)

openssl.cnf: openssl.cnf.1 openssl.cnf.2

	cat $+ > $@

openssl.cnf.1:

	echo "openssl_conf = openssl_def" > $@

openssl.cnf.2:

	echo "[openssl_def]" > $@

	echo "engines = engine_section" >> $@

	echo "[engine_section]" >> $@

	echo "$(ENGINE_ID) = $(ENGINE_ID)_section" >> $@

	echo "[$(ENGINE_ID)_section]" >> $@

	echo "dynamic_path = $(THISDIR)/$(ENGINE_LIB)" >> $@

	echo "engine_id = $(ENGINE_ID)" >> $@

	echo "default_algorithms = ALL" >> $@

gosthash1.o: gosthash.c

	$(CC) -c $(CFLAGS) -o $@ -DOPENSSL_BUILD $+

gostsum: gostsum.o gosthash.o gost89.o

inttests: gosttest$(EXESUFFIX) etalon wraptest$(EXESUFFIX) etalon.wrap ectest$(EXESUFFIX) etalon.ec

	./gosttest${EXESUFFIX} > gost_test

	diff -uw gost_test etalon

	./wraptest$(EXESUFFIX) > wrap_test

	diff -uw wrap_test etalon.wrap

	./ectest$(EXESUFFIX) > ec_test 2>&1

	diff -uw ec_test etalon.ec

ectest$(EXESUFFIX): ectest.o gost2001_dbg.o gost_sign_dbg.o params.o e_gost_err.o

	$(CC) -o $@ $(LDFLAGS) $+ -lcrypto 

%_dbg.o: %.c	

	$(CC) -c $(CFLAGS) -DDEBUG_SIGN -DDEBUG_KEYS -o $@ $+

gosttest$(EXESUFFIX): gosttest.o gosthash.o gost89.o

	$(CC) $(LDFLAGS) -o $@ $+

wraptest$(EXESUFFIX): wraptest.c keywrap.c gost89.c 	

	$(CC) -DDEBUG_DH $(LDFLAGS) -o $@ $+

sign_ex: LOADLIBES=-lcrypto

sign_ex: sign_ex.o

clean:

	rm -f core gosttest gostsum *.o gost_test openssl.cnf* $(ENGINE_LIB)

	if [ -f t/Makefile ]; then $(MAKE) -C t clean; fi

	if [ -f $(TESTSUITE_DIR)/Makefile ]; then $(MAKE) -C $(TESTSUITE_DIR) clean; fi

e_gost_err.c e_gost_err.h: $(ENG_SOURCES) gost.ec e_gost_err.proto

	perl $(OPENSSL_DIR)/util/mkerr.pl -conf gost.ec -nostatic -debug -write $(ENG_SOURCES)

DIR=ccgost

TOP=../..

CC=cc

INCLUDES= -I../../include

CFLAG=-g

MAKEFILE= Makefile

AR= ar r

CFLAGS= $(INCLUDES) $(CFLAG)

LIB=$(TOP)/libcrypto.a



tests: openssl.cnf.2

	OPENSSL_DIR=$(OPENSSL_DIR) $(MAKE) -C $(TESTSUITE_DIR) CONFADD=$(THISDIR)/openssl.cnf.2

LIBSRC= gost2001.c gost2001_keyx.c gost89.c gost94_keyx.c gost_ameth.c gost_asn1.c gost_crypt.c gost_ctl.c gost_eng.c gosthash.c gost_keywrap.c gost_md.c gost_params.c gost_pmeth.c gost_sign.c



# depedencies

#

#

gost_sign.o: gost_sign.c sign.h paramset.h tools.h e_gost_err.h

LIBOBJ= e_gost_err.o gost2001_keyx.o gost2001.o gost89.o gost94_keyx.o gost_ameth.o gost_asn1.o gost_crypt.o gost_ctl.o gost_eng.o gosthash.o gost_keywrap.o gost_md.o gost_params.o gost_pmeth.o gost_sign.o



pmeth.o: pmeth.c meth.h pmeth.h sign.h paramset.h e_gost_err.h

SRC=$(LIBSRC)



ameth.o: ameth.c tools.h meth.h pmeth.h gost_asn1.h crypt.h e_gost_err.h paramset.h

LIBNAME=gost



keywrap.o: keywrap.c gost89.h keywrap.h

top: 

	(cd $(TOP); $(MAKE) DIRS=engines EDIRS=$(DIR) sub_all)



gost2001.o: gost2001.c tools.h sign.h paramset.h e_gost_err.h

all: lib



engine.o: engine.c md.h crypt.h meth.h e_gost_err.h

tags:

	ctags $(SRC)



gost89.o: gost89.c gost89.h

errors:

	$(PERL) ../../util/mkerr.pl -conf gost.ec -nostatic -debug -write $(SRC)



lib: $(LIBOBJ)

	if [ -n "$(SHARED_LIBS)" ]; then \

		$(MAKE) -f $(TOP)/Makefile.shared -e \

			LIBNAME=$(LIBNAME) \

			LIBEXTRAS='$(LIBOBJ)' \

			LIBDEPS='-L$(TOP) -lcrypto' \

			link_o.$(SHLIB_TARGET); \

	else \

		$(AR) $(LIB) $(LIBOBJ); \

	fi



install: 	

	[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...

	if [ -n "$(SHARED_LIBS)" ]; then \

		set -e; \

		echo installing $(LIBNAME); \

		if [ "$(PLATFORM)" != "Cygwin" ]; then \

			case "$(CFLAGS)" in \

			*DSO_BEOS*) sfx="so";; \

			*DSO_DLFCN*) sfx="so";; \

			*DSO_DL*) sfx="sl";; \

			*) sfx="bad";; \

			esac; \

			cp lib$(LIBNAME).$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$(LIBNAME).$$sfx.new; \

		else \

			sfx="so"; \

			cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$(LIBNAME).$$sfx.new; \

		fi; \

		chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$(LIBNAME).$$sfx.new; \

		mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$(LIBNAME).$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$(LIBNAME).$$sfx; \

	fi



links:



gost_asn1.o: gost_asn1.c gost_asn1.h

tests:



gost_crypt.o: gost_crypt.c crypt.h gost89.h e_gost_err.h gost_asn1.h

depend:

	@if [ -z "$(THIS)" ]; then \

	    $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; \

	else \

	    $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC); \

	fi



gosthash.o: gosthash.c gost89.h gosthash.h

files:



md_gost.o: md_gost.c md.h gosthash.h e_gost_err.h



params.o: params.c paramset.h



gost94_keyx.o: gost94_keyx.c  gost_asn1.h gost89.h gosthash.h crypt.h pmeth.h keywrap.h e_gost_err.h gostkeyx.h

lint:

	lint -DLINT $(INCLUDES) $(SRC)>fluff



gost2001_keyx.o: gost2001_keyx.c gost89.h gost_asn1.h e_gost_err.h keywrap.h crypt.h sign.h gostkeyx.h pmeth.h gosthash.h tools.h
 
dclean:

	$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

	mv -f Makefile.new $(MAKEFILE)



clean:

	rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff *.so *.sl *.dll



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



gost2001.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h

gost2001.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

gost2001.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

gost2001.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h

gost2001.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h

gost2001.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h

gost2001.o: ../../include/openssl/err.h ../../include/openssl/evp.h

gost2001.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h

gost2001.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

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

gost2001.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h

gost2001.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h

gost2001.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

gost2001.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h

gost2001.o: e_gost_err.h gost2001.c gost89.h gost_lcl.h gost_params.h

gost2001.o: gosthash.h

gost2001_keyx.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h

gost2001_keyx.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

gost2001_keyx.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

gost2001_keyx.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h

gost2001_keyx.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h

gost2001_keyx.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h

gost2001_keyx.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h

gost2001_keyx.o: ../../include/openssl/obj_mac.h

gost2001_keyx.o: ../../include/openssl/objects.h

gost2001_keyx.o: ../../include/openssl/opensslconf.h

gost2001_keyx.o: ../../include/openssl/opensslv.h

gost2001_keyx.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h

gost2001_keyx.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h

gost2001_keyx.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

gost2001_keyx.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h

gost2001_keyx.o: ../../include/openssl/x509_vfy.h e_gost_err.h gost2001_keyx.c

gost2001_keyx.o: gost89.h gost_keywrap.h gost_lcl.h gosthash.h

gost89.o: gost89.c gost89.h

gost94_keyx.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h

gost94_keyx.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

gost94_keyx.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

gost94_keyx.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h

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

gost94_keyx.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h

gost94_keyx.o: ../../include/openssl/engine.h ../../include/openssl/evp.h

gost94_keyx.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h

gost94_keyx.o: ../../include/openssl/objects.h

gost94_keyx.o: ../../include/openssl/opensslconf.h

gost94_keyx.o: ../../include/openssl/opensslv.h

gost94_keyx.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h

gost94_keyx.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h

gost94_keyx.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

gost94_keyx.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h

gost94_keyx.o: ../../include/openssl/x509_vfy.h e_gost_err.h gost89.h

gost94_keyx.o: gost94_keyx.c gost_keywrap.h gost_lcl.h gosthash.h

gost_ameth.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h

gost_ameth.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

gost_ameth.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

gost_ameth.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h

gost_ameth.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h

gost_ameth.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h

gost_ameth.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h

gost_ameth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h

gost_ameth.o: ../../include/openssl/opensslconf.h

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

gost_ameth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h

gost_ameth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

gost_ameth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h

gost_ameth.o: ../../include/openssl/x509_vfy.h e_gost_err.h gost89.h

gost_ameth.o: gost_ameth.c gost_lcl.h gost_params.h gosthash.h

gost_asn1.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h

gost_asn1.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

gost_asn1.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

gost_asn1.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h

gost_asn1.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h

gost_asn1.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h

gost_asn1.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h

gost_asn1.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h

gost_asn1.o: ../../include/openssl/opensslconf.h

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

gost_asn1.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h

gost_asn1.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

gost_asn1.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h

gost_asn1.o: ../../include/openssl/x509_vfy.h gost89.h gost_asn1.c gost_lcl.h

gost_asn1.o: gosthash.h

gost_crypt.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h

gost_crypt.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

gost_crypt.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

gost_crypt.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h

gost_crypt.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h

gost_crypt.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h

gost_crypt.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h

gost_crypt.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h

gost_crypt.o: ../../include/openssl/opensslconf.h

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

gost_crypt.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h

gost_crypt.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h

gost_crypt.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

gost_crypt.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h

gost_crypt.o: e_gost_err.h gost89.h gost_crypt.c gost_lcl.h gosthash.h

gost_ctl.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h

gost_ctl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

gost_ctl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

gost_ctl.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h

gost_ctl.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h

gost_ctl.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h

gost_ctl.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h

gost_ctl.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h

gost_ctl.o: ../../include/openssl/opensslconf.h

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

gost_ctl.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h

gost_ctl.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

gost_ctl.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h

gost_ctl.o: ../../include/openssl/x509_vfy.h gost89.h gost_ctl.c gost_lcl.h

gost_ctl.o: gosthash.h

gost_eng.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h

gost_eng.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

gost_eng.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

gost_eng.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h

gost_eng.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h

gost_eng.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h

gost_eng.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h

gost_eng.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h

gost_eng.o: ../../include/openssl/opensslconf.h

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

gost_eng.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h

gost_eng.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

gost_eng.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h

gost_eng.o: ../../include/openssl/x509_vfy.h e_gost_err.h gost89.h gost_eng.c

gost_eng.o: gost_lcl.h gosthash.h

gost_keywrap.o: gost89.h gost_keywrap.c gost_keywrap.h

gost_md.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h

gost_md.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

gost_md.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

gost_md.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h

gost_md.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h

gost_md.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h

gost_md.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h

gost_md.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h

gost_md.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h

gost_md.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h

gost_md.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h

gost_md.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

gost_md.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h

gost_md.o: e_gost_err.h gost89.h gost_lcl.h gost_md.c gosthash.h

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

gost_params.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h

gost_params.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h

gost_params.o: ../../include/openssl/opensslconf.h

gost_params.o: ../../include/openssl/opensslv.h

gost_params.o: ../../include/openssl/ossl_typ.h

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

gost_params.o: ../../include/openssl/symhacks.h gost_params.c gost_params.h

gost_pmeth.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h

gost_pmeth.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

gost_pmeth.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

gost_pmeth.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h

gost_pmeth.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h

gost_pmeth.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h

gost_pmeth.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h

gost_pmeth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h

gost_pmeth.o: ../../include/openssl/opensslconf.h

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

gost_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h

gost_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

gost_pmeth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h

gost_pmeth.o: ../../include/openssl/x509_vfy.h e_gost_err.h gost89.h gost_lcl.h

gost_pmeth.o: gost_params.h gost_pmeth.c gosthash.h

gost_sign.o: ../../include/openssl/asn1.h ../../include/openssl/asn1t.h

gost_sign.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

gost_sign.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h

gost_sign.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h

gost_sign.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h

gost_sign.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h

gost_sign.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h

gost_sign.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h

gost_sign.o: ../../include/openssl/opensslconf.h

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

gost_sign.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h

gost_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h

gost_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

gost_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h

gost_sign.o: e_gost_err.h gost89.h gost_lcl.h gost_params.h gost_sign.c

gost_sign.o: gosthash.h

gosthash.o: gost89.h gosthash.c gosthash.h

engines/ccgost/crypt.h

deleted100644 → 0
+0 −62
Original line number Diff line number Diff line 
/**********************************************************************

 *                        gost_crypt.h                                *

 *             Copyright (c) 2005-2006 Cryptocom LTD                  *

 *       This file is distributed under the same license as OpenSSL   *

 *                                                                    *

 *          Declarations for GOST 28147-89 encryption algorithm       *

 *            OpenSSL 0.9.9 libraries required                        *

 **********************************************************************/            

#ifndef GOST_CRYPT_H

#define GOST_CRYPT_H

#include <unistd.h>

#include <openssl/err.h>

#include <openssl/evp.h>

#include "gost89.h"

#ifdef __cplusplus

 extern "C" {

#endif

/* Cipher context used for EVP_CIPHER operation */

struct ossl_gost_cipher_ctx {

	int paramNID;

	off_t count;

	int key_meshing;

	gost_ctx cctx;

};	

/* Structure to map parameter NID to S-block */

struct gost_cipher_info {

	int nid;

	gost_subst_block *sblock;

	int key_meshing;

};

#ifdef USE_SSL

/* Context for MAC */

struct ossl_gost_imit_ctx {

	gost_ctx cctx;

	unsigned char buffer[8];

	unsigned char partial_block[8];

	off_t count;

	int key_meshing;

	int bytes_left;

	int key_set;

};	

#endif

/* Table which maps parameter NID to S-blocks */

extern struct gost_cipher_info gost_cipher_list[];

/* Find encryption params from ASN1_OBJECT */

const struct gost_cipher_info *get_encryption_params(ASN1_OBJECT *obj);

/* Implementation of GOST 28147-89 cipher in CFB and CNT modes */

extern EVP_CIPHER cipher_gost;

#ifdef USE_SSL

#define EVP_MD_FLAG_NEEDS_KEY 0x20

#define EVP_MD_CTRL_GET_TLS_MAC_KEY_LENGTH (EVP_MD_CTRL_ALG_CTRL+1)

#define EVP_MD_CTRL_SET_KEY (EVP_MD_CTRL_ALG_CTRL+2)

/* Ciphers and MACs specific for GOST TLS draft */

extern EVP_CIPHER cipher_gost_vizircfb;

extern EVP_CIPHER cipher_gost_cpacnt;

extern EVP_MD imit_gost_vizir;

extern EVP_MD imit_gost_cpa;

#endif

#ifdef __cplusplus

  };

#endif

#endif

engines/ccgost/gost2001.c

+123 −107
Original line number Diff line number Diff line
@@ -6,9 +6,8 @@ 
 *          Implementation of GOST R 34.10-2001      				  *

 *          Requires OpenSSL 0.9.9 for compilation                    *

 **********************************************************************/

#include "tools.h"

#include "sign.h"

#include "paramset.h"

#include "gost_lcl.h"

#include "gost_params.h"

#include <string.h>

#include <openssl/rand.h>

#include <openssl/ecdsa.h>
@@ -32,9 +31,10 @@ void dump_dsa_sig(const char *message, DSA_SIG *sig); 
 * Also fils DSA->q field with copy of EC_GROUP order field to make

 * DSA_size function work

 */ 

int fill_GOST2001_params(EC_KEY *eckey, int nid) {

int fill_GOST2001_params(EC_KEY *eckey, int nid)

	{

	R3410_2001_params *params = R3410_2001_paramset;

	EC_GROUP *grp;

	EC_GROUP *grp=NULL;

	BIGNUM *p=NULL,*q=NULL,*a=NULL,*b=NULL,*x=NULL,*y=NULL;

	EC_POINT *P=NULL;

	BN_CTX *ctx=BN_CTX_new();
@@ -48,7 +48,8 @@ int fill_GOST2001_params(EC_KEY *eckey, int nid) { 
	y=BN_CTX_get(ctx);

	q=BN_CTX_get(ctx);

	while (params->nid!=NID_undef && params->nid != nid) params++;

	if (params->nid == NID_undef) {

	if (params->nid == NID_undef)

		{

		GOSTerr(GOST_F_FILL_GOST2001_PARAMS,GOST_R_UNSUPPORTED_PARAMETER_SET);

		goto err;

		}
@@ -82,7 +83,6 @@ err: 
	BN_CTX_end(ctx);

	BN_CTX_free(ctx);

	return ok;

			

	}
@@ -91,7 +91,8 @@ err: 
 *

 *

 */ 

DSA_SIG *gost2001_do_sign(const unsigned char *dgst,int dlen, EC_KEY *eckey) {

DSA_SIG *gost2001_do_sign(const unsigned char *dgst,int dlen, EC_KEY *eckey)

	{

	DSA_SIG *newsig = NULL;

	BIGNUM *md = hashsum2bn(dgst);

	BIGNUM *order = NULL;
@@ -127,28 +128,33 @@ DSA_SIG *gost2001_do_sign(const unsigned char *dgst,int dlen, EC_KEY *eckey) { 
		}   

	k =BN_CTX_get(ctx);

	C=EC_POINT_new(group);

		do {

			do {

	do 

		{

		do 

			{

			if (!BN_rand_range(k,order)) 

				{

				GOSTerr(GOST_F_GOST2001_DO_SIGN,GOST_R_RANDOM_NUMBER_GENERATOR_FAILED);

				DSA_SIG_free(newsig);

				goto err;

				}	

				if (!EC_POINT_mul(group,C,k,NULL,NULL,ctx)) {

			if (!EC_POINT_mul(group,C,k,NULL,NULL,ctx))

				{

				GOSTerr(GOST_F_GOST2001_DO_SIGN,ERR_R_EC_LIB);

				DSA_SIG_free(newsig);

				goto err;

				}	

			if (!X) X=BN_CTX_get(ctx);

				if (!EC_POINT_get_affine_coordinates_GFp(group,C,X,NULL,ctx)) {

			if (!EC_POINT_get_affine_coordinates_GFp(group,C,X,NULL,ctx))

				{

				GOSTerr(GOST_F_GOST2001_DO_SIGN,ERR_R_EC_LIB);

				DSA_SIG_free(newsig);

				goto err;

				}	

			if (!r) r=BN_CTX_get(ctx);

			BN_nnmod(r,X,order,ctx);

			} while (BN_is_zero(r));

			}

		while (BN_is_zero(r));

		/* s =  (r*priv_key+k*e) mod order */

		if (!tmp) tmp = BN_CTX_get(ctx);

		BN_mod_mul(tmp,priv_key,r,order,ctx);
@@ -156,7 +162,8 @@ DSA_SIG *gost2001_do_sign(const unsigned char *dgst,int dlen, EC_KEY *eckey) { 
		BN_mod_mul(tmp2,k,e,order,ctx);

		if (!s) s=BN_CTX_get(ctx);

		BN_mod_add(s,tmp,tmp2,order,ctx);

		} while (BN_is_zero(s));	

		}

	while (BN_is_zero(s));	



	newsig->s=BN_dup(s);

	newsig->r=BN_dup(r);
@@ -172,7 +179,8 @@ err: 
 *

 */ 

int gost2001_do_verify(const unsigned char *dgst,int dgst_len,

			DSA_SIG *sig, EC_KEY *ec) {

	DSA_SIG *sig, EC_KEY *ec)

	{

	BN_CTX *ctx=BN_CTX_new();

	const EC_GROUP *group = EC_KEY_get0_group(ec);

	BIGNUM *order;
@@ -242,9 +250,12 @@ int gost2001_do_verify(const unsigned char *dgst,int dgst_len, 
	BN_print_fp(stderr,R);

	fprintf(stderr,"\n");

#endif	

	if (BN_cmp(R,sig->r)!=0) {

	if (BN_cmp(R,sig->r)!=0)

		{

		GOSTerr(GOST_F_GOST2001_DO_VERIFY,GOST_R_SIGNATURE_MISMATCH);

	} else {

		}

	else

		{

		ok = 1;

		}

	err:
@@ -267,7 +278,8 @@ int gost2001_compute_public(EC_KEY *ec) 
	BN_CTX *ctx=NULL;

	int ok=0;



	if (!group) {

	if (!group)

		{

		GOSTerr(GOST_F_GOST2001_COMPUTE_PUBLIC,GOST_R_KEY_IS_NOT_INITIALIZED);

		return 0;

		}
@@ -285,7 +297,8 @@ int gost2001_compute_public(EC_KEY *ec) 
		GOSTerr(GOST_F_GOST2001_COMPUTE_PUBLIC,ERR_R_EC_LIB);

		goto err;

		}	

	if (!EC_KEY_set_public_key(ec,pub_key)) {

	if (!EC_KEY_set_public_key(ec,pub_key))

		{

		GOSTerr(GOST_F_GOST2001_COMPUTE_PUBLIC,ERR_R_EC_LIB);

		goto err;

		}
@@ -302,12 +315,14 @@ err: 
 *

 *

 */ 

int gost2001_keygen(EC_KEY *ec) {

int gost2001_keygen(EC_KEY *ec)

	{

	BIGNUM *order = BN_new(),*d=BN_new();

	const EC_GROUP *group = EC_KEY_get0_group(ec);

	EC_GROUP_get_order(group,order,NULL);

	

	do {

	do 

		{

		if (!BN_rand_range(d,order)) 

			{

			GOSTerr(GOST_F_GOST2001_DO_SIGN,GOST_R_RANDOM_NUMBER_GENERATOR_FAILED);
@@ -315,7 +330,8 @@ int gost2001_keygen(EC_KEY *ec) { 
			BN_free(order);

			return 0;

			}	

	} while (BN_is_zero(d));

		}

	while (BN_is_zero(d));

	EC_KEY_set_private_key(ec,d);

	BN_free(d);

	BN_free(order);

engines/ccgost/gost2001_keyx.c

+125 −105

File changed.

Preview size limit exceeded, changes collapsed.

engines/ccgost/gost89.c

+150 −131

File changed.

Preview size limit exceeded, changes collapsed.