missed cleanup

.circleci/config.yml

@@ -319,7 +319,6 @@ jobs:
                   docker tag oqs-haproxy-img $TARGETNAME/haproxy:latest &&
                   docker push $TARGETNAME/haproxy:latest 
 
-# Not actively maintained:
   ubuntu_x64_openvpn:
     description: Building OQS-based OpenVPN docker image
     docker:
@@ -335,10 +334,20 @@ jobs:
           name: Authenticate to Docker
           command: echo $DOCKER_PASSWORD | docker login --username $DOCKER_LOGIN
             --password-stdin
+      - run:
+          name: Build OpenVPN (main/master)
+          command: |
+            docker build --build-arg MAKE_DEFINES="-j 18" --build-arg OPENSSL_TAG=master --build-arg LIBOQS_TAG=main --build-arg OQSPROVIDER_TAG=main --build-arg OPENVPN_TAG=master -t oqs-openvpn . 
+          working_directory: openvpn
+      - run:
+          name: Test OpenVPN using local docker network (main/master)
+          command: |
+            ./test.sh dilithium5 p521_kyber1024
+          working_directory: openvpn
       - run:
           name: Build OpenVPN
           command: |
-            docker build --build-arg MAKE_DEFINES="-j 18" -t oqs-openvpn . 
+            docker build --build-arg MAKE_DEFINES="-j 18" -t oqs-openvpn .
           working_directory: openvpn
       - run:
           name: Test OpenVPN using local docker network
@@ -650,8 +659,8 @@ workflows:
           context: openquantumsafe
       #- ubuntu_x64_haproxy:
       #    context: openquantumsafe
-      #- ubuntu_x64_openvpn:
-      #    context: openquantumsafe
+      - ubuntu_x64_openvpn:
+         context: openquantumsafe
       #- ubuntu_x64_mosquitto:
       #    context: openquantumsafe
       - ubuntu_x64_ngtcp2:

epiphany/README.md

@@ -5,7 +5,7 @@ This demo is based on work done by [Igor Barshteyn](https://www.linkedin.com/pul
 ## Quick start
 
 1) Be sure to have [docker installed](https://docs.docker.com/install).
-2) Run `docker build -t openquantumsafe/epiphany .` to create a QSC-enabled epiphany docker image.
+2) Run `docker build -t oqs-epiphany .` to create a QSC-enabled epiphany docker image.
 
 ## Usage
 

openvpn/README.md

@@ -7,7 +7,7 @@ This directory contains a Dockerfile that builds [OpenVPN](https://openvpn.net)
 [Install Docker](https://docs.docker.com/install) and run the following commands in this directory:
 
 1. `docker build -t oqs-openvpn .` 
-2. `./test.sh`
+2. `sh ./test.sh`
 
 This will create an image for creating configurations, keys and certificates as well as running openvpn server(s) and client(s) within a docker network performing a quantum-safe key exchange via the Kyber768 (plain and hybrid) KEM algorithm. Any of the other [supported quantum safe KEM algorithms](https://github.com/open-quantum-safe/oqs-provider#algorithms) can be set via the parameter `--tls-groups` in the server and client startup scripts, e.g., by setting the "TLS_GROUPS" environment variable.