chore: add contributor to readme and fix ci (#305)

* add contributor to README

Signed-off-by: Michael Lodder <redmike7@gmail.com>

* fix install OpenSSL

Signed-off-by: Michael Lodder <redmike7@gmail.com>

* fix Dilithium missing bug

Signed-off-by: Michael Lodder <redmike7@gmail.com>

* find OPENSSL dir

Signed-off-by: Michael Lodder <redmike7@gmail.com>

---------

Signed-off-by: Michael Lodder <redmike7@gmail.com>

Author: mikelodder7

.github/workflows/ci.yml

@@ -46,9 +46,33 @@ jobs:
         if: startsWith(matrix.os, 'windows')
         run: echo "LIBCLANG_PATH=$((gcm clang).source -replace "clang.exe")" >> $env:GITHUB_ENV
 
+      - name: Install OpenSSL
+        if: startsWith(matrix.os, 'windows')
+        run: |
+          if (-not (Test-Path "C:/Program Files/OpenSSL")) {
+            if (Get-Command choco -ErrorAction SilentlyContinue) {
+              choco install openssl -y
+            } elseif (Get-Command winget -ErrorAction SilentlyContinue) {
+              winget install --id ShiningLight.OpenSSL --accept-source-agreements --accept-package-agreements
+            } else {
+              throw "Neither choco nor winget found to install OpenSSL"
+            }
+          }
+
       - name: Set OPENSSL_ROOT_DIR
         if: startsWith(matrix.os, 'windows')
-        run: echo "OPENSSL_ROOT_DIR=C:/Program Files/OpenSSL" >> $env:GITHUB_ENV
+        run: |
+          $opensslRoot = "C:/Program Files/OpenSSL"
+          echo "OPENSSL_ROOT_DIR=$opensslRoot" >> $env:GITHUB_ENV
+          # Find the actual library directory (Chocolatey puts it in lib/VC/x64/MD or similar)
+          $libcrypto = Get-ChildItem -Path $opensslRoot -Recurse -Filter "libcrypto.lib" -ErrorAction SilentlyContinue | Select-Object -First 1
+          if ($libcrypto) {
+            $libDir = $libcrypto.DirectoryName
+            echo "OPENSSL_LIB_DIR=$libDir" >> $env:GITHUB_ENV
+            echo "Found OpenSSL lib at: $libDir"
+          } else {
+            echo "Warning: libcrypto.lib not found under $opensslRoot"
+          }
 
       - name: Set OPENSSL_ROOT_DIR
         if: startsWith(matrix.os, 'macos')

README.md

@@ -170,6 +170,10 @@ The Open Quantum Safe project is led by [Douglas Stebila](https://www.douglas.st
 
 liboqs-rust was developed by [Thom Wiggers](https://thomwiggers.nl) at Radboud University.
 
+Contributors to this repo include:
+
+- Mike Lodder (Tectonic Labs)
+
 ### Support
 
 Financial support for the development of Open Quantum Safe has been provided by Amazon Web Services and the Canadian Centre for Cyber Security.

oqs-sys/Cargo.toml

@@ -41,9 +41,8 @@ kyber = []
 ml_kem = []
 ntruprime = []
 # algorithms: Signature schemes
-sigs = ["cross", "dilithium", "falcon", "mayo", "ml_dsa", "sphincs", "uov"]
+sigs = ["cross", "falcon", "mayo", "ml_dsa", "sphincs", "uov"]
 cross = []
-dilithium = []
 falcon = []
 mayo = []
 ml_dsa = []

oqs-sys/build.rs

@@ -76,7 +76,6 @@ fn build_from_source() -> PathBuf {
 
     // signature schemes
     algorithm_feature!("SIG", "cross");
-    algorithm_feature!("SIG", "dilithium");
     algorithm_feature!("SIG", "falcon");
     algorithm_feature!("SIG", "mayo");
     algorithm_feature!("SIG", "ml_dsa");
@@ -112,7 +111,11 @@ fn build_from_source() -> PathBuf {
         config.define("OPENSSL_ROOT_DIR", vendored_openssl_root);
     } else if cfg!(feature = "openssl") {
         println!("cargo:rerun-if-env-changed=OPENSSL_ROOT_DIR");
-        if let Ok(dir) = std::env::var("OPENSSL_ROOT_DIR") {
+        println!("cargo:rerun-if-env-changed=OPENSSL_LIB_DIR");
+        // OPENSSL_LIB_DIR takes precedence if set (useful for Windows where libs are in subdirs)
+        if let Ok(dir) = std::env::var("OPENSSL_LIB_DIR") {
+            println!("cargo:rustc-link-search={}", dir);
+        } else if let Ok(dir) = std::env::var("OPENSSL_ROOT_DIR") {
             let dir = Path::new(&dir).join("lib");
             println!("cargo:rustc-link-search={}", dir.display());
         } else if cfg!(target_os = "windows") || cfg!(target_os = "macos") {

oqs/Cargo.toml

@@ -36,9 +36,8 @@ kyber = ["oqs-sys/kyber"]
 ml_kem = ["oqs-sys/ml_kem"]
 ntruprime = ["oqs-sys/ntruprime"]
 # algorithms: Signature schemes
-sigs = ["oqs-sys/sigs", "cross", "dilithium", "falcon", "mayo", "ml_dsa", "sphincs", "uov"]
+sigs = ["oqs-sys/sigs", "cross", "falcon", "mayo", "ml_dsa", "sphincs", "uov"]
 cross = ["oqs-sys/cross"]
-dilithium = ["oqs-sys/dilithium"]
 falcon = ["oqs-sys/falcon"]
 mayo = ["oqs-sys/mayo"]
 ml_dsa = ["oqs-sys/ml_dsa"]

oqs/src/sig.rs

@@ -202,9 +202,6 @@ implement_sigs! {
     ("cross") CrossRsdpg256Balanced: OQS_SIG_alg_cross_rsdpg_256_balanced,
     ("cross") CrossRsdpg256Fast: OQS_SIG_alg_cross_rsdpg_256_fast,
     ("cross") CrossRsdpg256Small: OQS_SIG_alg_cross_rsdpg_256_small,
-    ("dilithium") Dilithium2: OQS_SIG_alg_dilithium_2,
-    ("dilithium") Dilithium3: OQS_SIG_alg_dilithium_3,
-    ("dilithium") Dilithium5: OQS_SIG_alg_dilithium_5,
     ("falcon") Falcon512: OQS_SIG_alg_falcon_512,
     ("falcon") Falcon1024: OQS_SIG_alg_falcon_1024,
     ("mayo") Mayo1: OQS_SIG_alg_mayo_1,