Merge branch 'open-quantum-safe:main' into main

CONFIGURE.md

@@ -110,8 +110,8 @@ code deficiencies related to providers in such old OpenSSL branches.
 
 This defines the branch of `liboqs` against which `oqs-provider` is built.
 This can be used, for example, to facilitate a release of `oqsprovider`
-to track an old/stable `liboqs` release.
-Default is "main" (most current code).
+to track an old/stable `liboqs` release. If this variable is not set, the
+"main" branch is built.
 
 ### liboqs_DIR
 
@@ -120,11 +120,6 @@ used from the directory specified in this variable: Both `include`
 and `lib` directories must be present in that location.
 By not setting this variable, `liboqs` is build from source.
 
-### LIBOQS_BRANCH
-
-If set, this environment variable designates the `liboqs` branch to
-be built. If this variable is not set, the "main" branch is built.
-
 ### MAKE_PARAMS
 
 This environment variable permits passing parameters to the `make`

scripts/oqsprovider-externalinterop.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -e 
+
+# Use newly built oqsprovider to test interop with external sites
+
+if [ -z "$OPENSSL_APP" ]; then
+    echo "OPENSSL_APP env var not set. Exiting."
+    exit 1
+fi
+
+if [ -z "$OPENSSL_MODULES" ]; then
+    echo "Warning: OPENSSL_MODULES env var not set."
+fi
+
+# Set OSX DYLD_LIBRARY_PATH if not already externally set
+if [ -z "$DYLD_LIBRARY_PATH" ]; then
+    export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
+fi
+
+echo " Cloudflare:"
+export OQS_CODEPOINT_X25519_KYBER512=65072
+(echo -e "GET /cdn-cgi/trace HTTP/1.1\nHost: cloudflare.com\n\n"; sleep 1; echo $'\cc') | $OPENSSL_APP s_client -connect pq.cloudflareresearch.com:443 -groups x25519_kyber768 -servername cloudflare.com -ign_eof 2>/dev/null | grep kex=X25519Kyber768Draft00
+(echo -e "GET /cdn-cgi/trace HTTP/1.1\nHost: cloudflare.com\n\n"; sleep 1; echo $'\cc') | $OPENSSL_APP s_client -connect pq.cloudflareresearch.com:443 -groups x25519_kyber512 -servername cloudflare.com -ign_eof 2>/dev/null | grep kex=X25519Kyber512Draft00
+
+

scripts/runtests.sh

@@ -180,6 +180,10 @@ fi
 
 echo
 
+# Run interop tests with external sites
+echo "External interop tests commencing"
+${OQS_PROVIDER_TESTSCRIPTS}/oqsprovider-externalinterop.sh
+
 # Run built-in tests:
 # Without removing OPENSSL_CONF ctest hangs... ???
 unset OPENSSL_CONF