Skip to content

Commit b87337f

Browse files
committed
AArch64: Align return type of rejection sampling functions
This commit aligns the return type of all 3 rejection sampling functions to uint64_t for consistency. In practice there is no difference as values are guaranteed to be small integers in [0,256]. Resolves #703 Signed-off-by: Matthias J. Kannwischer <matthias@kannwischer.eu>
1 parent e1fe01b commit b87337f

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

dev/aarch64_clean/meta.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static MLD_INLINE int mld_rej_uniform_eta2_native(int32_t *r, unsigned len,
6767
const uint8_t *buf,
6868
unsigned buflen)
6969
{
70-
unsigned int outlen;
70+
uint64_t outlen;
7171
/* AArch64 implementation assumes specific buffer lengths */
7272
if (len != MLDSA_N || buflen != MLD_AARCH64_REJ_UNIFORM_ETA2_BUFLEN)
7373
{
@@ -91,7 +91,7 @@ static MLD_INLINE int mld_rej_uniform_eta4_native(int32_t *r, unsigned len,
9191
const uint8_t *buf,
9292
unsigned buflen)
9393
{
94-
unsigned int outlen;
94+
uint64_t outlen;
9595
/* AArch64 implementation assumes specific buffer lengths */
9696
if (len != MLDSA_N || buflen != MLD_AARCH64_REJ_UNIFORM_ETA4_BUFLEN)
9797
{

dev/aarch64_clean/src/arith_native_aarch64.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ uint64_t mld_rej_uniform_asm(int32_t *r, const uint8_t *buf, unsigned buflen,
6060
const uint8_t *table);
6161

6262
#define mld_rej_uniform_eta2_asm MLD_NAMESPACE(rej_uniform_eta2_asm)
63-
unsigned mld_rej_uniform_eta2_asm(int32_t *r, const uint8_t *buf,
63+
uint64_t mld_rej_uniform_eta2_asm(int32_t *r, const uint8_t *buf,
6464
unsigned buflen, const uint8_t *table);
6565

6666
#define mld_rej_uniform_eta4_asm MLD_NAMESPACE(rej_uniform_eta4_asm)
67-
unsigned mld_rej_uniform_eta4_asm(int32_t *r, const uint8_t *buf,
67+
uint64_t mld_rej_uniform_eta4_asm(int32_t *r, const uint8_t *buf,
6868
unsigned buflen, const uint8_t *table);
6969

7070
#define mld_poly_decompose_32_asm MLD_NAMESPACE(poly_decompose_32_asm)

dev/aarch64_opt/meta.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static MLD_INLINE int mld_rej_uniform_eta2_native(int32_t *r, unsigned len,
6767
const uint8_t *buf,
6868
unsigned buflen)
6969
{
70-
unsigned int outlen;
70+
uint64_t outlen;
7171
/* AArch64 implementation assumes specific buffer lengths */
7272
if (len != MLDSA_N || buflen != MLD_AARCH64_REJ_UNIFORM_ETA2_BUFLEN)
7373
{
@@ -91,7 +91,7 @@ static MLD_INLINE int mld_rej_uniform_eta4_native(int32_t *r, unsigned len,
9191
const uint8_t *buf,
9292
unsigned buflen)
9393
{
94-
unsigned int outlen;
94+
uint64_t outlen;
9595
/* AArch64 implementation assumes specific buffer lengths */
9696
if (len != MLDSA_N || buflen != MLD_AARCH64_REJ_UNIFORM_ETA4_BUFLEN)
9797
{

dev/aarch64_opt/src/arith_native_aarch64.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ uint64_t mld_rej_uniform_asm(int32_t *r, const uint8_t *buf, unsigned buflen,
6060
const uint8_t *table);
6161

6262
#define mld_rej_uniform_eta2_asm MLD_NAMESPACE(rej_uniform_eta2_asm)
63-
unsigned mld_rej_uniform_eta2_asm(int32_t *r, const uint8_t *buf,
63+
uint64_t mld_rej_uniform_eta2_asm(int32_t *r, const uint8_t *buf,
6464
unsigned buflen, const uint8_t *table);
6565

6666
#define mld_rej_uniform_eta4_asm MLD_NAMESPACE(rej_uniform_eta4_asm)
67-
unsigned mld_rej_uniform_eta4_asm(int32_t *r, const uint8_t *buf,
67+
uint64_t mld_rej_uniform_eta4_asm(int32_t *r, const uint8_t *buf,
6868
unsigned buflen, const uint8_t *table);
6969

7070
#define mld_poly_decompose_32_asm MLD_NAMESPACE(poly_decompose_32_asm)

mldsa/src/native/aarch64/meta.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static MLD_INLINE int mld_rej_uniform_eta2_native(int32_t *r, unsigned len,
6767
const uint8_t *buf,
6868
unsigned buflen)
6969
{
70-
unsigned int outlen;
70+
uint64_t outlen;
7171
/* AArch64 implementation assumes specific buffer lengths */
7272
if (len != MLDSA_N || buflen != MLD_AARCH64_REJ_UNIFORM_ETA2_BUFLEN)
7373
{
@@ -91,7 +91,7 @@ static MLD_INLINE int mld_rej_uniform_eta4_native(int32_t *r, unsigned len,
9191
const uint8_t *buf,
9292
unsigned buflen)
9393
{
94-
unsigned int outlen;
94+
uint64_t outlen;
9595
/* AArch64 implementation assumes specific buffer lengths */
9696
if (len != MLDSA_N || buflen != MLD_AARCH64_REJ_UNIFORM_ETA4_BUFLEN)
9797
{

mldsa/src/native/aarch64/src/arith_native_aarch64.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ uint64_t mld_rej_uniform_asm(int32_t *r, const uint8_t *buf, unsigned buflen,
6060
const uint8_t *table);
6161

6262
#define mld_rej_uniform_eta2_asm MLD_NAMESPACE(rej_uniform_eta2_asm)
63-
unsigned mld_rej_uniform_eta2_asm(int32_t *r, const uint8_t *buf,
63+
uint64_t mld_rej_uniform_eta2_asm(int32_t *r, const uint8_t *buf,
6464
unsigned buflen, const uint8_t *table);
6565

6666
#define mld_rej_uniform_eta4_asm MLD_NAMESPACE(rej_uniform_eta4_asm)
67-
unsigned mld_rej_uniform_eta4_asm(int32_t *r, const uint8_t *buf,
67+
uint64_t mld_rej_uniform_eta4_asm(int32_t *r, const uint8_t *buf,
6868
unsigned buflen, const uint8_t *table);
6969

7070
#define mld_poly_decompose_32_asm MLD_NAMESPACE(poly_decompose_32_asm)

0 commit comments

Comments
 (0)