Switch HQC PRNG backend to OQS_randombytes with macro [full tests] [extended tests]

Signed-off-by: Ganyu (Bruce) Xu <g66xu@uwaterloo.ca>

Author: xuganyu96

README.md

@@ -61,7 +61,7 @@ All names other than `ML-KEM` and `ML-DSA` are subject to change. `liboqs` makes
 | BIKE               | Not selected by [NIST](https://bikesuite.org/files/v5.1/BIKE_Spec.2022.10.10.1.pdf)                                                                                                                                                       | [`awslabs/bike-kem`](https://github.com/awslabs/bike-kem)                                                                                 |
 | Classic McEliece   | Under [ISO](https://classic.mceliece.org/iso.html) consideration                                                                                                                                                                          | [`PQClean/PQClean@1eacfda`](https://github.com/PQClean/PQClean/commit/1eacfdafc15ddc5d5759d0b85b4cef26627df181)                           |
 | FrodoKEM           | Under [ISO](https://frodokem.org/) consideration                                                                                                                                                                                          | [`microsoft/PQCrypto-LWEKE@a2f9dec`](https://github.com/microsoft/PQCrypto-LWEKE/commit/a2f9dec8917ccc3464b3378d46b140fa7353320d)         |
-| HQC                | Selected by [NIST](https://pqc-hqc.org/doc/hqc_specifications_2025_08_22.pdf) for upcoming standardization                                                                                                                                | [`xuganyu96/pqc-hqc@1b45cfa`](https://github.com/xuganyu96/pqc-hqc/commit/1b45cfa0b85f0fcf363b5f2d75dcf3286a551b52)                       |
+| HQC                | Selected by [NIST](https://pqc-hqc.org/doc/hqc_specifications_2025_08_22.pdf) for upcoming standardization                                                                                                                                | [`xuganyu96/pqc-hqc@73a974d`](https://github.com/xuganyu96/pqc-hqc/commit/73a974d43e896a9c7d0c601748a5e1c70a195093)                       |
 | Kyber              | Selected by [NIST](https://csrc.nist.gov/CSRC/media/Projects/post-quantum-cryptography/documents/round-3/submissions/Kyber-Round3.zip) as basis for ML-KEM (FIPS 203)                                                                     | [`pq-crystals/kyber@441c051`](https://github.com/pq-crystals/kyber/commit/441c0519a07e8b86c8d079954a6b10bd31d29efc)                       |
 | ML-KEM             | Standardized by [NIST](https://csrc.nist.gov/pubs/fips/203/final)                                                                                                                                                                         | [`pq-code-package/mlkem-native@d2cae2b`](https://github.com/pq-code-package/mlkem-native/commit/d2cae2be522a67bfae26100fdb520576f1b2ef90) |
 | NTRU               | Not selected by [NIST](https://csrc.nist.gov/CSRC/media/Projects/post-quantum-cryptography/documents/round-3/submissions/NTRU-Round3.zip), under standardization consideration by [NTT](https://info.isl.ntt.co.jp/crypt/ntru/index.html) | [`PQClean/PQClean@4c9e5a3`](https://github.com/PQClean/PQClean/commit/4c9e5a3aa715cc8d1d0e377e4e6e682ebd7602d6)                           |

docs/algorithms/kem/hqc.md

@@ -7,7 +7,7 @@
 - **Authors' website**: https://pqc-hqc.org/
 - **Specification version**: 2025-08-22.
 - **Primary Source**<a name="primary-source"></a>:
-  - **Source**: https://github.com/xuganyu96/pqc-hqc/commit/1b45cfa0b85f0fcf363b5f2d75dcf3286a551b52
+  - **Source**: https://github.com/xuganyu96/pqc-hqc/commit/73a974d43e896a9c7d0c601748a5e1c70a195093
   - **Implementation license (SPDX-Identifier)**: Public domain
 - **Ancestors of primary source**:
   - https://gitlab.com/pqc-hqc, which takes it from:

docs/algorithms/kem/hqc.yml

@@ -68,7 +68,7 @@ parameter-sets:
     default: true
 primary-upstream:
   spdx-license-identifier: Public domain
-  source: https://github.com/xuganyu96/pqc-hqc/commit/1b45cfa0b85f0fcf363b5f2d75dcf3286a551b52
+  source: https://github.com/xuganyu96/pqc-hqc/commit/73a974d43e896a9c7d0c601748a5e1c70a195093
 default-upstream-id: ref
 auxiliary-submitters:
 - Carlos Aguilar-Melchor

scripts/copy_from_upstream/copy_from_upstream.yml

@@ -3,7 +3,7 @@ upstreams:
     name: xuganyu96-hqc
     git_url: https://github.com/xuganyu96/pqc-hqc.git
     git_branch: liboqs-integration
-    git_commit: 1b45cfa0b85f0fcf363b5f2d75dcf3286a551b52
+    git_commit: 73a974d43e896a9c7d0c601748a5e1c70a195093
     kem_meta_path: "integrations/{pretty_name_full}_META.yml"
     kem_scheme_path: .
     patches: []

src/kem/hqc/CMakeLists.txt

@@ -7,28 +7,28 @@ set(_HQC_OBJS "")
 
 if(OQS_ENABLE_KEM_hqc_1)
     add_library(hqc_1_ref OBJECT kem_hqc_1.c xuganyu96-hqc_hqc-1_ref/code.c xuganyu96-hqc_hqc-1_ref/crypto_memset.c xuganyu96-hqc_hqc-1_ref/fft.c xuganyu96-hqc_hqc-1_ref/gf.c xuganyu96-hqc_hqc-1_ref/gf2x.c xuganyu96-hqc_hqc-1_ref/hqc.c xuganyu96-hqc_hqc-1_ref/kem.c xuganyu96-hqc_hqc-1_ref/parsing.c xuganyu96-hqc_hqc-1_ref/reed_muller.c xuganyu96-hqc_hqc-1_ref/reed_solomon.c xuganyu96-hqc_hqc-1_ref/symmetric.c xuganyu96-hqc_hqc-1_ref/vector.c)
-    target_compile_options(hqc_1_ref PUBLIC -DHQC_ARCH_REF=1 -DPQCHQC_NAMESPACE_PREFIX=PQCHQC_HQC1_C_)
+    target_compile_options(hqc_1_ref PUBLIC -DHQC_ARCH_REF=1 -DPQCHQC_NAMESPACE_PREFIX=PQCHQC_HQC1_C_ -DUSE_OQS_RANDOMBYTES)
     target_include_directories(hqc_1_ref PRIVATE ${CMAKE_CURRENT_LIST_DIR}/xuganyu96-hqc_hqc-1_ref)
     target_include_directories(hqc_1_ref PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims)
-    target_compile_options(hqc_1_ref PUBLIC -DHQC_ARCH_REF=1 -DPQCHQC_NAMESPACE_PREFIX=PQCHQC_HQC1_C_)
+    target_compile_options(hqc_1_ref PUBLIC -DHQC_ARCH_REF=1 -DPQCHQC_NAMESPACE_PREFIX=PQCHQC_HQC1_C_ -DUSE_OQS_RANDOMBYTES)
     set(_HQC_OBJS ${_HQC_OBJS} $<TARGET_OBJECTS:hqc_1_ref>)
 endif()
 
 if(OQS_ENABLE_KEM_hqc_3)
     add_library(hqc_3_ref OBJECT kem_hqc_3.c xuganyu96-hqc_hqc-3_ref/code.c xuganyu96-hqc_hqc-3_ref/crypto_memset.c xuganyu96-hqc_hqc-3_ref/fft.c xuganyu96-hqc_hqc-3_ref/gf.c xuganyu96-hqc_hqc-3_ref/gf2x.c xuganyu96-hqc_hqc-3_ref/hqc.c xuganyu96-hqc_hqc-3_ref/kem.c xuganyu96-hqc_hqc-3_ref/parsing.c xuganyu96-hqc_hqc-3_ref/reed_muller.c xuganyu96-hqc_hqc-3_ref/reed_solomon.c xuganyu96-hqc_hqc-3_ref/symmetric.c xuganyu96-hqc_hqc-3_ref/vector.c)
-    target_compile_options(hqc_3_ref PUBLIC -DHQC_ARCH_REF=1 -DPQCHQC_NAMESPACE_PREFIX=PQCHQC_HQC3_C_)
+    target_compile_options(hqc_3_ref PUBLIC -DHQC_ARCH_REF=1 -DPQCHQC_NAMESPACE_PREFIX=PQCHQC_HQC3_C_ -DUSE_OQS_RANDOMBYTES)
     target_include_directories(hqc_3_ref PRIVATE ${CMAKE_CURRENT_LIST_DIR}/xuganyu96-hqc_hqc-3_ref)
     target_include_directories(hqc_3_ref PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims)
-    target_compile_options(hqc_3_ref PUBLIC -DHQC_ARCH_REF=1 -DPQCHQC_NAMESPACE_PREFIX=PQCHQC_HQC3_C_)
+    target_compile_options(hqc_3_ref PUBLIC -DHQC_ARCH_REF=1 -DPQCHQC_NAMESPACE_PREFIX=PQCHQC_HQC3_C_ -DUSE_OQS_RANDOMBYTES)
     set(_HQC_OBJS ${_HQC_OBJS} $<TARGET_OBJECTS:hqc_3_ref>)
 endif()
 
 if(OQS_ENABLE_KEM_hqc_5)
     add_library(hqc_5_ref OBJECT kem_hqc_5.c xuganyu96-hqc_hqc-5_ref/code.c xuganyu96-hqc_hqc-5_ref/crypto_memset.c xuganyu96-hqc_hqc-5_ref/fft.c xuganyu96-hqc_hqc-5_ref/gf.c xuganyu96-hqc_hqc-5_ref/gf2x.c xuganyu96-hqc_hqc-5_ref/hqc.c xuganyu96-hqc_hqc-5_ref/kem.c xuganyu96-hqc_hqc-5_ref/parsing.c xuganyu96-hqc_hqc-5_ref/reed_muller.c xuganyu96-hqc_hqc-5_ref/reed_solomon.c xuganyu96-hqc_hqc-5_ref/symmetric.c xuganyu96-hqc_hqc-5_ref/vector.c)
-    target_compile_options(hqc_5_ref PUBLIC -DHQC_ARCH_REF=1 -DPQCHQC_NAMESPACE_PREFIX=PQCHQC_HQC5_C_)
+    target_compile_options(hqc_5_ref PUBLIC -DHQC_ARCH_REF=1 -DPQCHQC_NAMESPACE_PREFIX=PQCHQC_HQC5_C_ -DUSE_OQS_RANDOMBYTES)
     target_include_directories(hqc_5_ref PRIVATE ${CMAKE_CURRENT_LIST_DIR}/xuganyu96-hqc_hqc-5_ref)
     target_include_directories(hqc_5_ref PRIVATE ${PROJECT_SOURCE_DIR}/src/common/pqclean_shims)
-    target_compile_options(hqc_5_ref PUBLIC -DHQC_ARCH_REF=1 -DPQCHQC_NAMESPACE_PREFIX=PQCHQC_HQC5_C_)
+    target_compile_options(hqc_5_ref PUBLIC -DHQC_ARCH_REF=1 -DPQCHQC_NAMESPACE_PREFIX=PQCHQC_HQC5_C_ -DUSE_OQS_RANDOMBYTES)
     set(_HQC_OBJS ${_HQC_OBJS} $<TARGET_OBJECTS:hqc_5_ref>)
 endif()
 

src/kem/hqc/xuganyu96-hqc_hqc-1_ref/kem.c

@@ -5,7 +5,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <oqs/rand.h>
 #include "api.h"
 #include "crypto_memset.h"
 #include "hqc.h"
@@ -49,13 +48,7 @@ int crypto_kem_keypair(uint8_t *ek_kem, uint8_t *dk_kem) {
     uint8_t ek_pke[PUBLIC_KEY_BYTES] = {0};
     uint8_t dk_pke[SEED_BYTES] = {0};
 
-    /* FIX: modification for liboqs:
-     * the PRNG was replaced with OQS_randombytes, need to determined if this
-     * is ok
-     */
-    // // Sample seed_kem
-    // prng_get_bytes(seed_kem, SEED_BYTES);
-    OQS_randombytes(seed_kem, SEED_BYTES);
+    prng_get_bytes(seed_kem, SEED_BYTES);
 
     // Compute seed_pke and randomness sigma
     xof_init(&ctx_kem, seed_kem, SEED_BYTES);
@@ -121,10 +114,8 @@ int crypto_kem_enc(uint8_t *c_kem, uint8_t *K, const uint8_t *ek_kem) {
     ciphertext_kem_t c_kem_t = {0};
 
     // Sample message m and salt
-    // prng_get_bytes(m, PARAM_SECURITY_BYTES);
-    // prng_get_bytes(c_kem_t.salt, SALT_BYTES);
-    OQS_randombytes(m, PARAM_SECURITY_BYTES);
-    OQS_randombytes(c_kem_t.salt, SALT_BYTES);
+    prng_get_bytes(m, PARAM_SECURITY_BYTES);
+    prng_get_bytes(c_kem_t.salt, SALT_BYTES);
 
     // Compute shared key K and ciphertext c_kem
     hash_h(hash_ek_kem, ek_kem);

src/kem/hqc/xuganyu96-hqc_hqc-1_ref/symmetric.c

@@ -7,6 +7,20 @@
 #include "symmetric.h"
 #include <stdint.h>
 
+#ifdef USE_OQS_RANDOMBYTES
+#include <oqs/rand.h>
+
+void prng_init(uint8_t *entropy_input, uint8_t *personalization_string, uint32_t enlen, uint32_t perlen) {
+    (void)entropy_input;
+    (void)personalization_string;
+    (void)enlen;
+    (void)perlen;
+}
+
+void prng_get_bytes(uint8_t *output, uint32_t outlen) {
+    OQS_randombytes(output, outlen);
+}
+#else
 /**
  * @typedef shake256_prng_ctx
  * @brief Incremental SHAKE-256 prng context.
@@ -44,6 +58,7 @@ void prng_init(uint8_t *entropy_input, uint8_t *personalization_string, uint32_t
 void prng_get_bytes(uint8_t *output, uint32_t outlen) {
     OQS_SHA3_shake256_inc_squeeze(output, outlen, &shake256_prng_ctx);
 }
+#endif /* USE_OQS_RANDOMBYTES */
 
 /**
  * @brief Initializes a SHAKE256 XOF context with a given seed.

src/kem/hqc/xuganyu96-hqc_hqc-3_ref/kem.c

@@ -5,7 +5,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <oqs/rand.h>
 #include "api.h"
 #include "crypto_memset.h"
 #include "hqc.h"
@@ -49,13 +48,7 @@ int crypto_kem_keypair(uint8_t *ek_kem, uint8_t *dk_kem) {
     uint8_t ek_pke[PUBLIC_KEY_BYTES] = {0};
     uint8_t dk_pke[SEED_BYTES] = {0};
 
-    /* FIX: modification for liboqs:
-     * the PRNG was replaced with OQS_randombytes, need to determined if this
-     * is ok
-     */
-    // // Sample seed_kem
-    // prng_get_bytes(seed_kem, SEED_BYTES);
-    OQS_randombytes(seed_kem, SEED_BYTES);
+    prng_get_bytes(seed_kem, SEED_BYTES);
 
     // Compute seed_pke and randomness sigma
     xof_init(&ctx_kem, seed_kem, SEED_BYTES);
@@ -121,10 +114,8 @@ int crypto_kem_enc(uint8_t *c_kem, uint8_t *K, const uint8_t *ek_kem) {
     ciphertext_kem_t c_kem_t = {0};
 
     // Sample message m and salt
-    // prng_get_bytes(m, PARAM_SECURITY_BYTES);
-    // prng_get_bytes(c_kem_t.salt, SALT_BYTES);
-    OQS_randombytes(m, PARAM_SECURITY_BYTES);
-    OQS_randombytes(c_kem_t.salt, SALT_BYTES);
+    prng_get_bytes(m, PARAM_SECURITY_BYTES);
+    prng_get_bytes(c_kem_t.salt, SALT_BYTES);
 
     // Compute shared key K and ciphertext c_kem
     hash_h(hash_ek_kem, ek_kem);

src/kem/hqc/xuganyu96-hqc_hqc-3_ref/symmetric.c

@@ -7,6 +7,20 @@
 #include "symmetric.h"
 #include <stdint.h>
 
+#ifdef USE_OQS_RANDOMBYTES
+#include <oqs/rand.h>
+
+void prng_init(uint8_t *entropy_input, uint8_t *personalization_string, uint32_t enlen, uint32_t perlen) {
+    (void)entropy_input;
+    (void)personalization_string;
+    (void)enlen;
+    (void)perlen;
+}
+
+void prng_get_bytes(uint8_t *output, uint32_t outlen) {
+    OQS_randombytes(output, outlen);
+}
+#else
 /**
  * @typedef shake256_prng_ctx
  * @brief Incremental SHAKE-256 prng context.
@@ -44,6 +58,7 @@ void prng_init(uint8_t *entropy_input, uint8_t *personalization_string, uint32_t
 void prng_get_bytes(uint8_t *output, uint32_t outlen) {
     OQS_SHA3_shake256_inc_squeeze(output, outlen, &shake256_prng_ctx);
 }
+#endif /* USE_OQS_RANDOMBYTES */
 
 /**
  * @brief Initializes a SHAKE256 XOF context with a given seed.

src/kem/hqc/xuganyu96-hqc_hqc-5_ref/kem.c

@@ -5,7 +5,6 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <oqs/rand.h>
 #include "api.h"
 #include "crypto_memset.h"
 #include "hqc.h"
@@ -49,13 +48,7 @@ int crypto_kem_keypair(uint8_t *ek_kem, uint8_t *dk_kem) {
     uint8_t ek_pke[PUBLIC_KEY_BYTES] = {0};
     uint8_t dk_pke[SEED_BYTES] = {0};
 
-    /* FIX: modification for liboqs:
-     * the PRNG was replaced with OQS_randombytes, need to determined if this
-     * is ok
-     */
-    // // Sample seed_kem
-    // prng_get_bytes(seed_kem, SEED_BYTES);
-    OQS_randombytes(seed_kem, SEED_BYTES);
+    prng_get_bytes(seed_kem, SEED_BYTES);
 
     // Compute seed_pke and randomness sigma
     xof_init(&ctx_kem, seed_kem, SEED_BYTES);
@@ -121,10 +114,8 @@ int crypto_kem_enc(uint8_t *c_kem, uint8_t *K, const uint8_t *ek_kem) {
     ciphertext_kem_t c_kem_t = {0};
 
     // Sample message m and salt
-    // prng_get_bytes(m, PARAM_SECURITY_BYTES);
-    // prng_get_bytes(c_kem_t.salt, SALT_BYTES);
-    OQS_randombytes(m, PARAM_SECURITY_BYTES);
-    OQS_randombytes(c_kem_t.salt, SALT_BYTES);
+    prng_get_bytes(m, PARAM_SECURITY_BYTES);
+    prng_get_bytes(c_kem_t.salt, SALT_BYTES);
 
     // Compute shared key K and ciphertext c_kem
     hash_h(hash_ek_kem, ek_kem);