]> www.wagner.pp.ru Git - openssl-gost/engine.git/commitdiff
Merge branch 'no_gost94_sig' into gost12_algs
authorDmitry Belyavskiy <beldmit@gmail.com>
Sat, 15 Aug 2015 11:29:47 +0000 (14:29 +0300)
committerDmitry Belyavskiy <beldmit@gmail.com>
Sat, 15 Aug 2015 11:29:47 +0000 (14:29 +0300)
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


No differences found