Skip to content

Mark all non-static declarations as internal or external #951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkannwischer merged 1 commit into from
Feb 7, 2026
Merged

Mark all non-static declarations as internal or external #951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions mldsa/src/fips202/fips202.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,64 +192,75 @@ __contract__(
return pos;
}

MLD_INTERNAL_API
void mld_shake128_init(mld_shake128ctx *state)
{
keccak_init(state->s);
state->pos = 0;
}

MLD_INTERNAL_API
void mld_shake128_absorb(mld_shake128ctx *state, const uint8_t *in,
size_t inlen)
{
state->pos = keccak_absorb(state->s, state->pos, SHAKE128_RATE, in, inlen);
}

MLD_INTERNAL_API
void mld_shake128_finalize(mld_shake128ctx *state)
{
keccak_finalize(state->s, state->pos, SHAKE128_RATE, 0x1F);
state->pos = SHAKE128_RATE;
}

MLD_INTERNAL_API
void mld_shake128_squeeze(uint8_t *out, size_t outlen, mld_shake128ctx *state)
{
state->pos = keccak_squeeze(out, outlen, state->s, state->pos, SHAKE128_RATE);
}

MLD_INTERNAL_API
void mld_shake128_release(mld_shake128ctx *state)
{
/* @[FIPS204, Section 3.6.3] Destruction of intermediate values. */
mld_zeroize(state, sizeof(mld_shake128ctx));
}

MLD_INTERNAL_API
void mld_shake256_init(mld_shake256ctx *state)
{
keccak_init(state->s);
state->pos = 0;
}

MLD_INTERNAL_API
void mld_shake256_absorb(mld_shake256ctx *state, const uint8_t *in,
size_t inlen)
{
state->pos = keccak_absorb(state->s, state->pos, SHAKE256_RATE, in, inlen);
}

MLD_INTERNAL_API
void mld_shake256_finalize(mld_shake256ctx *state)
{
keccak_finalize(state->s, state->pos, SHAKE256_RATE, 0x1F);
state->pos = SHAKE256_RATE;
}

MLD_INTERNAL_API
void mld_shake256_squeeze(uint8_t *out, size_t outlen, mld_shake256ctx *state)
{
state->pos = keccak_squeeze(out, outlen, state->s, state->pos, SHAKE256_RATE);
}

MLD_INTERNAL_API
void mld_shake256_release(mld_shake256ctx *state)
{
/* @[FIPS204, Section 3.6.3] Destruction of intermediate values. */
mld_zeroize(state, sizeof(mld_shake256ctx));
}

MLD_INTERNAL_API
void mld_shake256(uint8_t *out, size_t outlen, const uint8_t *in, size_t inlen)
{
mld_shake256ctx state;
Expand Down
11 changes: 11 additions & 0 deletions mldsa/src/fips202/fips202.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ typedef struct
*
* Arguments: - mld_shake128ctx *state: pointer to (uninitialized) state
**************************************************/
MLD_INTERNAL_API
void mld_shake128_init(mld_shake128ctx *state)
__contract__(
requires(memory_no_alias(state, sizeof(mld_shake128ctx)))
Expand All @@ -57,6 +58,7 @@ __contract__(
* - const uint8_t *in: pointer to input to be absorbed into s
* - size_t inlen: length of input in bytes
**************************************************/
MLD_INTERNAL_API
void mld_shake128_absorb(mld_shake128ctx *state, const uint8_t *in,
size_t inlen)
__contract__(
Expand All @@ -76,6 +78,7 @@ __contract__(
*
* Arguments: - mld_shake128ctx *state: pointer to state
**************************************************/
MLD_INTERNAL_API
void mld_shake128_finalize(mld_shake128ctx *state)
__contract__(
requires(memory_no_alias(state, sizeof(mld_shake128ctx)))
Expand All @@ -96,6 +99,7 @@ __contract__(
*output)
* - mld_shake128ctx *s: pointer to input/output state
**************************************************/
MLD_INTERNAL_API
void mld_shake128_squeeze(uint8_t *out, size_t outlen, mld_shake128ctx *state)
__contract__(
requires(outlen <= 8 * SHAKE128_RATE /* somewhat arbitrary bound */)
Expand All @@ -115,6 +119,7 @@ __contract__(
*
* Arguments: - mld_shake128ctx *state: pointer to state
**************************************************/
MLD_INTERNAL_API
void mld_shake128_release(mld_shake128ctx *state)
__contract__(
requires(memory_no_alias(state, sizeof(mld_shake128ctx)))
Expand All @@ -129,6 +134,7 @@ __contract__(
*
* Arguments: - mld_shake256ctx *state: pointer to (uninitialized) state
**************************************************/
MLD_INTERNAL_API
void mld_shake256_init(mld_shake256ctx *state)
__contract__(
requires(memory_no_alias(state, sizeof(mld_shake256ctx)))
Expand All @@ -147,6 +153,7 @@ __contract__(
* - const uint8_t *in: pointer to input to be absorbed into s
* - size_t inlen: length of input in bytes
**************************************************/
MLD_INTERNAL_API
void mld_shake256_absorb(mld_shake256ctx *state, const uint8_t *in,
size_t inlen)
__contract__(
Expand All @@ -166,6 +173,7 @@ __contract__(
*
* Arguments: - mld_shake256ctx *state: pointer to state
**************************************************/
MLD_INTERNAL_API
void mld_shake256_finalize(mld_shake256ctx *state)
__contract__(
requires(memory_no_alias(state, sizeof(mld_shake256ctx)))
Expand All @@ -186,6 +194,7 @@ __contract__(
*output)
* - mld_shake256ctx *s: pointer to input/output state
**************************************************/
MLD_INTERNAL_API
void mld_shake256_squeeze(uint8_t *out, size_t outlen, mld_shake256ctx *state)
__contract__(
requires(outlen <= 8 * SHAKE256_RATE /* somewhat arbitrary bound */)
Expand All @@ -205,6 +214,7 @@ __contract__(
*
* Arguments: - mld_shake256ctx *state: pointer to state
**************************************************/
MLD_INTERNAL_API
void mld_shake256_release(mld_shake256ctx *state)
__contract__(
requires(memory_no_alias(state, sizeof(mld_shake256ctx)))
Expand All @@ -222,6 +232,7 @@ __contract__(
* - const uint8_t *in: pointer to input
* - size_t inlen: length of input in bytes
**************************************************/
MLD_INTERNAL_API
void mld_shake256(uint8_t *out, size_t outlen, const uint8_t *in, size_t inlen)
__contract__(
requires(inlen <= MLD_MAX_BUFFER_SIZE)
Expand Down
17 changes: 14 additions & 3 deletions mldsa/src/fips202/fips202x4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
*/

#include "../common.h"
#if !defined(MLD_CONFIG_MULTILEVEL_NO_SHARED)
#if !defined(MLD_CONFIG_MULTILEVEL_NO_SHARED) && \
!defined(MLD_CONFIG_SERIAL_FIPS202_ONLY)

#include <string.h>
#include "../ct.h"
Expand Down Expand Up @@ -117,6 +118,8 @@ __contract__(
}
}

#if !defined(MLD_CONFIG_REDUCE_RAM)
MLD_INTERNAL_API
void mld_shake128x4_absorb_once(mld_shake128x4ctx *state, const uint8_t *in0,
const uint8_t *in1, const uint8_t *in2,
const uint8_t *in3, size_t inlen)
Expand All @@ -126,6 +129,7 @@ void mld_shake128x4_absorb_once(mld_shake128x4ctx *state, const uint8_t *in0,
inlen, 0x1F);
}

MLD_INTERNAL_API
void mld_shake128x4_squeezeblocks(uint8_t *out0, uint8_t *out1, uint8_t *out2,
uint8_t *out3, size_t nblocks,
mld_shake128x4ctx *state)
Expand All @@ -134,14 +138,17 @@ void mld_shake128x4_squeezeblocks(uint8_t *out0, uint8_t *out1, uint8_t *out2,
SHAKE128_RATE);
}

MLD_INTERNAL_API
void mld_shake128x4_init(mld_shake128x4ctx *state) { (void)state; }
MLD_INTERNAL_API
void mld_shake128x4_release(mld_shake128x4ctx *state)
{
/* @[FIPS204, Section 3.6.3] Destruction of intermediate values. */
mld_zeroize(state, sizeof(mld_shake128x4ctx));
}
#endif /* !MLD_CONFIG_REDUCE_RAM */


MLD_INTERNAL_API
void mld_shake256x4_absorb_once(mld_shake256x4ctx *state, const uint8_t *in0,
const uint8_t *in1, const uint8_t *in2,
const uint8_t *in3, size_t inlen)
Expand All @@ -151,6 +158,7 @@ void mld_shake256x4_absorb_once(mld_shake256x4ctx *state, const uint8_t *in0,
inlen, 0x1F);
}

MLD_INTERNAL_API
void mld_shake256x4_squeezeblocks(uint8_t *out0, uint8_t *out1, uint8_t *out2,
uint8_t *out3, size_t nblocks,
mld_shake256x4ctx *state)
Expand All @@ -159,11 +167,14 @@ void mld_shake256x4_squeezeblocks(uint8_t *out0, uint8_t *out1, uint8_t *out2,
SHAKE256_RATE);
}

MLD_INTERNAL_API
void mld_shake256x4_init(mld_shake256x4ctx *state) { (void)state; }
MLD_INTERNAL_API
void mld_shake256x4_release(mld_shake256x4ctx *state)
{
/* @[FIPS204, Section 3.6.3] Destruction of intermediate values. */
mld_zeroize(state, sizeof(mld_shake256x4ctx));
}

#endif /* !MLD_CONFIG_MULTILEVEL_NO_SHARED */
#endif /* !MLD_CONFIG_MULTILEVEL_NO_SHARED && !MLD_CONFIG_SERIAL_FIPS202_ONLY \
*/
19 changes: 15 additions & 4 deletions mldsa/src/fips202/fips202x4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@
#ifndef MLD_FIPS202_FIPS202X4_H
#define MLD_FIPS202_FIPS202X4_H

#include "../common.h"

#if !defined(MLD_CONFIG_SERIAL_FIPS202_ONLY)

#include <stddef.h>
#include <stdint.h>

#include "../cbmc.h"
#include "../common.h"

#include "fips202.h"
#include "keccakf1600.h"

Expand All @@ -26,7 +28,9 @@ typedef struct
uint64_t ctx[MLD_KECCAK_LANES * MLD_KECCAK_WAY];
} mld_shake256x4ctx;

#if !defined(MLD_CONFIG_REDUCE_RAM)
#define mld_shake128x4_absorb_once MLD_NAMESPACE(shake128x4_absorb_once)
MLD_INTERNAL_API
void mld_shake128x4_absorb_once(mld_shake128x4ctx *state, const uint8_t *in0,
const uint8_t *in1, const uint8_t *in2,
const uint8_t *in3, size_t inlen)
Expand All @@ -41,6 +45,7 @@ __contract__(
);

#define mld_shake128x4_squeezeblocks MLD_NAMESPACE(shake128x4_squeezeblocks)
MLD_INTERNAL_API
void mld_shake128x4_squeezeblocks(uint8_t *out0, uint8_t *out1, uint8_t *out2,
uint8_t *out3, size_t nblocks,
mld_shake128x4ctx *state)
Expand All @@ -59,13 +64,16 @@ __contract__(
);

#define mld_shake128x4_init MLD_NAMESPACE(shake128x4_init)
MLD_INTERNAL_API
void mld_shake128x4_init(mld_shake128x4ctx *state);

#define mld_shake128x4_release MLD_NAMESPACE(shake128x4_release)
MLD_INTERNAL_API
void mld_shake128x4_release(mld_shake128x4ctx *state);

#endif /* !MLD_CONFIG_REDUCE_RAM */

#define mld_shake256x4_absorb_once MLD_NAMESPACE(shake256x4_absorb_once)
MLD_INTERNAL_API
void mld_shake256x4_absorb_once(mld_shake256x4ctx *state, const uint8_t *in0,
const uint8_t *in1, const uint8_t *in2,
const uint8_t *in3, size_t inlen)
Expand All @@ -80,6 +88,7 @@ __contract__(
);

#define mld_shake256x4_squeezeblocks MLD_NAMESPACE(shake256x4_squeezeblocks)
MLD_INTERNAL_API
void mld_shake256x4_squeezeblocks(uint8_t *out0, uint8_t *out1, uint8_t *out2,
uint8_t *out3, size_t nblocks,
mld_shake256x4ctx *state)
Expand All @@ -98,10 +107,12 @@ __contract__(
);

#define mld_shake256x4_init MLD_NAMESPACE(shake256x4_init)
MLD_INTERNAL_API
void mld_shake256x4_init(mld_shake256x4ctx *state);

#define mld_shake256x4_release MLD_NAMESPACE(shake256x4_release)
MLD_INTERNAL_API
void mld_shake256x4_release(mld_shake256x4ctx *state);


#endif /* !MLD_CONFIG_SERIAL_FIPS202_ONLY */
#endif /* !MLD_FIPS202_FIPS202X4_H */
6 changes: 6 additions & 0 deletions mldsa/src/fips202/keccakf1600.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
#define MLD_KECCAK_NROUNDS 24
#define MLD_KECCAK_ROL(a, offset) ((a << offset) ^ (a >> (64 - offset)))

MLD_INTERNAL_API
void mld_keccakf1600_extract_bytes(uint64_t *state, unsigned char *data,
unsigned offset, unsigned length)
{
Expand All @@ -57,6 +58,7 @@ void mld_keccakf1600_extract_bytes(uint64_t *state, unsigned char *data,
#endif /* !MLD_SYS_LITTLE_ENDIAN */
}

MLD_INTERNAL_API
void mld_keccakf1600_xor_bytes(uint64_t *state, const unsigned char *data,
unsigned offset, unsigned length)
{
Expand All @@ -79,6 +81,7 @@ void mld_keccakf1600_xor_bytes(uint64_t *state, const unsigned char *data,
#endif /* !MLD_SYS_LITTLE_ENDIAN */
}

MLD_INTERNAL_API
void mld_keccakf1600x4_extract_bytes(uint64_t *state, unsigned char *data0,
unsigned char *data1, unsigned char *data2,
unsigned char *data3, unsigned offset,
Expand All @@ -94,6 +97,7 @@ void mld_keccakf1600x4_extract_bytes(uint64_t *state, unsigned char *data0,
length);
}

MLD_INTERNAL_API
void mld_keccakf1600x4_xor_bytes(uint64_t *state, const unsigned char *data0,
const unsigned char *data1,
const unsigned char *data2,
Expand All @@ -110,6 +114,7 @@ void mld_keccakf1600x4_xor_bytes(uint64_t *state, const unsigned char *data0,
length);
}

MLD_INTERNAL_API
void mld_keccakf1600x4_permute(uint64_t *state)
{
#if defined(MLD_USE_FIPS202_X4_NATIVE)
Expand Down Expand Up @@ -405,6 +410,7 @@ void mld_keccakf1600_permute_c(uint64_t *state)
state[24] = Asu;
}

MLD_INTERNAL_API
void mld_keccakf1600_permute(uint64_t *state)
{
#if defined(MLD_USE_FIPS202_X1_NATIVE)
Expand Down
Loading