feat: update to liboqs 0.13.0 (#281)

* Bump versions

Signed-off-by: Spencer Wilson <spencer.wilson@uwaterloo.ca>

* Expose OQS_randombytes in oqs-sys

Signed-off-by: Spencer Wilson <spencer.wilson@uwaterloo.ca>

* Expose keypair_derand KEM API

Signed-off-by: Spencer Wilson <spencer.wilson@uwaterloo.ca>

* Switch example in README to standards

Signed-off-by: Spencer Wilson <spencer.wilson@uwaterloo.ca>

* Add UOV

Signed-off-by: Spencer Wilson <spencer.wilson@uwaterloo.ca>

* Update submodule to 0.13.0

Signed-off-by: Spencer Wilson <spencer.wilson@uwaterloo.ca>

* chore: update CHANGELOG for release

Signed-off-by: Spencer Wilson <spencer.wilson@uwaterloo.ca>

---------

Signed-off-by: Spencer Wilson <spencer.wilson@uwaterloo.ca>

Author: SWilson4

CHANGELOG.md

@@ -1,3 +1,10 @@
+## v0.11.0 (2025-05-01)
+
+- Sync with liboqs 0.13.0.
+  - New algorithms: UOV (NIST Additional Signatures Round 2).
+  - Updated algorithms: CROSS (Additional Signatures Round 2), MAYO (Additional Signatures Round 2).
+  - New API for derandomized key generation with a seed.
+
 ## v0.10.1 (2025-01-29)
 
 - Add a `vendored-openssl` feature. (#275)

README.md

@@ -110,6 +110,7 @@ tests.
   - `mayo`
   - `ml_dsa`
   - `sphincs`: SPHINCS<sup>+</sup>
+  - `uov`
 
 ## Running
 
@@ -119,8 +120,8 @@ tests.
 ///
 use oqs::*;
 fn main() -> Result<()> {
-    let sigalg = sig::Sig::new(sig::Algorithm::Dilithium2)?;
-    let kemalg = kem::Kem::new(kem::Algorithm::Kyber512)?;
+    let sigalg = sig::Sig::new(sig::Algorithm::MlDsa44)?;
+    let kemalg = kem::Kem::new(kem::Algorithm::MlKem512)?;
     // A's long-term secrets
     let (a_sig_pk, a_sig_sk) = sigalg.keypair()?;
     // B's long-term secrets

oqs-sys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "oqs-sys"
-version = "0.10.1+liboqs-0.12.0"
+version = "0.11.0+liboqs-0.13.0"
 authors = ["Thom Wiggers <thom@thomwiggers.nl>"]
 edition = "2021"
 links = "oqs"
@@ -41,13 +41,14 @@ kyber = []
 ml_kem = []
 ntruprime = []
 # algorithms: Signature schemes
-sigs = ["cross", "dilithium", "falcon", "mayo", "ml_dsa", "sphincs"]
+sigs = ["cross", "dilithium", "falcon", "mayo", "ml_dsa", "sphincs", "uov"]
 cross = []
 dilithium = []
 falcon = []
 mayo = []
 ml_dsa = []
 sphincs = []
+uov = []
 
 [package.metadata.docs.rs]
 features = ["docs"]

oqs-sys/README.md

@@ -25,6 +25,7 @@ This crate provides the unsafe `ffi` bindings to [liboqs][].
     * `mayo`
     * `ml_dsa`
     * `sphincs`: SPHINCS+
+    * `uov`
 
 [oqs]: https://openquantumsafe.org
 [liboqs]: https://github.com/Open-Quantum-Safe/liboqs

oqs-sys/build.rs

@@ -81,6 +81,7 @@ fn build_from_source() -> PathBuf {
     algorithm_feature!("SIG", "mayo");
     algorithm_feature!("SIG", "ml_dsa");
     algorithm_feature!("SIG", "sphincs");
+    algorithm_feature!("SIG", "uov");
 
     if cfg!(windows) {
         // Select the latest available Windows SDK
@@ -207,7 +208,7 @@ fn main() {
     };
 
     gen_bindings("common", "OQS_.*", "");
-    gen_bindings("rand", "OQS_(randombytes|RAND)_.*", "");
+    gen_bindings("rand", "OQS_(randombytes|RAND).*", "");
     gen_bindings("kem", "OQS_KEM.*", "");
     gen_bindings("sig", "OQS_SIG.*", "OQS_SIG_STFL.*");
 

oqs-sys/liboqs

@@ -1,6 +1,6 @@
 [package]
 name = "oqs"
-version = "0.10.1"
+version = "0.11.0"
 authors = ["Thom Wiggers <thom@thomwiggers.nl>"]
 edition = "2021"
 description = "A Rusty interface to Open-Quantum-Safe's liboqs"
@@ -16,7 +16,7 @@ serde = { version = "1.0", optional = true, default-features = false, features =
 
 [dependencies.oqs-sys]
 path = "../oqs-sys"
-version = "0.10.1"
+version = "0.11.0"
 default-features = false
 
 [features]
@@ -36,10 +36,11 @@ 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"]
+sigs = ["oqs-sys/sigs", "cross", "dilithium", "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"]
 sphincs = ["oqs-sys/sphincs"]
+uov = ["oqs-sys/uov"]

oqs/Cargo.toml

@@ -30,3 +30,4 @@ For the ``ffi`` interface bindings, see ``oqs-sys``.
   * `mayo`
   * `ml_dsa`
   * `sphincs`: SPHINCS+
+  * `uov`

oqs/README.md

@@ -22,6 +22,7 @@ newtype_buffer!(PublicKey, PublicKeyRef);
 newtype_buffer!(SecretKey, SecretKeyRef);
 newtype_buffer!(Ciphertext, CiphertextRef);
 newtype_buffer!(SharedSecret, SharedSecretRef);
+newtype_buffer!(KeypairSeed, KeypairSeedRef);
 
 macro_rules! implement_kems {
     { $(($feat: literal) $kem: ident: $oqs_id: ident),* $(,)? } => (
@@ -69,6 +70,36 @@ macro_rules! implement_kems {
                     Ok(())
                 }
 
+                #[test]
+                #[cfg(feature = $feat)]
+                fn test_encaps_decaps_derand() -> Result<()> {
+                    use crate::ffi::rand::OQS_randombytes;
+                    crate::init();
+
+                    let alg = Algorithm::$kem;
+                    let kem = Kem::new(alg)?;
+                    let mut seed = KeypairSeed {
+                        bytes: Vec::with_capacity(kem.length_keypair_seed()),
+                    };
+                    unsafe {
+                        // On some systems, getentropy fails if given a zero-length array
+                        if (kem.length_keypair_seed() > 0) {
+                            OQS_randombytes(seed.bytes.as_mut_ptr(), kem.length_keypair_seed());
+                        }
+                        seed.bytes.set_len(kem.length_keypair_seed());
+                    }
+                    let result = kem.keypair_derand(&seed);
+                    // expect Error::Error for KEMs with this API disabled
+                    if (kem.length_keypair_seed() == 0) {
+                        return result.map_or_else(|e| { match e { Error::Error => Ok(()), _ => Err(Error::Error) } }, |_| Err(Error::Error));
+                    }
+                    let (pk, sk) = result?;
+                    let (ct, ss1) = kem.encapsulate(&pk)?;
+                    let ss2 = kem.decapsulate(&sk, &ct)?;
+                    assert_eq!(ss1, ss2, "shared secret not equal!");
+                    Ok(())
+                }
+
                 #[test]
                 fn test_enabled() {
                     crate::init();
@@ -270,6 +301,12 @@ impl Kem {
         kem.length_shared_secret
     }
 
+    /// Get the length of a keypair seed
+    pub fn length_keypair_seed(&self) -> usize {
+        let kem = unsafe { self.kem.as_ref() };
+        kem.length_keypair_seed
+    }
+
     /// Obtain a secret key objects from bytes
     ///
     /// Returns None if the secret key is not the correct length.
@@ -314,6 +351,17 @@ impl Kem {
         }
     }
 
+    /// Obtain a keypair seed from bytes
+    ///
+    /// Returns None if the shared secret is not the correct length.
+    pub fn keypair_seed_from_bytes<'a>(&self, buf: &'a [u8]) -> Option<KeypairSeedRef<'a>> {
+        if self.length_keypair_seed() != buf.len() {
+            None
+        } else {
+            Some(KeypairSeedRef::new(buf))
+        }
+    }
+
     /// Generate a new keypair
     pub fn keypair(&self) -> Result<(PublicKey, SecretKey)> {
         let kem = unsafe { self.kem.as_ref() };
@@ -335,6 +383,40 @@ impl Kem {
         Ok((pk, sk))
     }
 
+    /// Generate a new keypair from a seed
+    pub fn keypair_derand<'a, S: Into<KeypairSeedRef<'a>>>(
+        &self,
+        seed: S,
+    ) -> Result<(PublicKey, SecretKey)> {
+        let seed = seed.into();
+        if seed.bytes.len() != self.length_keypair_seed() {
+            return Err(Error::InvalidLength);
+        }
+        let kem = unsafe { self.kem.as_ref() };
+        let func = kem.keypair_derand.unwrap();
+        let mut pk = PublicKey {
+            bytes: Vec::with_capacity(kem.length_public_key),
+        };
+        let mut sk = SecretKey {
+            bytes: Vec::with_capacity(kem.length_secret_key),
+        };
+        let status = unsafe {
+            func(
+                pk.bytes.as_mut_ptr(),
+                sk.bytes.as_mut_ptr(),
+                seed.bytes.as_ptr(),
+            )
+        };
+        status_to_result(status)?;
+        // update the lengths of the vecs
+        // this is safe to do, as we have initialised them now.
+        unsafe {
+            pk.bytes.set_len(kem.length_public_key);
+            sk.bytes.set_len(kem.length_secret_key);
+        }
+        Ok((pk, sk))
+    }
+
     /// Encapsulate to the provided public key
     pub fn encapsulate<'a, P: Into<PublicKeyRef<'a>>>(
         &self,

oqs/src/kem.rs

@@ -205,6 +205,18 @@ implement_sigs! {
     ("sphincs") SphincsShake192sSimple: OQS_SIG_alg_sphincs_shake_192s_simple,
     ("sphincs") SphincsShake256fSimple: OQS_SIG_alg_sphincs_shake_256f_simple,
     ("sphincs") SphincsShake256sSimple: OQS_SIG_alg_sphincs_shake_256s_simple,
+    ("uov") UovOvIs: OQS_SIG_alg_uov_ov_Is,
+    ("uov") UovOvIp: OQS_SIG_alg_uov_ov_Ip,
+    ("uov") UovOvIII: OQS_SIG_alg_uov_ov_III,
+    ("uov") UovOvV: OQS_SIG_alg_uov_ov_V,
+    ("uov") UovOvIsPkc: OQS_SIG_alg_uov_ov_Is_pkc,
+    ("uov") UovOvIpPkc: OQS_SIG_alg_uov_ov_Ip_pkc,
+    ("uov") UovOvIIIPkc: OQS_SIG_alg_uov_ov_III_pkc,
+    ("uov") UovOvVPkc: OQS_SIG_alg_uov_ov_V_pkc,
+    ("uov") UovOvIsPkcSkc: OQS_SIG_alg_uov_ov_Is_pkc_skc,
+    ("uov") UovOvIpPkcSkc: OQS_SIG_alg_uov_ov_Ip_pkc_skc,
+    ("uov") UovOvIIIPkcSkc: OQS_SIG_alg_uov_ov_III_pkc_skc,
+    ("uov") UovOvVPkcSkc: OQS_SIG_alg_uov_ov_V_pkc_skc,
 }
 
 impl Algorithm {