Skip to content
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

Jump to bottom

Kyber: avoid ASAN error on arm64 #1914

Closed
wants to merge 1 commit into from
Closed

Kyber: avoid ASAN error on arm64 #1914

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
12 changes: 9 additions & 3 deletions src/kem/kyber/oldpqclean_kyber1024_aarch64/neon_symmetric-shake.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

#include <stddef.h>
#include <stdint.h>
#include <assert.h>
#include "params.h"
#include "fips202x2.h"
#include "symmetric.h"
Expand All @@ -56,8 +57,13 @@ void neon_kyber_shake128_absorb(keccakx2_state *state,
uint8_t y1, uint8_t y2)
{
unsigned int i;
uint8_t extseed1[KYBER_SYMBYTES+2];
uint8_t extseed2[KYBER_SYMBYTES+2];

#define ROUNDUP(x,n) ((x+n-1)/n*n)
#define SEEDSIZE (KYBER_SYMBYTES+2)
uint8_t extseed1[ROUNDUP(SEEDSIZE, 8)];
uint8_t extseed2[ROUNDUP(SEEDSIZE, 8)];
assert(sizeof(extseed1) % 8 == 0);
assert(sizeof(extseed2) % 8 == 0);

for(i=0;i<KYBER_SYMBYTES;i++){
extseed1[i] = seed[i];
Expand All @@ -69,7 +75,7 @@ void neon_kyber_shake128_absorb(keccakx2_state *state,
extseed2[KYBER_SYMBYTES ] = x2;
extseed2[KYBER_SYMBYTES+1] = y2;

shake128x2_absorb(state, extseed1, extseed2, sizeof(extseed1));
shake128x2_absorb(state, extseed1, extseed2, SEEDSIZE);
}

/*************************************************
Expand Down
12 changes: 9 additions & 3 deletions src/kem/kyber/oldpqclean_kyber512_aarch64/neon_symmetric-shake.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

#include <stddef.h>
#include <stdint.h>
#include <assert.h>
#include "params.h"
#include "fips202x2.h"
#include "symmetric.h"
Expand All @@ -56,8 +57,13 @@ void neon_kyber_shake128_absorb(keccakx2_state *state,
uint8_t y1, uint8_t y2)
{
unsigned int i;
uint8_t extseed1[KYBER_SYMBYTES+2];
uint8_t extseed2[KYBER_SYMBYTES+2];

#define ROUNDUP(x,n) ((x+n-1)/n*n)
#define SEEDSIZE (KYBER_SYMBYTES+2)
uint8_t extseed1[ROUNDUP(SEEDSIZE, 8)];
uint8_t extseed2[ROUNDUP(SEEDSIZE, 8)];
assert(sizeof(extseed1) % 8 == 0);
assert(sizeof(extseed2) % 8 == 0);

for(i=0;i<KYBER_SYMBYTES;i++){
extseed1[i] = seed[i];
Expand All @@ -69,7 +75,7 @@ void neon_kyber_shake128_absorb(keccakx2_state *state,
extseed2[KYBER_SYMBYTES ] = x2;
extseed2[KYBER_SYMBYTES+1] = y2;

shake128x2_absorb(state, extseed1, extseed2, sizeof(extseed1));
shake128x2_absorb(state, extseed1, extseed2, SEEDSIZE);
}

/*************************************************
Expand Down
12 changes: 9 additions & 3 deletions src/kem/kyber/oldpqclean_kyber768_aarch64/neon_symmetric-shake.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

#include <stddef.h>
#include <stdint.h>
#include <assert.h>
#include "params.h"
#include "fips202x2.h"
#include "symmetric.h"
Expand All @@ -56,8 +57,13 @@ void neon_kyber_shake128_absorb(keccakx2_state *state,
uint8_t y1, uint8_t y2)
{
unsigned int i;
uint8_t extseed1[KYBER_SYMBYTES+2];
uint8_t extseed2[KYBER_SYMBYTES+2];

#define ROUNDUP(x,n) ((x+n-1)/n*n)
#define SEEDSIZE (KYBER_SYMBYTES+2)
uint8_t extseed1[ROUNDUP(SEEDSIZE, 8)];
uint8_t extseed2[ROUNDUP(SEEDSIZE, 8)];
assert(sizeof(extseed1) % 8 == 0);
assert(sizeof(extseed2) % 8 == 0);

for(i=0;i<KYBER_SYMBYTES;i++){
extseed1[i] = seed[i];
Expand All @@ -69,7 +75,7 @@ void neon_kyber_shake128_absorb(keccakx2_state *state,
extseed2[KYBER_SYMBYTES ] = x2;
extseed2[KYBER_SYMBYTES+1] = y2;

shake128x2_absorb(state, extseed1, extseed2, sizeof(extseed1));
shake128x2_absorb(state, extseed1, extseed2, SEEDSIZE);
}

/*************************************************
Expand Down
Loading