Skip to content

Commit

Permalink
Fix typos and don't state chromium support is discontinued
Browse files Browse the repository at this point in the history
  • Loading branch information
bhess committed Jan 17, 2024
1 parent 8938369 commit 60abfd0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions nginx/fulltest/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ Note that, the oqs-nginx-{LIBOQS_VERSION}.tgz package contains all required conf

Execute `OPENSSL_CONF=/opt/openssl/.openssl/ssl/openssl.cnf /opt/nginx/sbin/nginx -c /opt/nginx/interop.conf` to start the test server.

*Note*: From nginx version 1.25.2, nginx does not try to load OpenSSL configuration if the --with-openssl option was used to built OpenSSL. We therefore have to set the `OPENSSL_CONF` environment variable when activating nginx.
*Note*: From nginx version 1.25.2, nginx does not try to load OpenSSL configuration if the --with-openssl option was used to build OpenSSL. We therefore have to set the `OPENSSL_CONF` environment variable when activating nginx.

*Note*: As the server many of ports, the server may need to be configured to permit this, e.g., using `ulimit -S -n 4096`.
*Note*: As the server may open many ports, the server may need to be configured to permit this, e.g., using `ulimit -S -n 4096`.

#### Test run

The `testrun.sh` script runs test connections against all ports configured by the server. To run the script, execute `testrun.sh openquantumsafe/curl`.
The `testrun.sh` script runs test connections against all ports configured by the server. To run the script, execute `testrun.sh openquantumsafe/curl:<version>`. The compatible `<version>` tag corresponds to `LIBOQS_VERSION` configured in the [Dockerfile](https://github.com/open-quantum-safe/oqs-demos/blob/main/nginx/fulltest/Dockerfile).
6 changes: 3 additions & 3 deletions nginx/fulltest/genconfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def write_nginx_config(f, i, cf, port, _sig, k):

# deactivate if you don't like tables:
i.write("<tr><td>"+sig+"</td><td>"+k+"</td><td>"+str(port)+"</td><td><a href=https://"+TESTFQDN+":"+str(port)+">"+sig+"/"+k+"</a></td></tr>\n")
# chromium support discontinued
# don't explicitly state Chromium compatibility
#if k in chromium_algs and not ("_" in sig and (sig.startswith("p") or (sig.startswith("rsa")))):
# cf.write("<tr><td>"+sig+"</td><td>"+k+"</td><td>"+str(port)+"</td><td><a href=https://"+TESTFQDN+":"+str(port)+">"+sig+"/"+k+"</a></td></tr>\n")

Expand All @@ -151,14 +151,14 @@ def gen_conf(filename, indexbasefilename, chromiumfilename):
port = STARTPORT
assignments={}
i = open(indexbasefilename, "w")
# chromium support discontinued
# don't explicitly state Chromium compatibility
cf = None
#cf = open(chromiumfilename, "w")
# copy baseline templates
with open(TEMPLATE_FILE, "r") as tf:
for line in tf:
i.write(line)
#chromium support discontinued
# don't explicitly state Chromium compatibility
#with open(CHROMIUM_TEMPLATE_FILE, "r") as ctf:
# for line in ctf:
# cf.write(line)
Expand Down

0 comments on commit 60abfd0

Please sign in to comment.