]> wagner.pp.ru Git - openssl-gost/engine.git/commit
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)
commit57d07eb0dc22bee10aebb0bd37cbdf2258413564
treeb2884d55439cee09a5259facd0a182e4789b998d
parentcba16944bff9d8c5dcf37be641822cd3de6d2ec1
parent02f99b2e3b46f4ff44fd5420487551d5a447c2ad
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
15 files changed:
Makefile
e_gost_err.c
e_gost_err.h
gost_ameth.c
gost_crypt.c
gost_ctl.c
gost_ec_keyx.c
gost_ec_sign.c
gost_eng.c
gost_lcl.h
gost_md2012.c
gost_params.c
gost_pmeth.c
gosthash.c
gosthash2012.c