Skip to content

Commit

Permalink
cleanup done; domain separation done
Browse files Browse the repository at this point in the history
  • Loading branch information
@mbbarbosa-lectures
mbbarbosa-lectures committed Dec 6, 2024
1 parent 6aaef9a commit dfb40c5
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 42 deletions.
2 changes: 2 additions & 0 deletions code/jasmin/mlkem_avx2/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ SOURCES = $(CKP)/verify.c $(CKP)/randombytes.c $(CKP)/poly.c $(CKP)/polyvec.c \
test/test_kem: test/test_kem.c $(JINC) $(SOURCES) jkem.s
$(CC) $(CFLAGS) -o $@ $(SOURCES) jkem.s $<

test/speed_kem: test/speed_kem.c $(JINC) $(SOURCES) jkem.s
$(CC) $(CFLAGS) -o $@ $(SOURCES) jkem.s $<

%.s: %.jazz
$(JASMINC) -o $@ $(JFLAGS) $^
Expand Down
34 changes: 16 additions & 18 deletions code/jasmin/mlkem_avx2/test/speed_kem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,46 +55,44 @@ void print_results(const char *s, uint64_t *t, size_t tlen) {

int main(void)
{
/*
unsigned char sk[MLKEM_INDCPA_SECRETKEYBYTES];
unsigned char pk[MLKEM_INDCPA_PUBLICKEYBYTES];
unsigned char ct[MLKEM_INDCPA_BYTES];
unsigned char randomness0[MLKEM_SYMBYTES];
unsigned char randomness1[MLKEM_SYMBYTES];
unsigned char message[MLKEM_INDCPA_MSGBYTES];
unsigned char outmsg[MLKEM_POLYVECBYTES];

unsigned char sk[KYBER_SECRETKEYBYTES];
unsigned char pk[KYBER_PUBLICKEYBYTES];
unsigned char ct[KYBER_CIPHERTEXTBYTES];
unsigned char randomness0[2*KYBER_SYMBYTES];
unsigned char randomness1[KYBER_SYMBYTES];
unsigned char shk[KYBER_SSBYTES];

uint64_t t[NRUNS], i;

FILE *urandom = fopen("/dev/urandom", "r");
fread(randomness0, MLKEM_SYMBYTES, 1, urandom);
fread(randomness1, MLKEM_SYMBYTES, 1, urandom);
fread(message, MLKEM_SYMBYTES, 1, urandom);
fread(randomness0, 2*KYBER_SYMBYTES, 1, urandom);
fread(randomness1, KYBER_SYMBYTES, 1, urandom);
fclose(urandom);

/ TEST KEYPAIR /
/* TEST KEYPAIR */
for(i=0;i<NRUNS;i++)
{
t[i] = cpucycles();
indcpa_keypair_jazz(pk, sk, randomness0);
jade_kem_mlkem_mlkem768_amd64_avx2_keypair_derand(pk, sk, randomness0);
}
print_results("keypair: ", t, NRUNS);

/ TEST ENCRYPTION /
/* TEST ENCRYPTION */
for(i=0;i<NRUNS;i++)
{
t[i] = cpucycles();
indcpa_enc_jazz(ct, message, pk, randomness1);
jade_kem_mlkem_mlkem768_amd64_avx2_enc_derand(ct, shk, pk, randomness1);
}
print_results("encaps: ", t, NRUNS);

/ TEST DECRYPTION /
/* TEST DECRYPTION */
for(i=0;i<NRUNS;i++)
{
t[i] = cpucycles();
indcpa_dec_jazz(outmsg, ct, sk);
jade_kem_mlkem_mlkem768_amd64_avx2_dec(shk, ct, sk);
}
print_results("decaps: ", t, NRUNS);
*/

return 0;
}
6 changes: 3 additions & 3 deletions code/jasmin/mlkem_avx2/test/test_kem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ int main(void)
unsigned char shk1[KYBER_SSBYTES];

unsigned char randomness0[2*KYBER_SYMBYTES];
unsigned char randomness1[2*KYBER_SYMBYTES];
unsigned char randomness1[KYBER_SYMBYTES];

FILE *urandom = fopen("/dev/urandom", "r");
fread(randomness0, 2*KYBER_SYMBYTES, 1, urandom);
fread(randomness1, 2*KYBER_SYMBYTES, 1, urandom);
fread(randomness1, KYBER_SYMBYTES, 1, urandom);
fclose(urandom);

/* TEST KEYPAIR */
Expand Down
3 changes: 3 additions & 0 deletions code/jasmin/mlkem_ref/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ test/test_kem: test/test_kem.c $(JINC) $(SOURCES) jkem.s
$(CC) $(CFLAGS) -o $@ $(SOURCES) jkem.s $<


test/speed_kem: test/speed_kem.c $(JINC) $(SOURCES) jkem.s
$(CC) $(CFLAGS) -o $@ $(SOURCES) jkem.s $<

%.s: %.jazz
$(JASMINC) -o $@ $(JFLAGS) $^

Expand Down
34 changes: 16 additions & 18 deletions code/jasmin/mlkem_ref/test/speed_kem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,46 +55,44 @@ void print_results(const char *s, uint64_t *t, size_t tlen) {

int main(void)
{
/*
unsigned char sk[MLKEM_INDCPA_SECRETKEYBYTES];
unsigned char pk[MLKEM_INDCPA_PUBLICKEYBYTES];
unsigned char ct[MLKEM_INDCPA_BYTES];
unsigned char randomness0[MLKEM_SYMBYTES];
unsigned char randomness1[MLKEM_SYMBYTES];
unsigned char message[MLKEM_INDCPA_MSGBYTES];
unsigned char outmsg[MLKEM_POLYVECBYTES];

unsigned char sk[KYBER_SECRETKEYBYTES];
unsigned char pk[KYBER_PUBLICKEYBYTES];
unsigned char ct[KYBER_CIPHERTEXTBYTES];
unsigned char randomness0[2*KYBER_SYMBYTES];
unsigned char randomness1[KYBER_SYMBYTES];
unsigned char shk[KYBER_SSBYTES];

uint64_t t[NRUNS], i;

FILE *urandom = fopen("/dev/urandom", "r");
fread(randomness0, MLKEM_SYMBYTES, 1, urandom);
fread(randomness1, MLKEM_SYMBYTES, 1, urandom);
fread(message, MLKEM_SYMBYTES, 1, urandom);
fread(randomness0, 2*KYBER_SYMBYTES, 1, urandom);
fread(randomness1, KYBER_SYMBYTES, 1, urandom);
fclose(urandom);

/ TEST KEYPAIR /
/* TEST KEYPAIR */
for(i=0;i<NRUNS;i++)
{
t[i] = cpucycles();
indcpa_keypair_jazz(pk, sk, randomness0);
jade_kem_mlkem_mlkem768_amd64_ref_keypair_derand(pk, sk, randomness0);
}
print_results("keypair: ", t, NRUNS);

/ TEST ENCRYPTION /
/* TEST ENCRYPTION */
for(i=0;i<NRUNS;i++)
{
t[i] = cpucycles();
indcpa_enc_jazz(ct, message, pk, randomness1);
jade_kem_mlkem_mlkem768_amd64_ref_enc_derand(ct, shk, pk, randomness1);
}
print_results("encaps: ", t, NRUNS);

/ TEST DECRYPTION /
/* TEST DECRYPTION */
for(i=0;i<NRUNS;i++)
{
t[i] = cpucycles();
indcpa_dec_jazz(outmsg, ct, sk);
jade_kem_mlkem_mlkem768_amd64_ref_dec(shk, ct, sk);
}
print_results("decaps: ", t, NRUNS);
*/

return 0;
}
6 changes: 3 additions & 3 deletions code/jasmin/mlkem_ref/test/test_kem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ int main(void)
unsigned char shk1[KYBER_SSBYTES];

unsigned char randomness0[2*KYBER_SYMBYTES];
unsigned char randomness1[2*KYBER_SYMBYTES];
unsigned char randomness1[KYBER_SYMBYTES];

FILE *urandom = fopen("/dev/urandom", "r");
fread(randomness0, 2*KYBER_SYMBYTES, 1, urandom);
fread(randomness1, 2*KYBER_SYMBYTES, 1, urandom);
fread(randomness1, KYBER_SYMBYTES, 1, urandom);
fclose(urandom);

/* TEST KEYPAIR */
Expand Down

0 comments on commit dfb40c5

Please sign in to comment.