From: Ilya Shipitsin <chipitsine@gmail.com>
Date: Wed, 27 Jun 2018 12:38:39 +0000 (+0500)
Subject: modernize ci:
X-Git-Tag: v3.0.0~417^2^2~1
X-Git-Url: http://wagner.pp.ru/gitweb/?a=commitdiff_plain;h=abf1f76739e89aeee17988a55c2375324f66c380;p=openssl-gost%2Fengine.git

modernize ci:

(*) convert 'openssl ciphers | grep ...' into Test:More syntax
(*) enable some tests on travis-ci (04 is yet broken)
---

diff --git a/.ci/build-check.sh b/.ci/build-check.sh
index e60045c..3e843f6 100755
--- a/.ci/build-check.sh
+++ b/.ci/build-check.sh
@@ -7,5 +7,8 @@ make
 cp ./bin/gost.so ${PREFIX}/lib/engines-1.1
 
 export LD_LIBRARY_PATH=${PREFIX}/lib
+export PATH=${PREFIX}/bin:${PATH}
+export OPENSSL_ENGINES=${PREFIX}/lib/engines-1.1
+
+prove -v test/{00-engine.t,01-digest.t,02-mac.t,03-encrypt.t}
 
-${PREFIX}/bin/openssl ciphers |grep GOST
diff --git a/.ci/build-openssl.sh b/.ci/build-openssl.sh
index 1e3064f..4c85b94 100755
--- a/.ci/build-openssl.sh
+++ b/.ci/build-openssl.sh
@@ -6,18 +6,3 @@ git clone -b ${OPENSSL_BRANCH} https://github.com/openssl/openssl.git
 cd openssl
 ./config shared --prefix=${PREFIX} --openssldir=${PREFIX}
 make all install_sw
-
-cat <<EOF >> ${PREFIX}/openssl.cnf
-openssl_conf = openssl_def
-
-[openssl_def]
-engines = engine_section
-
-[engine_section]
-gost = gost_section
-
-[gost_section]
-default_algorithms = ALL
-engine_id = gost
-CRYPT_PARAMS = id-Gost28147-89-CryptoPro-A-ParamSet
-EOF
diff --git a/test/00-engine.t b/test/00-engine.t
index a3d1037..9104ab0 100644
--- a/test/00-engine.t
+++ b/test/00-engine.t
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-use Test::More tests => 5;
+use Test::More tests => 7;
 use Cwd 'abs_path';
 
 # prepare data for 
@@ -80,5 +80,9 @@ is(`openssl dgst -engine $engine -md_gost94 testdata.dat`,
 "md_gost94(testdata.dat)= f7fc6d16a6a5c12ac4f7d320e0fd0d8354908699125e09727a4ef929122b1cae\n",
 "compute digest with both config and explicit engine param");
 
+like(`openssl ciphers`, qr|GOST2001-GOST89-GOST89|, 'display GOST2001-GOST89-GOST89 cipher');
+
+like(`openssl ciphers`, qr|GOST2012-GOST8912-GOST8912|, 'display GOST2012-GOST8912-GOST8912 cipher');
+
 unlink('testdata.dat');
 unlink('test.cnf');