]> wagner.pp.ru Git - openssl-gost/engine.git/commit
Merge branch 'gost89-cbc'
authorDmitry Belyavskiy <beldmit@gmail.com>
Tue, 6 Oct 2015 17:57:10 +0000 (20:57 +0300)
committerDmitry Belyavskiy <beldmit@gmail.com>
Tue, 6 Oct 2015 17:57:10 +0000 (20:57 +0300)
commitb13fa6d0cdd810841c3bbac1899f7a3b4083f23f
tree25a0abdd30c1cd23dbbafad2da4d41114d6e41cd
parent671a6236ffa2e92bc635db1429ed0d7ae8d3a959
parentb13c96e1cb59c1f8eebb981d55df83181f7faef6
Merge branch 'gost89-cbc'

Conflicts:
e_gost_err.h
e_gost_err.c
gost_crypt.c