ascon update and merging.py update

zyrrron · Jul 1, 2024 · 2181e2c · 2181e2c
1 parent 7a2940a
commit 2181e2c
Show file tree

Hide file tree

Showing 6 changed files with 12,209 additions and 165 deletions.
diff --git a/algorithm/EdgeColoring.py b/algorithm/EdgeColoring.py
@@ -351,8 +351,6 @@ def startColoring():
 
             # create the check result list
             checklist = range(0, len(MergeResultList)-1, check_interval)
-            if upperbound == 9:
-                checklist = range(840, 3000, check_interval)
             # if check_interval == 1:
             #     checklist = range(0, 20, check_interval)
             # if s == "ascon":

diff --git a/algorithm/MergeResult.csv b/algorithm/MergeResult.csv
@@ -628,3 +628,4 @@ ascon64_6,3264,4544,320,1088
 ascon64,3264,4544,288,1152
 ascon_4,6989,11971,3346,8282
 test4_p6p,7,11,6,10
+sha256_core_nor_13_10_15,12200,17128,1973,6303
diff --git a/algorithm/VerifyResult.csv b/algorithm/VerifyResult.csv
@@ -472,160 +472,4 @@ voter2,20,23,20,23,3,4,,,,,,
 voter32,436,613,436,613,92,236,,,,,,
 voter4,48,63,48,63,9,19,,,,,,
 voter8,104,143,104,143,22,53,,,,,,
-md5_regular_20_200_nc,7424,7424,10890,10890
-sha256_core_nor_20_1000_nc,14654,14654,21383,21383
-sha256_core_nor_20_2000_nc,14654,14654,21383,21383
-cobra_50_4,48,1,286,0
-agc_8_6,192,186,241,235
-agc_8_7,192,192,241,241
-agc_8_8,192,192,241,241
-agc_8_9,192,192,241,241
-agc_8_10,192,192,241,241
-agc_200_4,192,1,241,0
-agc_300_4,192,1,241,0
-cobra_50_4,48,1,286,0test8_bio,7,1,10,0
-test8_bio,12,3,40,3
-test8_bio,12,3,40,3
-cobra_50_4,48,1,286,0
-cobra_50_6,48,1,286,0
-cobra_50_8,48,1,286,0
-cobra_50_10,48,1,286,0
-cobra_50_12,48,1,286,0
-cobra_50_20,48,1,286,0
-cobra_50_4,48,1,286,0
-cobra_50_6,48,1,286,0
-cobra_50_8,48,1,286,0
-cobra_50_10,48,1,286,0
-cobra_50_12,48,1,286,0
-cobra_50_20,48,1,286,0
-sha256_core_nor_13_5,11688,11688,16616,16616
-sha256_core_nor_13_6,11688,11688,16616,16616
-sha256_core_nor_13_7,11688,11688,16616,16616
-sha256_core_nor_13_8,11688,11688,16616,16616
-sha256_core_nor_13_9,11688,11688,16616,16616
-sha256_core_nor_13_10,11688,11688,16616,16616
-sha256_core_nor_13_11,11688,11688,16616,16616
-sha256_core_nor_13_12,11688,11688,16616,16616
-sha256_core_nor_13_13,11688,11688,16616,16616
-sha256_core_nor_13_14,11688,11688,16616,16616
-sha256_core_nor_13_15,11688,11688,16616,16616
-ascon1,51,51,71,71
-ascon2,80,80,96,96
-ascon4,160,160,192,192
-ascon8,320,320,384,384
-ascon64,2560,2560,3072,3072
-ascon,6215,6215,10380,10380
-ascon1,51,51,71,71
-ascon2,80,80,96,96
-ascon4,160,160,192,192
-ascon8,320,320,384,384
-ascon64,2560,2560,3072,3072
-ascon,6215,6215,10380,10380
-ascon64_5,2560,2560,3072,3072
-ascon_5,6215,6215,10380,10380
-test4_bio,15,15,20,20
-test4_p1,15,15,20,20
-test4_p2,15,15,20,20
-test4_p3,15,15,20,20
-test4_p4,15,11,20,16
-test4_p5,15,15,20,20
-test4_p7,15,15,20,20
-test4_p8,15,15,20,20
-test4_p9,15,15,20,20
-test4_p10,15,15,20,20
-test4_p11,15,15,20,20
-test4_p12,15,15,20,20
-test4_p13,15,15,20,20
-test4_p14,15,15,20,20
-test4_p15,15,15,20,20
-test4_p1,15,15,20,20
-test4_p2,15,15,20,20
-test4_p3,15,15,20,20
-test4_p4,15,11,20,16
-test4_p5,15,15,20,20
-test4_p7,15,15,20,20
-test4_p8,15,15,20,20
-test4_p9,15,15,20,20
-test4_p10,15,15,20,20
-test4_p11,15,15,20,20
-test4_p12,15,15,20,20
-test4_p13,15,15,20,20
-test4_p14,15,15,20,20
-test4_p15,15,15,20,20
-test4_p1,15,15,20,20
-test4_p2,15,15,20,20
-test4_p3,15,15,20,20
-test4_p4,15,11,20,16
-test4_p5,15,15,20,20
-test4_p7,15,15,20,20
-test4_p8,15,15,20,20
-test4_p9,15,15,20,20
-test4_p10,15,15,20,20
-test4_p11,15,15,20,20
-test4_p12,15,15,20,20
-test4_p13,15,15,20,20
-test4_p14,15,15,20,20
-test4_p15,15,15,20,20
-test4_p1,15,15,20,20
-test4_p2,15,15,20,20
-test4_p3,15,15,20,20
-test4_p4,15,11,20,16
-test4_p5,15,15,20,20
-test4_p7,15,15,20,20
-test4_p8,15,15,20,20
-test4_p9,15,15,20,20
-test4_p10,15,15,20,20
-test4_p11,15,15,20,20
-test4_p12,15,15,20,20
-test4_p13,15,15,20,20
-test4_p14,15,15,20,20
-test4_p15,15,15,20,20
-test4_p1,15,15,20,20
-test4_p2,15,15,20,20
-test4_p3,15,15,20,20
-test4_p4,15,11,20,16
-test4_p5,15,15,20,20
-test4_p7,15,15,20,20
-test4_p8,15,15,20,20
-test4_p9,15,15,20,20
-test4_p10,15,15,20,20
-test4_p11,15,15,20,20
-test4_p12,15,15,20,20
-test4_p13,15,15,20,20
-test4_p14,15,15,20,20
-test4_p15,15,15,20,20
-sha256_core_nor_13_5_8,12200,12200,17128,17128
-sha256_core_nor_13_6_10,12200,12200,17128,17128
-sha256_core_nor_13_7_11,12200,12200,17128,17128
-sha256_core_nor_13_8_12,12200,12200,17128,17128
-sha256_core_nor_13_9_13,12200,12200,17128,17128
-sha256_core_nor_13_10_14,12200,12200,17128,17128
-sha256_core_nor_13_11_15,12200,12200,17128,17128
-test4_p0,15,7,20,11
-test4_p1,19,11,25,17
-test4_p2,15,7,20,11
-test4_p3,15,15,20,20
-test4_p4,15,10,20,14
-test4_p6,15,7,20,11
-test4_p7,15,7,20,11
-test4_p9,15,7,20,11
-test4_p11,15,7,20,11
-test4_p12,15,7,20,11
-test4_p13,15,7,20,11
-test4_p14,15,7,20,11
-test4_p15,15,7,20,11
-test4_p0,15,7,20,11
-test4,15,7,20,11
-ascon1,51,51,71,71
-ascon2,102,102,142,142
-ascon4,204,204,284,284
-ascon8,408,408,568,568
-ascon64,3264,3264,4544,4544
-ascon64_4,3264,3264,4544,4544
-ascon64_5,3264,3264,4544,4544
-ascon64_6,3264,3264,4544,4544
-ascon_4,6989,6989,11971,11971
-ascon_5,6989,6989,11971,11971
-ascon_6,6989,6989,11971,11971
-ascon,6989,6989,11971,11971
-test4_p6p,15,7,20,11
+
diff --git a/...core_nor_13_bio/sol_after_verify_13_9.txt → ...e_nor_13_bio/sol_after_verify_13_[10].txt b/...core_nor_13_bio/sol_after_verify_13_9.txt → ...e_nor_13_bio/sol_after_verify_13_[10].txt