[github-ci] Sync pyca workflow with master

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16340)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f4d0a005879f537302aaad03e36a191b9d7cef52..ad264ae8fb1faa9aeffd12ced6ebfb81d4e4a479 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -254,17 +254,13 @@ jobs:
     strategy:
       matrix:
         RUST:
-        - 1.51.0
+          - 1.51.0
         PYTHON:
-        - 3.9
+          - 3.9
     steps:
     - uses: actions/checkout@v2
       with:
         submodules: recursive
-    - name: package installs
-      run: |
-        sudo apt-get update
-        sudo apt-get -yq install python3-virtualenv virtualenv
     - name: Configure OpenSSL
       run: ./config --strict-warnings --debug enable-external-tests && perl configdata.pm --dump
     - name: make

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

diff --git a/test/recipes/95-test_external_pyca_data/cryptography.sh b/test/recipes/95-test_external_pyca_data/cryptography.sh
index e1616914a77f2f9e06238d559ab2fa0645dfbc46..303ba10be463dcba1c34fcb361e5425429616f08 100755 (executable)
--- a/test/recipes/95-test_external_pyca_data/cryptography.sh
+++ b/test/recipes/95-test_external_pyca_data/cryptography.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2017-2021 The OpenSSL Project Authors. All Rights Reserved.
 # Copyright (c) 2017, Oracle and/or its affiliates.  All rights reserved.
 #
 # Licensed under the OpenSSL license (the "License").  You may not use
@@ -12,6 +12,7 @@
 # OpenSSL external testing using the Python Cryptography module
 #
 set -e
+set -x
 
 O_EXE=`pwd`/$BLDTOP/apps
 O_BINC=`pwd`/$BLDTOP/include
@@ -35,30 +36,29 @@ echo "------------------------------------------------------------------"
 cd $SRCTOP
 
 # Create a python virtual env and activate
-rm -rf venv-pycrypto
-virtualenv venv-pycrypto
-. ./venv-pycrypto/bin/activate
+rm -rf venv-cryptography
+python -m venv venv-cryptography
+. ./venv-cryptography/bin/activate
 
 cd pyca-cryptography
 
 pip install .[test]
+pip install -e vectors
 
 echo "------------------------------------------------------------------"
 echo "Building cryptography"
 echo "------------------------------------------------------------------"
-python ./setup.py clean
-
-CFLAGS="-I$O_BINC -I$O_SINC -L$O_LIB" python ./setup.py build
+CFLAGS="-I$O_BINC -I$O_SINC -L$O_LIB" pip install .
 
 echo "------------------------------------------------------------------"
 echo "Running tests"
 echo "------------------------------------------------------------------"
 
-CFLAGS="-I$O_BINC -I$O_SINC -L$O_LIB" python ./setup.py test
+CFLAGS="-I$O_BINC -I$O_SINC -L$O_LIB" pytest -n auto tests --wycheproof-root=../wycheproof
 
 cd ../
 deactivate
-rm -rf venv-pycrypto
+rm -rf venv-cryptography
 
 exit 0