merge from main

--HG--
branch : fuzz

1 files changed, 160 insertions, 52 deletions

diff --git a/libtomcrypt/notes/pmac_tv.txt b/libtomcrypt/notes/pmac_tv.txt
index e0a1900..81df41a 100644
--- a/libtomcrypt/notes/pmac_tv.txt
+++ b/libtomcrypt/notes/pmac_tv.txt
@@ -1,5 +1,5 @@
-PMAC Tests.  In these tests messages of N bytes long (00,01,02,...,NN-1) are OMAC'ed.  The initial key is
-of the same format (length specified per cipher).  The OMAC key in step N+1 is the OMAC output of
+PMAC Tests.  In these tests messages of N bytes long (00,01,02,...,NN-1) are PMAC'ed.  The initial key is
+of the same format (length specified per cipher).  The PMAC key in step N+1 is the PMAC output of
 step N (repeated as required to fill the array).
 
 PMAC-aes (16 byte key)
@@ -57,23 +57,23 @@ PMAC-blowfish (8 byte key)
  16: BDFE0C7F0254BAD5
 
 PMAC-xtea (16 byte key)
-  0: A7EF6BB667216DDA
-  1: B039E53812C4ABDC
-  2: 87D2F8EA5FB6864D
-  3: F85E3F4C1D9F5EFC
-  4: 4EB749D982FB5FE2
-  5: 0BFA0F172027441A
-  6: FF82D01F36A6EC91
-  7: 3BC2AA2028EBBD7A
-  8: 15AA03A97A971E2A
-  9: C974691F5D66B835
- 10: 4FC7AA8F399A79ED
- 11: 2633DA9E94673BAE
- 12: 82A9FD48C5B60902
- 13: 31BF6DA9EE0CE7E4
- 14: 26B2538601B7620E
- 15: D103F3C0B4579BE5
- 16: 031346BA20CD87BC
+  0: F5E28630DFDE34E0
+  1: FFCC52D905DA5198
+  2: 25198AB18B2B290D
+  3: 18914E50791161E9
+  4: 200F832212AD6747
+  5: A9D09C41D734DDF7
+  6: 32D7CCA3F4BD8215
+  7: 91A1AA9389CD5D02
+  8: 35CB1F77D7C25E2F
+  9: D91EEE6D0A3874F3
+ 10: A42872686A8FF6F2
+ 11: 7568908634A79CBD
+ 12: 5B91A633D919BC34
+ 13: 32DCD17176896F1D
+ 14: 2BBBA64F30E672B6
+ 15: AFEB07DBC636AEED
+ 16: 7A417347CA03C598
 
 PMAC-rc5 (8 byte key)
   0: C6B48F8DEC631F7C
@@ -352,39 +352,39 @@ PMAC-cast5 (8 byte key)
  16: 87D907CACA80A138
 
 PMAC-noekeon (16 byte key)
-  0: A1E4C84B5958726557DF0855B37AA551
-  1: 5DE20299CA919D3365B493D3D4895F92
-  2: AF7E70C336571A857F62A18649EDB197
-  3: C5F55CFE1AA119C352B64252AD246CBD
-  4: FEF68A0CE08E8BA315B73B62F861824F
-  5: 8321C2958DE4903DC12C42A8845ECC20
-  6: 370466D1324AECF1F5B42E0E01381613
-  7: 5CB900190F5CACBACFE5EAB0CC289D87
-  8: A13C043E6CAAA1E34601A93C497446A4
-  9: 865E11622A4CC8A9E1408E00F56C4543
- 10: 9DC42C26868374649BD17D69D025CA1B
- 11: 37D33C11B433C91DA09925CA9E86757A
- 12: 1373D769C270E7137C953AC0F8F37941
- 13: 7E81DEC583348B1E2F6267ECF82CB994
- 14: 505B6329338556518FF364CAA730F5E8
- 15: 0C085AEEB315968B0BDE904E8BBC6FD0
- 16: 5FED63259364BE7E5133FF0507DD2D4C
- 17: F7EE5C80A99AAEADB49E7CC69BFFF679
- 18: 4388FA5E763A641130940EB705BEFD08
- 19: 1BC31CA79EBE1674CEBE01BC9988267B
- 20: BE88961637EFFE2D6905D104FEDD51A4
- 21: 9C341004FB22AFCC496094E3207CA761
- 22: B9DAA3620E38FFC7C5D5E7D2D8FE3DE4
- 23: A38D2E571F037061B4400F1131FDBDEA
- 24: 61DB71AE77A6EB47F2E9E14E8CBF2F4B
- 25: 9903A072274CC048EF2C51493266D9ED
- 26: 1EBEA421DD08859C17DDF39B20A82102
- 27: F425858618E1A86F4912E4714EFB9E75
- 28: 3B3D4EA07F7FE6DDFDD02D624ACDFC9F
- 29: CEEE256591D701514EB17DF73B08A970
- 30: 5CC56D5D46120C530A23B6C511C685FC
- 31: 68E484CE18BE28EADD0BBF23291B8237
- 32: ABD58A9CDF8AA68168A1A402074CF520
+  0: 276019CC8E43A1B3F300C47B55B7AA22
+  1: B93E353A2CC21CEAD81C91EC2FCD348E
+  2: E8B9737CAD705C499F246744DCFE9641
+  3: EF36B0FFB5439FF8668F35FD1822D0EA
+  4: B7F5AD89538FC3F03923E98ADF95D0CC
+  5: 558FCA30F602B4BC6697F44053875204
+  6: 6B2D6D5A1CF670BE80E4BBB945CD3871
+  7: 9CFA28FCA22EA12A13AC1093EF5D5EB9
+  8: 04EDA6C71B9F1177F4A5368684FBBAFB
+  9: 43C56B31D440EBECE4C74B90750A4653
+ 10: 23D5FA9AFFB2DC3DD372F22690487BAC
+ 11: FD61731F27CF8E791535AAB579A018B4
+ 12: 502D3A64FDED3CA2A2C8A5E986B27E03
+ 13: 1EABBC65B0A08F6CB15218E7153A6003
+ 14: B05DBC66CF92B045FC99395E9D405C4F
+ 15: EE841A0BF2C91C1E2078F06D022F2E6C
+ 16: EA749FBAC6BA9F672796C9D58A8C3294
+ 17: BBEF3CDFB93E5F462773579986F08374
+ 18: B17F7645F80BF5A2817C228987B43C03
+ 19: C995A102DFBB38FA397A4E508B85093D
+ 20: 9011CA395AC3FCD8594C13E67C22E95B
+ 21: 364BF53974D68B8BCF53CAADC5469DEC
+ 22: 5BAD7041372F28DE28BAAAC1A89C10A8
+ 23: 77874E908BFCE6F5E36888A484A754C0
+ 24: 9BDA525416A3129C55886134B79BAEDE
+ 25: 84E3201FA7958223B302D1BC2AC57D55
+ 26: 2B8FA1A95DADB4DC2F7A308D8E3D8C81
+ 27: F74EBF0ACCC187569BDE549F5FC96C36
+ 28: 7023D209F1965EC32253D11835CDFFA5
+ 29: C3C6397D9B0A1D741335882ACDFAC20D
+ 30: 7BC92905F2AF6754256BE087CC4F54DB
+ 31: 0BBA0A507767530F26C3A465DAB11359
+ 32: D2891C8EA1F574A6B2AB091057E0FB2C
 
 PMAC-skipjack (10 byte key)
   0: 9CD94B75BC43B647
@@ -459,3 +459,111 @@ PMAC-khazad (16 byte key)
  15: 93098DA8A180AA35
  16: BACE2F4DA8A89E32
 
+PMAC-seed (16 byte key)
+  0: 58844BC0C53AACF808587A7C35C37DE2
+  1: 481E3E0831DF5AED135C71BBBD075F4A
+  2: 11355F9D42E7BAD967DF90E9088D45A7
+  3: 5E3F82EF0B3CA70DCB614C1016DDB052
+  4: 35E283B0E6C538ED5F2DF4E004324865
+  5: 56467B8BA87BDE89DF4A64DC9B9409CF
+  6: 9315AAAE6CA0868FDCBC397B7DC2DF84
+  7: A265D861DCE6C9B80CCFF92463DB27D3
+  8: 196A0813E4EB49F47A1C3713950B194E
+  9: 261372868D259E609BE5080F282B361A
+ 10: DFDC55CDF60A0CB6A33BC6F4B5E5A481
+ 11: 0BD99E075BC93386CDB40C2AAF8E8918
+ 12: CA1B80D0088D7267C9AFB037DCD8FA56
+ 13: 8EDBC9F77D4DAB3DFABEAB0891622F1C
+ 14: D1A8F869C961739ABFE7F401FA41D6F6
+ 15: 653041670E0BAD5D1FE77A19D9439CEE
+ 16: 440EF361908A528B2A3ED7C50C1A47AB
+ 17: DCE2613438A5DC42AC8F5CE753DDF01D
+ 18: F9E313156CA5345CECB1A5F963E9B201
+ 19: 34D72FB89BA3C41E1D0597531849C6C9
+ 20: 7ED20B28067BA27E37606387D641B75F
+ 21: 933A2E06DA91C208297305FFF4F7795B
+ 22: CC455E1FB196CF5B233921AA6A048B81
+ 23: 613AC1EE5B8D0C3123A18BED9A352980
+ 24: 00A2BBEEB98DB190A694B67EF85A65A4
+ 25: 1A7D50E6051D85CA81D9DD7DE81BF02E
+ 26: A7F948B36D7AF08FB405A1B8C8C6AC6D
+ 27: 967DC3981E7C718B562A93E5292B872F
+ 28: 2674544D8D3E3F750590992C0AFB36AF
+ 29: 193A2CC794CB285B4CB87197EE3550ED
+ 30: 312AAC97C92279428FB1AA0882DB7088
+ 31: 3B9CBA2FF7FF4113BB2DC0DF6BCADDD0
+ 32: 45C5C71122C70F4337F5EC74BA6B446D
+
+PMAC-kasumi (16 byte key)
+  0: 52DF2D9A9EB4816A
+  1: 201C1024E6D2AF23
+  2: 04E7B341BFC96D1A
+  3: CC11D07594C50F31
+  4: EE27EAEED00E2F97
+  5: 51DB73EC42ADB789
+  6: 097A5F01A90BFE7F
+  7: 7FD121FD6B504A9D
+  8: 8A09BC5C1E7FA48C
+  9: B7A88328D7D84C9E
+ 10: 1D34173FA9F1DFCD
+ 11: 129AC84C0429E80E
+ 12: 81D236AC427123E4
+ 13: 72D4EFEDD56F6253
+ 14: ACFC8D6AF30F8B64
+ 15: C7F75094394C1765
+ 16: D95208BCB48FAA38
+
+PMAC-multi2 (40 byte key)
+  0: 4799ECD07D95FF68
+  1: 5B94DBFD53C531D7
+  2: DF09EDE792536619
+  3: 01FB72E4EE79DFEF
+  4: 4159642D6ED0D4D8
+  5: B6909A449A0A85BB
+  6: 20B167D3AA349DEA
+  7: E550AAB246D99D92
+  8: 5E1042397C86B08C
+  9: 3789D96B64C85AC0
+ 10: 72C0921EF5B5DEDE
+ 11: 5923493300FA910E
+ 12: B589609B09B4D12F
+ 13: 5EA42FE501CD696D
+ 14: 4413763D2689108B
+ 15: 07207040BAFC8E6D
+ 16: 4E80F408AA6F1DD9
+
+PMAC-camellia (16 byte key)
+  0: 33C03F6AA205F3816A17DA92BEE0BAD2
+  1: AD1EC293DD032511579235B2F29CC909
+  2: E71363EAF5A311DCFB035C69BBCE5DC0
+  3: 22661D6CD3496FB5C9B3D89FC62E3981
+  4: B142A96AF9C481B61E55B7B5896847C4
+  5: A286C0769989120F8A31A8DAD7574F22
+  6: 09E711382FDB6B938C802D11A66EF657
+  7: DF9ABA4F5CF5B0647F045C3AA631BB62
+  8: 499A8F68DAEC7FE56E64DB59B0993741
+  9: AFFDA4F40A1BDF673EE9123CAE321F16
+ 10: B6F2E39D0126AA85D9152C4457365235
+ 11: 2922AAC2FF4F0B77DEE4B3E28EF5094F
+ 12: 369D18F985D18B5ADDFFFC1151DE6BBA
+ 13: 1B7641D1A38C4114EE829B7D25BF0EFF
+ 14: DEF9092BA185FD5238A25C6FCF410C52
+ 15: D59FEE8047D64032329318DC7A2277B8
+ 16: B4561A4A092E031F8FE998FAC87F9BFB
+ 17: F27EF7D0823B056F692BA369D1B2E7B4
+ 18: F62C4F7B749CF31A6F5485BFDED7EEBD
+ 19: 22BD3AB334BE6E04C84D6197FF69CAE3
+ 20: E617D108BED8E9ACBA55FAF60863F8C3
+ 21: 0DB60AE0725D37855F3AF1DDF78E98EB
+ 22: C76DD5A075AB30AB66FC448BD19B6588
+ 23: 60231366598BEB2D16D33A1A8019B9A1
+ 24: 247E925C96064801490A1D062A0C1F18
+ 25: 1C1081E20DE3BE26FF24BEC3DFBA9BF2
+ 26: 3B16562B3CD862C00A03B7ADC99E46C5
+ 27: C1E8BA560851254640D523A0CEE846AF
+ 28: C36E8CF324A0A4EBC6C76EA01CDFD158
+ 29: EAED84E721777F5E30184E496DA2C0FA
+ 30: 6655CA0D8741440212AA0DB218E5C7FE
+ 31: D5C0143E1BA233BA5F862EE6E11A8F58
+ 32: C8DAF08BD68F4AE401C6663393C257CB
+