From 5dc3f495e50dad1c3a12e27ed8ddfd6de460e123 Mon Sep 17 00:00:00 2001 From: Pravek Sharma Date: Tue, 21 Jan 2025 19:14:23 +0100 Subject: [PATCH] Run copy_from_upsream.py and pull updated upstream Signed-off-by: Pravek Sharma --- docs/algorithms/kem/ml_kem.md | 2 +- docs/algorithms/kem/ml_kem.yml | 2 +- .../copy_from_upstream/copy_from_upstream.yml | 2 +- .../cupqc_ml-kem-1024_cuda/cupqc_ml-kem.cu | 28 +------------------ .../cupqc_ml-kem-512_cuda/cupqc_ml-kem.cu | 28 +------------------ .../cupqc_ml-kem-768_cuda/cupqc_ml-kem.cu | 28 +------------------ 6 files changed, 6 insertions(+), 84 deletions(-) diff --git a/docs/algorithms/kem/ml_kem.md b/docs/algorithms/kem/ml_kem.md index b0a7e786b..eeaf299dd 100644 --- a/docs/algorithms/kem/ml_kem.md +++ b/docs/algorithms/kem/ml_kem.md @@ -11,7 +11,7 @@ - **Implementation license (SPDX-Identifier)**: CC0-1.0 or Apache-2.0 - **Optimized Implementation sources**: https://github.com/pq-crystals/kyber/commit/10b478fc3cc4ff6215eb0b6a11bd758bf0929cbd with copy_from_upstream patches - **cupqc-cuda**: - - **Source**: https://github.com/praveksharma/cupqc-mlkem/commit/adb8454e56979628c07b67eb7d90f9337be6dc30 + - **Source**: https://github.com/praveksharma/cupqc-mlkem/commit/b026f4e5475cd9c20c2082c7d9bad80e5b0ba89e - **Implementation license (SPDX-Identifier)**: Apache-2.0 diff --git a/docs/algorithms/kem/ml_kem.yml b/docs/algorithms/kem/ml_kem.yml index d48f05608..498617ff4 100644 --- a/docs/algorithms/kem/ml_kem.yml +++ b/docs/algorithms/kem/ml_kem.yml @@ -22,7 +22,7 @@ primary-upstream: spdx-license-identifier: CC0-1.0 or Apache-2.0 optimized-upstreams: cupqc-cuda: - source: https://github.com/praveksharma/cupqc-mlkem/commit/adb8454e56979628c07b67eb7d90f9337be6dc30 + source: https://github.com/praveksharma/cupqc-mlkem/commit/b026f4e5475cd9c20c2082c7d9bad80e5b0ba89e spdx-license-identifier: Apache-2.0 parameter-sets: - name: ML-KEM-512 diff --git a/scripts/copy_from_upstream/copy_from_upstream.yml b/scripts/copy_from_upstream/copy_from_upstream.yml index b2f74f566..23d1f3a22 100644 --- a/scripts/copy_from_upstream/copy_from_upstream.yml +++ b/scripts/copy_from_upstream/copy_from_upstream.yml @@ -42,7 +42,7 @@ upstreams: name: cupqc git_url: https://github.com/praveksharma/cupqc-mlkem.git git_branch: main - git_commit: adb8454e56979628c07b67eb7d90f9337be6dc30 + git_commit: b026f4e5475cd9c20c2082c7d9bad80e5b0ba89e kem_meta_path: '{pretty_name_full}_META.yml' kem_scheme_path: '.' patches: [] diff --git a/src/kem/ml_kem/cupqc_ml-kem-1024_cuda/cupqc_ml-kem.cu b/src/kem/ml_kem/cupqc_ml-kem-1024_cuda/cupqc_ml-kem.cu index 2935c2cd6..188e2f100 100644 --- a/src/kem/ml_kem/cupqc_ml-kem-1024_cuda/cupqc_ml-kem.cu +++ b/src/kem/ml_kem/cupqc_ml-kem-1024_cuda/cupqc_ml-kem.cu @@ -156,35 +156,9 @@ cleanup: } extern "C" { - using KEM_512 = decltype(ML_KEM_512() + Block()); - using KEM_768 = decltype(ML_KEM_768() + Block()); using KEM_1024 = decltype(ML_KEM_1024() + Block()); -#if defined(OQS_ENABLE_KEM_ml_kem_512_cupqc) - int cupqc_ml_kem_512_keypair(uint8_t *pk, uint8_t *sk) { - return keypair(pk, sk); - } - int cupqc_ml_kem_512_enc(uint8_t *ct, uint8_t *ss, const uint8_t *pk) { - return encaps(ct, ss, pk); - } - int cupqc_ml_kem_512_dec(uint8_t *ss, const uint8_t *ct, const uint8_t *sk) { - return decaps(ss, ct, sk); - } -#endif - -#if defined(OQS_ENABLE_KEM_ml_kem_768_cupqc) - int cupqc_ml_kem_768_keypair(uint8_t *pk, uint8_t *sk) { - return keypair(pk, sk); - } - int cupqc_ml_kem_768_enc(uint8_t *ct, uint8_t *ss, const uint8_t *pk) { - return encaps(ct, ss, pk); - } - int cupqc_ml_kem_768_dec(uint8_t *ss, const uint8_t *ct, const uint8_t *sk) { - return decaps(ss, ct, sk); - } -#endif - -#if defined(OQS_ENABLE_KEM_ml_kem_1024_cupqc) +#if defined(OQS_ENABLE_KEM_ml_kem_1024_cuda) int cupqc_ml_kem_1024_keypair(uint8_t *pk, uint8_t *sk) { return keypair(pk, sk); } diff --git a/src/kem/ml_kem/cupqc_ml-kem-512_cuda/cupqc_ml-kem.cu b/src/kem/ml_kem/cupqc_ml-kem-512_cuda/cupqc_ml-kem.cu index 2935c2cd6..48ca5ca31 100644 --- a/src/kem/ml_kem/cupqc_ml-kem-512_cuda/cupqc_ml-kem.cu +++ b/src/kem/ml_kem/cupqc_ml-kem-512_cuda/cupqc_ml-kem.cu @@ -157,10 +157,8 @@ cleanup: extern "C" { using KEM_512 = decltype(ML_KEM_512() + Block()); - using KEM_768 = decltype(ML_KEM_768() + Block()); - using KEM_1024 = decltype(ML_KEM_1024() + Block()); -#if defined(OQS_ENABLE_KEM_ml_kem_512_cupqc) +#if defined(OQS_ENABLE_KEM_ml_kem_512_cuda) int cupqc_ml_kem_512_keypair(uint8_t *pk, uint8_t *sk) { return keypair(pk, sk); } @@ -171,28 +169,4 @@ extern "C" { return decaps(ss, ct, sk); } #endif - -#if defined(OQS_ENABLE_KEM_ml_kem_768_cupqc) - int cupqc_ml_kem_768_keypair(uint8_t *pk, uint8_t *sk) { - return keypair(pk, sk); - } - int cupqc_ml_kem_768_enc(uint8_t *ct, uint8_t *ss, const uint8_t *pk) { - return encaps(ct, ss, pk); - } - int cupqc_ml_kem_768_dec(uint8_t *ss, const uint8_t *ct, const uint8_t *sk) { - return decaps(ss, ct, sk); - } -#endif - -#if defined(OQS_ENABLE_KEM_ml_kem_1024_cupqc) - int cupqc_ml_kem_1024_keypair(uint8_t *pk, uint8_t *sk) { - return keypair(pk, sk); - } - int cupqc_ml_kem_1024_enc(uint8_t *ct, uint8_t *ss, const uint8_t *pk) { - return encaps(ct, ss, pk); - } - int cupqc_ml_kem_1024_dec(uint8_t *ss, const uint8_t *ct, const uint8_t *sk) { - return decaps(ss, ct, sk); - } -#endif } diff --git a/src/kem/ml_kem/cupqc_ml-kem-768_cuda/cupqc_ml-kem.cu b/src/kem/ml_kem/cupqc_ml-kem-768_cuda/cupqc_ml-kem.cu index 2935c2cd6..594c1f4c2 100644 --- a/src/kem/ml_kem/cupqc_ml-kem-768_cuda/cupqc_ml-kem.cu +++ b/src/kem/ml_kem/cupqc_ml-kem-768_cuda/cupqc_ml-kem.cu @@ -156,23 +156,9 @@ cleanup: } extern "C" { - using KEM_512 = decltype(ML_KEM_512() + Block()); using KEM_768 = decltype(ML_KEM_768() + Block()); - using KEM_1024 = decltype(ML_KEM_1024() + Block()); -#if defined(OQS_ENABLE_KEM_ml_kem_512_cupqc) - int cupqc_ml_kem_512_keypair(uint8_t *pk, uint8_t *sk) { - return keypair(pk, sk); - } - int cupqc_ml_kem_512_enc(uint8_t *ct, uint8_t *ss, const uint8_t *pk) { - return encaps(ct, ss, pk); - } - int cupqc_ml_kem_512_dec(uint8_t *ss, const uint8_t *ct, const uint8_t *sk) { - return decaps(ss, ct, sk); - } -#endif - -#if defined(OQS_ENABLE_KEM_ml_kem_768_cupqc) +#if defined(OQS_ENABLE_KEM_ml_kem_768_cuda) int cupqc_ml_kem_768_keypair(uint8_t *pk, uint8_t *sk) { return keypair(pk, sk); } @@ -183,16 +169,4 @@ extern "C" { return decaps(ss, ct, sk); } #endif - -#if defined(OQS_ENABLE_KEM_ml_kem_1024_cupqc) - int cupqc_ml_kem_1024_keypair(uint8_t *pk, uint8_t *sk) { - return keypair(pk, sk); - } - int cupqc_ml_kem_1024_enc(uint8_t *ct, uint8_t *ss, const uint8_t *pk) { - return encaps(ct, ss, pk); - } - int cupqc_ml_kem_1024_dec(uint8_t *ss, const uint8_t *ct, const uint8_t *sk) { - return decaps(ss, ct, sk); - } -#endif }