Skip to content

Commit 4473b0d

Browse files
h2parsonh2parson
committed
patch internal slh dsa APIs
Signed-off-by: h2parson <h2parson@uwaterloo.ca>
1 parent d4f3ed0 commit 4473b0d

4 files changed

Lines changed: 19 additions & 16 deletions

File tree

‎src/sig/slh_dsa/slh_dsa_c/slh_dsa.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ static size_t slh_sign_digest(slh_var_t *var, uint8_t *sig,
572572

573573
/* Algorithm 19: slh_sign_internal(M, SK, addrnd) */
574574

575-
size_t slh_sign_internal(uint8_t *sig, const uint8_t *m, size_t m_sz,
575+
OQS_API size_t slh_sign_internal(uint8_t *sig, const uint8_t *m, size_t m_sz,
576576
const uint8_t *sk, const uint8_t *addrnd,
577577
const slh_param_t *prm)
578578
{
@@ -681,7 +681,7 @@ static int slh_verify_digest(slh_var_t *var, const uint8_t *digest,
681681

682682
/* Algorithm 20: slh_verify_internal(M, SIG, PK) */
683683

684-
int slh_verify_internal(const uint8_t *m, size_t m_sz, const uint8_t *sig,
684+
OQS_API int slh_verify_internal(const uint8_t *m, size_t m_sz, const uint8_t *sig,
685685
size_t sig_sz, const uint8_t *pk,
686686
const slh_param_t *prm)
687687
{

‎src/sig/slh_dsa/slh_dsa_c/slh_dsa.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ extern "C"
1616

1717
#include <stddef.h>
1818
#include <stdint.h>
19+
#include <oqs/oqs.h>
1920

2021
#ifndef _SLH_PARAM_H_
2122
typedef struct slh_param_s slh_param_t;
@@ -59,7 +60,7 @@ extern "C"
5960
const slh_param_t *prm);
6061

6162
/* Generate an SLH-DSA signature. */
62-
size_t slh_sign_internal(uint8_t *sig, const uint8_t *m, size_t m_sz,
63+
OQS_API size_t slh_sign_internal(uint8_t *sig, const uint8_t *m, size_t m_sz,
6364
const uint8_t *sk, const uint8_t *addrnd,
6465
const slh_param_t *prm);
6566

@@ -69,7 +70,7 @@ extern "C"
6970

7071
/* Verify an SLH-DSA signature. */
7172
/* return 0 on verification failure, 1 on success */
72-
int slh_verify_internal(const uint8_t *m, size_t m_sz, const uint8_t *sig,
73+
OQS_API int slh_verify_internal(const uint8_t *m, size_t m_sz, const uint8_t *sig,
7374
size_t sig_sz, const uint8_t *pk,
7475
const slh_param_t *prm);
7576

‎src/sig/slh_dsa/slh_dsa_c/slh_sha2.c‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
/* === Portable C code: Functions for instantiation of SLH-DSA with SHA2 */
77

88
#include <string.h>
9+
#include <oqs/oqs.h>
910
#include "plat_local.h"
1011
#include "sha2_api.h"
1112
#include "slh_adrs.h"
@@ -458,7 +459,7 @@ static void sha2_256_fors_hash(slh_var_t *var, uint8_t *tmp, uint32_t s)
458459

459460
/* 10.2. SLH-DSA Using SHA2 for Security Category 1 */
460461

461-
const slh_param_t slh_dsa_sha2_128s = {/* .alg_id = */ "SLH-DSA-SHA2-128s",
462+
OQS_API const slh_param_t slh_dsa_sha2_128s = {/* .alg_id = */ "SLH-DSA-SHA2-128s",
462463
/* .n = */ 16,
463464
/* .h = */ 63,
464465
/* .d = */ 7,
@@ -478,7 +479,7 @@ const slh_param_t slh_dsa_sha2_128s = {/* .alg_id = */ "SLH-DSA-SHA2-128s",
478479
/* .h_h = */ sha2_256_h,
479480
/* .h_t = */ sha2_256_tl};
480481

481-
const slh_param_t slh_dsa_sha2_128f = {/* .alg_id = */ "SLH-DSA-SHA2-128f",
482+
OQS_API const slh_param_t slh_dsa_sha2_128f = {/* .alg_id = */ "SLH-DSA-SHA2-128f",
482483
/* .n = */ 16,
483484
/* .h = */ 66,
484485
/* .d = */ 22,
@@ -500,7 +501,7 @@ const slh_param_t slh_dsa_sha2_128f = {/* .alg_id = */ "SLH-DSA-SHA2-128f",
500501

501502
/* 10.3. SLH-DSA Using SHA2 for Security Categories 3 and 5 */
502503

503-
const slh_param_t slh_dsa_sha2_192s = {/* .alg_id = */ "SLH-DSA-SHA2-192s",
504+
OQS_API const slh_param_t slh_dsa_sha2_192s = {/* .alg_id = */ "SLH-DSA-SHA2-192s",
504505
/* .n = */ 24,
505506
/* .h = */ 63,
506507
/* .d = */ 7,
@@ -520,7 +521,7 @@ const slh_param_t slh_dsa_sha2_192s = {/* .alg_id = */ "SLH-DSA-SHA2-192s",
520521
/* .h_h = */ sha2_512_h,
521522
/* .h_t = */ sha2_512_tl};
522523

523-
const slh_param_t slh_dsa_sha2_192f = {/* .alg_id = */ "SLH-DSA-SHA2-192f",
524+
OQS_API const slh_param_t slh_dsa_sha2_192f = {/* .alg_id = */ "SLH-DSA-SHA2-192f",
524525
/* .n = */ 24,
525526
/* .h = */ 66,
526527
/* .d = */ 22,
@@ -540,7 +541,7 @@ const slh_param_t slh_dsa_sha2_192f = {/* .alg_id = */ "SLH-DSA-SHA2-192f",
540541
/* .h_h = */ sha2_512_h,
541542
/* .h_t = */ sha2_512_tl};
542543

543-
const slh_param_t slh_dsa_sha2_256s = {/* .alg_id = */ "SLH-DSA-SHA2-256s",
544+
OQS_API const slh_param_t slh_dsa_sha2_256s = {/* .alg_id = */ "SLH-DSA-SHA2-256s",
544545
/* .n = */ 32,
545546
/* .h = */ 64,
546547
/* .d = */ 8,
@@ -560,7 +561,7 @@ const slh_param_t slh_dsa_sha2_256s = {/* .alg_id = */ "SLH-DSA-SHA2-256s",
560561
/* .h_h = */ sha2_512_h,
561562
/* .h_t = */ sha2_512_tl};
562563

563-
const slh_param_t slh_dsa_sha2_256f = {/* .alg_id = */ "SLH-DSA-SHA2-256f",
564+
OQS_API const slh_param_t slh_dsa_sha2_256f = {/* .alg_id = */ "SLH-DSA-SHA2-256f",
564565
/* .n = */ 32,
565566
/* .h = */ 68,
566567
/* .d = */ 17,

‎src/sig/slh_dsa/slh_dsa_c/slh_shake.c‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
/* === Portable C code: Functions for instantiation of SLH-DSA with SHAKE */
77

8+
#include <oqs/oqs.h>
89
#include "sha3_api.h"
910
#include "slh_adrs.h"
1011
#include "slh_var.h"
@@ -230,7 +231,7 @@ static void shake_fors_hash(slh_var_t *var, uint8_t *tmp, uint32_t s)
230231

231232
/* parameter sets */
232233

233-
const slh_param_t slh_dsa_shake_128s = {/* .alg_id = */ "SLH-DSA-SHAKE-128s",
234+
OQS_API const slh_param_t slh_dsa_shake_128s = {/* .alg_id = */ "SLH-DSA-SHAKE-128s",
234235
/* .n = */ 16,
235236
/* .h = */ 63,
236237
/* .d = */ 7,
@@ -250,7 +251,7 @@ const slh_param_t slh_dsa_shake_128s = {/* .alg_id = */ "SLH-DSA-SHAKE-128s",
250251
/* .h_h = */ shake_h,
251252
/* .h_t = */ shake_t};
252253

253-
const slh_param_t slh_dsa_shake_128f = {/* .alg_id = */ "SLH-DSA-SHAKE-128f",
254+
OQS_API const slh_param_t slh_dsa_shake_128f = {/* .alg_id = */ "SLH-DSA-SHAKE-128f",
254255
/* .n = */ 16,
255256
/* .h = */ 66,
256257
/* .d = */ 22,
@@ -270,7 +271,7 @@ const slh_param_t slh_dsa_shake_128f = {/* .alg_id = */ "SLH-DSA-SHAKE-128f",
270271
/* .h_h = */ shake_h,
271272
/* .h_t = */ shake_t};
272273

273-
const slh_param_t slh_dsa_shake_192s = {/* .alg_id = */ "SLH-DSA-SHAKE-192s",
274+
OQS_API const slh_param_t slh_dsa_shake_192s = {/* .alg_id = */ "SLH-DSA-SHAKE-192s",
274275
/* .n = */ 24,
275276
/* .h = */ 63,
276277
/* .d = */ 7,
@@ -290,7 +291,7 @@ const slh_param_t slh_dsa_shake_192s = {/* .alg_id = */ "SLH-DSA-SHAKE-192s",
290291
/* .h_h = */ shake_h,
291292
/* .h_t = */ shake_t};
292293

293-
const slh_param_t slh_dsa_shake_192f = {/* .alg_id = */ "SLH-DSA-SHAKE-192f",
294+
OQS_API const slh_param_t slh_dsa_shake_192f = {/* .alg_id = */ "SLH-DSA-SHAKE-192f",
294295
/* .n = */ 24,
295296
/* .h = */ 66,
296297
/* .d = */ 22,
@@ -310,7 +311,7 @@ const slh_param_t slh_dsa_shake_192f = {/* .alg_id = */ "SLH-DSA-SHAKE-192f",
310311
/* .h_h = */ shake_h,
311312
/* .h_t = */ shake_t};
312313

313-
const slh_param_t slh_dsa_shake_256s = {/* .alg_id = */ "SLH-DSA-SHAKE-256s",
314+
OQS_API const slh_param_t slh_dsa_shake_256s = {/* .alg_id = */ "SLH-DSA-SHAKE-256s",
314315
/* .n = */ 32,
315316
/* .h = */ 64,
316317
/* .d = */ 8,
@@ -330,7 +331,7 @@ const slh_param_t slh_dsa_shake_256s = {/* .alg_id = */ "SLH-DSA-SHAKE-256s",
330331
/* .h_h = */ shake_h,
331332
/* .h_t = */ shake_t};
332333

333-
const slh_param_t slh_dsa_shake_256f = {/* .alg_id = */ "SLH-DSA-SHAKE-256f",
334+
OQS_API const slh_param_t slh_dsa_shake_256f = {/* .alg_id = */ "SLH-DSA-SHAKE-256f",
334335
/* .n = */ 32,
335336
/* .h = */ 68,
336337
/* .d = */ 17,

0 commit comments

Comments
 (0)