diff --git a/benchmarks.csv b/benchmarks.csv index e3bb1bbb..6064966e 100644 --- a/benchmarks.csv +++ b/benchmarks.csv @@ -8,12 +8,15 @@ bikel3 (10 executions),opt,248083316,248083286,248083345,16405238,16405236,16405 hqc-128 (10 executions),clean,52705201,52705180,52705224,105650897,105650877,105650927,159569179,159569176,159569183 hqc-192 (10 executions),clean,161458617,161458590,161458638,323146261,323146250,323146292,486156251,486156214,486156266 hqc-256 (10 executions),clean,295934078,295934057,295934104,591853870,591853850,591853898,891163005,891162988,891163038 -kyber1024 (10 executions),m4fspeed,1004995,1004386,1005713,1023370,1022780,1024086,1094273,1093643,1094989 -kyber1024 (10 executions),m4fstack,1011563,1007750,1019668,1035234,1031419,1043376,1106876,1103061,1114980 -kyber512 (10 executions),m4fspeed,387426,387191,387884,386486,386251,386942,427576,427342,428033 -kyber512 (10 executions),m4fstack,387995,386694,398090,389242,387941,399338,430376,429075,440473 -kyber768 (10 executions),m4fspeed,632049,631494,632680,651880,651323,652515,706301,705744,706936 -kyber768 (10 executions),m4fstack,635213,632659,643980,658865,656311,667633,713751,711197,722519 +kyber1024 (10 executions),clean,1540378,1537672,1549497,1707203,1704498,1716319,2019461,2016781,2028566 +kyber1024 (10 executions),m4fspeed,1007332,1004620,1027834,1025692,1023006,1046169,1088140,1085497,1108618 +kyber1024 (10 executions),m4fstack,1010439,1007447,1019916,1034164,1031168,1043640,1097375,1094378,1106850 +kyber512 (10 executions),clean,596231,595868,596646,696137,695809,696547,884186,883823,884599 +kyber512 (10 executions),m4fspeed,387168,386737,387669,386230,385800,386729,423509,423078,424010 +kyber512 (10 executions),m4fstack,386859,386551,387231,388111,387802,388486,425445,425136,425820 +kyber768 (10 executions),clean,990392,988002,998996,1134996,1132606,1143599,1384768,1382378,1393371 +kyber768 (10 executions),m4fspeed,631922,631406,632490,651769,651258,652364,700842,700331,701436 +kyber768 (10 executions),m4fstack,633057,632425,633410,656716,656088,657072,706247,705620,706604 Signature Schemes,,,,,,,,,, Scheme,Implementation,Key Generation [cycles] (mean),Key Generation [cycles] (min),Key Generation [cycles] (max),Sign [cycles] (mean),Sign [cycles] (min),Sign [cycles] (max),Verify [cycles] (mean),Verify [cycles] (min),Verify [cycles] (max) aimer-l1-param1 (10 executions),ref,392943,392938,392977,32386301,32386203,32386424,31111672,31111588,31111782 @@ -156,14 +159,14 @@ hqc-128,clean,33644,51428,55892,,,,,, hqc-192,clean,65668,101636,110660,,,,,, hqc-256,clean,103756,161508,175972,,,,,, kyber1024,clean,15136,18784,20360,,,,,, -kyber1024,m4fspeed,6436,7500,9076,,,,,, -kyber1024,m4fstack,3332,3372,4948,,,,,, +kyber1024,m4fspeed,6436,7500,7484,,,,,, +kyber1024,m4fstack,3332,3372,3356,,,,,, kyber512,clean,6168,8800,9576,,,,,, -kyber512,m4fspeed,4364,5436,6212,,,,,, -kyber512,m4fstack,2292,2348,3124,,,,,, +kyber512,m4fspeed,4364,5436,5412,,,,,, +kyber512,m4fstack,2292,2348,2332,,,,,, kyber768,clean,10272,13408,14504,,,,,, -kyber768,m4fspeed,5396,6468,7564,,,,,, -kyber768,m4fstack,2820,2860,3956,,,,,, +kyber768,m4fspeed,5396,6468,6452,,,,,, +kyber768,m4fstack,2820,2860,2844,,,,,, Signature Schemes,,,,,,,,,, Scheme,Implementation,Key Generation [bytes],Sign [bytes],Verify [bytes],,,,,, aimer-l1-param1,ref,10952,187724,196728,,,,,, @@ -308,15 +311,15 @@ bikel3,opt,0.0,6.3,0.2,,,,,, hqc-128,clean,0.4,0.8,0.5,,,,,, hqc-192,clean,0.3,0.5,0.3,,,,,, hqc-256,clean,0.2,0.4,0.3,,,,,, -kyber1024,clean,49.9,45.7,38.6,,,,,, -kyber1024,m4fspeed,76.1,75.9,71.0,,,,,, -kyber1024,m4fstack,75.8,75.2,70.4,,,,,, +kyber1024,clean,50.0,45.8,38.7,,,,,, +kyber1024,m4fspeed,76.0,75.8,71.5,,,,,, +kyber1024,m4fstack,75.9,75.3,71.0,,,,,, kyber512,clean,49.8,41.4,32.6,,,,,, -kyber512,m4fspeed,76.5,74.4,67.3,,,,,, -kyber512,m4fstack,76.6,74.0,67.0,,,,,, -kyber768,clean,48.4,43.2,35.4,,,,,, -kyber768,m4fspeed,75.4,74.9,69.1,,,,,, -kyber768,m4fstack,75.3,74.3,68.6,,,,,, +kyber512,m4fspeed,76.6,74.4,68.0,,,,,, +kyber512,m4fstack,76.6,74.0,67.6,,,,,, +kyber768,clean,48.4,43.3,35.5,,,,,, +kyber768,m4fspeed,75.4,74.9,69.6,,,,,, +kyber768,m4fstack,75.4,74.5,69.3,,,,,, Signature Schemes,,,,,,,,,, Scheme,Implementation,Key Generation [%],Sign [%],Verify [%],,,,,, aimer-l1-param1,ref,72.0,47.2,46.7,,,,,, @@ -461,14 +464,14 @@ hqc-128,clean,18628,0,0,18628,,,,, hqc-192,clean,21104,0,0,21104,,,,, hqc-256,clean,26260,0,0,26260,,,,, kyber1024,clean,6296,0,0,6296,,,,, -kyber1024,m4fspeed,16928,0,0,16928,,,,, -kyber1024,m4fstack,14136,0,0,14136,,,,, +kyber1024,m4fspeed,16912,0,0,16912,,,,, +kyber1024,m4fstack,14120,0,0,14120,,,,, kyber512,clean,5164,0,0,5164,,,,, -kyber512,m4fspeed,15840,0,0,15840,,,,, -kyber512,m4fstack,13324,0,0,13324,,,,, +kyber512,m4fspeed,15824,0,0,15824,,,,, +kyber512,m4fstack,13308,0,0,13308,,,,, kyber768,clean,5168,0,0,5168,,,,, -kyber768,m4fspeed,16008,0,0,16008,,,,, -kyber768,m4fstack,13332,0,0,13332,,,,, +kyber768,m4fspeed,15992,0,0,15992,,,,, +kyber768,m4fstack,13316,0,0,13316,,,,, Signature Schemes,,,,,,,,,, Scheme,Implementation,.text [bytes],.data [bytes],.bss [bytes],Total [bytes],,,,, aimer-l1-param1,ref,19302,468,0,19770,,,,, diff --git a/benchmarks.md b/benchmarks.md index 5aef4137..ba34c3d9 100644 --- a/benchmarks.md +++ b/benchmarks.md @@ -9,12 +9,15 @@ | hqc-128 (10 executions) | clean | AVG: 52,705,201
MIN: 52,705,180
MAX: 52,705,224 | AVG: 105,650,897
MIN: 105,650,877
MAX: 105,650,927 | AVG: 159,569,179
MIN: 159,569,176
MAX: 159,569,183 | | hqc-192 (10 executions) | clean | AVG: 161,458,617
MIN: 161,458,590
MAX: 161,458,638 | AVG: 323,146,261
MIN: 323,146,250
MAX: 323,146,292 | AVG: 486,156,251
MIN: 486,156,214
MAX: 486,156,266 | | hqc-256 (10 executions) | clean | AVG: 295,934,078
MIN: 295,934,057
MAX: 295,934,104 | AVG: 591,853,870
MIN: 591,853,850
MAX: 591,853,898 | AVG: 891,163,005
MIN: 891,162,988
MAX: 891,163,038 | -| kyber1024 (10 executions) | m4fspeed | AVG: 1,004,995
MIN: 1,004,386
MAX: 1,005,713 | AVG: 1,023,370
MIN: 1,022,780
MAX: 1,024,086 | AVG: 1,094,273
MIN: 1,093,643
MAX: 1,094,989 | -| kyber1024 (10 executions) | m4fstack | AVG: 1,011,563
MIN: 1,007,750
MAX: 1,019,668 | AVG: 1,035,234
MIN: 1,031,419
MAX: 1,043,376 | AVG: 1,106,876
MIN: 1,103,061
MAX: 1,114,980 | -| kyber512 (10 executions) | m4fspeed | AVG: 387,426
MIN: 387,191
MAX: 387,884 | AVG: 386,486
MIN: 386,251
MAX: 386,942 | AVG: 427,576
MIN: 427,342
MAX: 428,033 | -| kyber512 (10 executions) | m4fstack | AVG: 387,995
MIN: 386,694
MAX: 398,090 | AVG: 389,242
MIN: 387,941
MAX: 399,338 | AVG: 430,376
MIN: 429,075
MAX: 440,473 | -| kyber768 (10 executions) | m4fspeed | AVG: 632,049
MIN: 631,494
MAX: 632,680 | AVG: 651,880
MIN: 651,323
MAX: 652,515 | AVG: 706,301
MIN: 705,744
MAX: 706,936 | -| kyber768 (10 executions) | m4fstack | AVG: 635,213
MIN: 632,659
MAX: 643,980 | AVG: 658,865
MIN: 656,311
MAX: 667,633 | AVG: 713,751
MIN: 711,197
MAX: 722,519 | +| kyber1024 (10 executions) | clean | AVG: 1,540,378
MIN: 1,537,672
MAX: 1,549,497 | AVG: 1,707,203
MIN: 1,704,498
MAX: 1,716,319 | AVG: 2,019,461
MIN: 2,016,781
MAX: 2,028,566 | +| kyber1024 (10 executions) | m4fspeed | AVG: 1,007,332
MIN: 1,004,620
MAX: 1,027,834 | AVG: 1,025,692
MIN: 1,023,006
MAX: 1,046,169 | AVG: 1,088,140
MIN: 1,085,497
MAX: 1,108,618 | +| kyber1024 (10 executions) | m4fstack | AVG: 1,010,439
MIN: 1,007,447
MAX: 1,019,916 | AVG: 1,034,164
MIN: 1,031,168
MAX: 1,043,640 | AVG: 1,097,375
MIN: 1,094,378
MAX: 1,106,850 | +| kyber512 (10 executions) | clean | AVG: 596,231
MIN: 595,868
MAX: 596,646 | AVG: 696,137
MIN: 695,809
MAX: 696,547 | AVG: 884,186
MIN: 883,823
MAX: 884,599 | +| kyber512 (10 executions) | m4fspeed | AVG: 387,168
MIN: 386,737
MAX: 387,669 | AVG: 386,230
MIN: 385,800
MAX: 386,729 | AVG: 423,509
MIN: 423,078
MAX: 424,010 | +| kyber512 (10 executions) | m4fstack | AVG: 386,859
MIN: 386,551
MAX: 387,231 | AVG: 388,111
MIN: 387,802
MAX: 388,486 | AVG: 425,445
MIN: 425,136
MAX: 425,820 | +| kyber768 (10 executions) | clean | AVG: 990,392
MIN: 988,002
MAX: 998,996 | AVG: 1,134,996
MIN: 1,132,606
MAX: 1,143,599 | AVG: 1,384,768
MIN: 1,382,378
MAX: 1,393,371 | +| kyber768 (10 executions) | m4fspeed | AVG: 631,922
MIN: 631,406
MAX: 632,490 | AVG: 651,769
MIN: 651,258
MAX: 652,364 | AVG: 700,842
MIN: 700,331
MAX: 701,436 | +| kyber768 (10 executions) | m4fstack | AVG: 633,057
MIN: 632,425
MAX: 633,410 | AVG: 656,716
MIN: 656,088
MAX: 657,072 | AVG: 706,247
MIN: 705,620
MAX: 706,604 | ## Signature Schemes | scheme | implementation | key generation [cycles] | sign [cycles] | verify [cycles] | | ------ | -------------- | ----------------------- | ------------- | --------------- | @@ -159,14 +162,14 @@ | hqc-192 | clean | 65,668 | 101,636 | 110,660 | | hqc-256 | clean | 103,756 | 161,508 | 175,972 | | kyber1024 | clean | 15,136 | 18,784 | 20,360 | -| kyber1024 | m4fspeed | 6,436 | 7,500 | 9,076 | -| kyber1024 | m4fstack | 3,332 | 3,372 | 4,948 | +| kyber1024 | m4fspeed | 6,436 | 7,500 | 7,484 | +| kyber1024 | m4fstack | 3,332 | 3,372 | 3,356 | | kyber512 | clean | 6,168 | 8,800 | 9,576 | -| kyber512 | m4fspeed | 4,364 | 5,436 | 6,212 | -| kyber512 | m4fstack | 2,292 | 2,348 | 3,124 | +| kyber512 | m4fspeed | 4,364 | 5,436 | 5,412 | +| kyber512 | m4fstack | 2,292 | 2,348 | 2,332 | | kyber768 | clean | 10,272 | 13,408 | 14,504 | -| kyber768 | m4fspeed | 5,396 | 6,468 | 7,564 | -| kyber768 | m4fstack | 2,820 | 2,860 | 3,956 | +| kyber768 | m4fspeed | 5,396 | 6,468 | 6,452 | +| kyber768 | m4fstack | 2,820 | 2,860 | 2,844 | ## Signature Schemes | Scheme | Implementation | Key Generation [bytes] | Sign [bytes] | Verify [bytes] | | ------ | -------------- | ---------------------- | ------------ | -------------- | @@ -313,15 +316,15 @@ | hqc-128 | clean | 0.4% | 0.8% | 0.5% | | hqc-192 | clean | 0.3% | 0.5% | 0.3% | | hqc-256 | clean | 0.2% | 0.4% | 0.3% | -| kyber1024 | clean | 49.9% | 45.7% | 38.6% | -| kyber1024 | m4fspeed | 76.1% | 75.9% | 71.0% | -| kyber1024 | m4fstack | 75.8% | 75.2% | 70.4% | +| kyber1024 | clean | 50.0% | 45.8% | 38.7% | +| kyber1024 | m4fspeed | 76.0% | 75.8% | 71.5% | +| kyber1024 | m4fstack | 75.9% | 75.3% | 71.0% | | kyber512 | clean | 49.8% | 41.4% | 32.6% | -| kyber512 | m4fspeed | 76.5% | 74.4% | 67.3% | -| kyber512 | m4fstack | 76.6% | 74.0% | 67.0% | -| kyber768 | clean | 48.4% | 43.2% | 35.4% | -| kyber768 | m4fspeed | 75.4% | 74.9% | 69.1% | -| kyber768 | m4fstack | 75.3% | 74.3% | 68.6% | +| kyber512 | m4fspeed | 76.6% | 74.4% | 68.0% | +| kyber512 | m4fstack | 76.6% | 74.0% | 67.6% | +| kyber768 | clean | 48.4% | 43.3% | 35.5% | +| kyber768 | m4fspeed | 75.4% | 74.9% | 69.6% | +| kyber768 | m4fstack | 75.4% | 74.5% | 69.3% | ## Signature Schemes | Scheme | Implementation | Key Generation [%] | Sign [%] | Verify [%] | | ------ | -------------- | ------------------ | -------- | ---------- | @@ -468,14 +471,14 @@ | hqc-192 | clean | 21,104 | 0 | 0 | 21,104 | | hqc-256 | clean | 26,260 | 0 | 0 | 26,260 | | kyber1024 | clean | 6,296 | 0 | 0 | 6,296 | -| kyber1024 | m4fspeed | 16,928 | 0 | 0 | 16,928 | -| kyber1024 | m4fstack | 14,136 | 0 | 0 | 14,136 | +| kyber1024 | m4fspeed | 16,912 | 0 | 0 | 16,912 | +| kyber1024 | m4fstack | 14,120 | 0 | 0 | 14,120 | | kyber512 | clean | 5,164 | 0 | 0 | 5,164 | -| kyber512 | m4fspeed | 15,840 | 0 | 0 | 15,840 | -| kyber512 | m4fstack | 13,324 | 0 | 0 | 13,324 | +| kyber512 | m4fspeed | 15,824 | 0 | 0 | 15,824 | +| kyber512 | m4fstack | 13,308 | 0 | 0 | 13,308 | | kyber768 | clean | 5,168 | 0 | 0 | 5,168 | -| kyber768 | m4fspeed | 16,008 | 0 | 0 | 16,008 | -| kyber768 | m4fstack | 13,332 | 0 | 0 | 13,332 | +| kyber768 | m4fspeed | 15,992 | 0 | 0 | 15,992 | +| kyber768 | m4fstack | 13,316 | 0 | 0 | 13,316 | ## Signature Schemes | Scheme | Implementation | .text [bytes] | .data [bytes] | .bss [bytes] | Total [bytes] | | ------ | -------------- | ------------- | ------------- | ------------ | ------------- | diff --git a/crypto_kem/kyber512/m4fspeed/poly.c b/crypto_kem/kyber512/m4fspeed/poly.c index f9d408b8..29861e69 100644 --- a/crypto_kem/kyber512/m4fspeed/poly.c +++ b/crypto_kem/kyber512/m4fspeed/poly.c @@ -237,7 +237,7 @@ int cmp_poly_compress(const unsigned char *r, poly *a) { int i, j, k = 0; #if (KYBER_POLYCOMPRESSEDBYTES == 128) - for (i = 0; i < KYBER_N; i += 8) { + for(i=0;icoeffs[8*i+j]; @@ -256,8 +256,7 @@ int cmp_poly_compress(const unsigned char *r, poly *a) { k += 4; } #elif (KYBER_POLYCOMPRESSEDBYTES == 160) - for(i=0;icoeffs[8*i+j]; diff --git a/crypto_kem/kyber512/m4fstack/poly.c b/crypto_kem/kyber512/m4fstack/poly.c index f42154ff..cc849592 100644 --- a/crypto_kem/kyber512/m4fstack/poly.c +++ b/crypto_kem/kyber512/m4fstack/poly.c @@ -237,7 +237,7 @@ int cmp_poly_compress(const unsigned char *r, poly *a) { int i, j, k = 0; #if (KYBER_POLYCOMPRESSEDBYTES == 128) - for (i = 0; i < KYBER_N; i += 8) { + for(i=0;icoeffs[8*i+j]; @@ -256,8 +256,7 @@ int cmp_poly_compress(const unsigned char *r, poly *a) { k += 4; } #elif (KYBER_POLYCOMPRESSEDBYTES == 160) - for(i=0;icoeffs[8*i+j]; diff --git a/crypto_kem/kyber768/m4fspeed/kem.c b/crypto_kem/kyber768/m4fspeed/kem.c index 7e6474e2..5cfa62bc 100644 --- a/crypto_kem/kyber768/m4fspeed/kem.c +++ b/crypto_kem/kyber768/m4fspeed/kem.c @@ -138,7 +138,6 @@ int crypto_kem_dec(unsigned char *ss, const unsigned char *ct, const unsigned ch uint8_t buf[2 * KYBER_SYMBYTES]; /* Will contain key, coins */ uint8_t kr[2 * KYBER_SYMBYTES]; - uint8_t cmp[KYBER_CIPHERTEXTBYTES + KYBER_SYMBYTES]; const uint8_t *pk = sk + KYBER_INDCPA_SECRETKEYBYTES; indcpa_dec(buf, ct, sk); @@ -148,9 +147,7 @@ int crypto_kem_dec(unsigned char *ss, const unsigned char *ct, const unsigned ch hash_g(kr, buf, 2 * KYBER_SYMBYTES); /* coins are in kr+KYBER_SYMBYTES */ - indcpa_enc(cmp, buf, pk, kr + KYBER_SYMBYTES); - - fail = verify(ct, cmp, KYBER_CIPHERTEXTBYTES); + fail = indcpa_enc_cmp(ct, buf, pk, kr + KYBER_SYMBYTES); /* Compute rejection key */ rkprf(ss, sk + KYBER_SECRETKEYBYTES - KYBER_SYMBYTES, ct); diff --git a/crypto_kem/kyber768/m4fspeed/poly.c b/crypto_kem/kyber768/m4fspeed/poly.c index 9864534a..f73f1acd 100644 --- a/crypto_kem/kyber768/m4fspeed/poly.c +++ b/crypto_kem/kyber768/m4fspeed/poly.c @@ -237,7 +237,7 @@ int cmp_poly_compress(const unsigned char *r, poly *a) { int i, j, k = 0; #if (KYBER_POLYCOMPRESSEDBYTES == 128) - for (i = 0; i < KYBER_N; i += 8) { + for(i=0;icoeffs[8*i+j]; @@ -256,8 +256,7 @@ int cmp_poly_compress(const unsigned char *r, poly *a) { k += 4; } #elif (KYBER_POLYCOMPRESSEDBYTES == 160) - for(i=0;icoeffs[8*i+j]; diff --git a/crypto_kem/kyber768/m4fstack/poly.c b/crypto_kem/kyber768/m4fstack/poly.c index 91fab840..29b959f7 100644 --- a/crypto_kem/kyber768/m4fstack/poly.c +++ b/crypto_kem/kyber768/m4fstack/poly.c @@ -237,7 +237,7 @@ int cmp_poly_compress(const unsigned char *r, poly *a) { int i, j, k = 0; #if (KYBER_POLYCOMPRESSEDBYTES == 128) - for (i = 0; i < KYBER_N; i += 8) { + for(i=0;icoeffs[8*i+j]; @@ -256,8 +256,7 @@ int cmp_poly_compress(const unsigned char *r, poly *a) { k += 4; } #elif (KYBER_POLYCOMPRESSEDBYTES == 160) - for(i=0;icoeffs[8*i+j];