Commit 57d07eb0 authored by Dmitry Belyavskiy's avatar Dmitry Belyavskiy
Browse files

Merge branch 'no_gost94_sig' into gost12_algs

Conflicts:
	Makefile
	e_gost_err.c
	e_gost_err.h
	gost2001.c
	gost94_keyx.c
	gost_ameth.c
	gost_asn1.c
	gost_eng.c
	gost_lcl.h
	gost_params.c
	gost_params.h
	gost_pmeth.c
	gost_sign.c
parents cba16944 02f99b2e
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment