CI: add job with external tests

Update gost-engine submodule.
Update pyca-cryptography submodule.

Fix condition for skipping krb5 test.

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/14416)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 67ec2541b305bbd2f87f75c4c1e949acc216dcc1..f2fdacce2678110fd7666d6a907e5cd859659c33 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -166,3 +166,19 @@ jobs:
     - name: make install
       run: make install
       working-directory: ./build
+  external-tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: recursive
+    - name: package installs
+      run: |
+        sudo apt-get update
+        sudo apt-get -yq install bison dejagnu gettext keyutils ldap-utils libldap2-dev libkeyutils-dev python3 python3-paste python3-pyrad slapd tcl-dev tcsh python3-virtualenv virtualenv
+    - name: config
+      run: ./config --strict-warnings --debug no-afalgeng enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-zlib enable-ec_nistp_64_gcc_128 enable-external-tests && perl configdata.pm --dump
+    - name: make
+      run: make -s -j4
+    - name: make test
+      run: BORING_RUNNER_DIR=$(pwd)/boringssl/ssl/test/runner make test TESTS="test_external*"

diff --git a/gost-engine b/gost-engine
index b008f2a0ffa1797943c3d08c3b3eee31229a56d3..28a0a193549a9b778a14fade0219b9daa0e7c5db 160000 (submodule)
--- a/gost-engine
+++ b/gost-engine
@@ -1 +1 @@
-Subproject commit b008f2a0ffa1797943c3d08c3b3eee31229a56d3
+Subproject commit 28a0a193549a9b778a14fade0219b9daa0e7c5db

diff --git a/pyca-cryptography b/pyca-cryptography
index 09403100de2f6f1cdd0d484dcb8e620f1c335c8f..e09cd90f77a31832bdde1d3652c115be282cced9 160000 (submodule)
--- a/pyca-cryptography
+++ b/pyca-cryptography
@@ -1 +1 @@
-Subproject commit 09403100de2f6f1cdd0d484dcb8e620f1c335c8f
+Subproject commit e09cd90f77a31832bdde1d3652c115be282cced9

diff --git a/test/ossl_shim/include/openssl/base.h b/test/ossl_shim/include/openssl/base.h
index 92e3648e1cc8210a8019d2592ec27c48d57b0105..84918289c0491dca42f40f9d3baecc64cf84bc73 100644 (file)
--- a/test/ossl_shim/include/openssl/base.h
+++ b/test/ossl_shim/include/openssl/base.h
@@ -10,6 +10,9 @@
 #ifndef OSSL_TEST_SHIM_INCLUDE_OPENSSL_BASE_H
 #define OSSL_TEST_SHIM_INCLUDE_OPENSSL_BASE_H
 
+/* Needed for DH functions */
+#include "internal/deprecated.h"
+
 /* Needed for BORINGSSL_MAKE_DELETER */
 # include <openssl/bio.h>
 # include <openssl/evp.h>

diff --git a/test/recipes/95-test_external_krb5.t b/test/recipes/95-test_external_krb5.t
index ad262da2d999deaaa6a1c4c8fab35966186e96db..9d6824cb6fa932926d4831dd3007d66946d01fb8 100644 (file)
--- a/test/recipes/95-test_external_krb5.t
+++ b/test/recipes/95-test_external_krb5.t
@@ -17,7 +17,7 @@ setup("test_external_krb5");
 plan skip_all => "No external tests in this configuration"
     if disabled("external-tests");
 plan skip_all => "krb5 not available"
-    if ! -f srctop_file("krb5", "data.txt");
+    if ! -f srctop_file("krb5", "src", "configure.in");
 
 plan tests => 1;