From 5708adb6c15c79505bf3ce1b31f26007283315d1 Mon Sep 17 00:00:00 2001
From: Patrick Pelletier <ppelletier@oblong.net>
Date: Wed, 5 Oct 2011 01:37:19 -0700
Subject: [PATCH] Add Camellia to the test vectors.

---
 demos/tv_gen.c      |   3 +
 notes/ccm_tv.txt    |  35 ++++++++++
 notes/cipher_tv.txt | 158 ++++++++++++++++++++++++++++++++++++++++++++
 notes/eax_tv.txt    |  35 ++++++++++
 notes/gcm_tv.txt    |  35 ++++++++++
 notes/ocb_tv.txt    |  35 ++++++++++
 notes/omac_tv.txt   |  35 ++++++++++
 notes/pmac_tv.txt   |  35 ++++++++++
 8 files changed, 371 insertions(+)

diff --git a/demos/tv_gen.c b/demos/tv_gen.c
index 8e09e3b..fe7acdc 100644
--- a/demos/tv_gen.c
+++ b/demos/tv_gen.c
@@ -53,6 +53,9 @@ void reg_algs(void)
 #ifdef LTC_KHAZAD
   register_cipher (&khazad_desc);
 #endif
+#ifdef LTC_CAMELLIA
+  register_cipher (&camellia_desc);
+#endif
 
 #ifdef LTC_TIGER
   register_hash (&tiger_desc);
diff --git a/notes/ccm_tv.txt b/notes/ccm_tv.txt
index 3ff4b77..57969aa 100644
--- a/notes/ccm_tv.txt
+++ b/notes/ccm_tv.txt
@@ -212,3 +212,38 @@ CCM-anubis (16 byte key)
  31: B8176469E6A0D5797ED6421A871FEECDE48ACF011E394981C43AC917E8FFD5, E9B01383DB1A32E6126BD802A6C6F47E
  32: AB6A0AA29B687D05735167D78DB697BA2478BD14ECD059AE9D1239E7F2AB48FD, A560A30FD87CF28BA66F5B2638567E4B
 
+CCM-camellia (16 byte key)
+  0: , 3B53D5CC8B26A5FFC78D2E974E45A661
+  1: 5B, ED7741D8C258D56A29392A7A65CF147D
+  2: 9396, AEC9E6690624A94E9ED39A0507C32277
+  3: 7D7DDB, E7D4B50F856F78EAFCCD6B91CA985AFE
+  4: 1DE036A3, 4F519237C8534508140174DD3F5D5E10
+  5: 9BD3C8B888, 760CADF4D2722C52BE28D89F9F1BEAAC
+  6: CA4252105A3D, 675B4D6953136E0691C3FE174381C231
+  7: EFF8ABC8F5CFA0, DDECDDF8FAE2BCAE971003D05A86024C
+  8: D155E0590C4DC889, 08EFED0B6FA5C0EB64B7900229EA41DC
+  9: 50AC40B4A083BEBF21, 14DABECF5CDBBB8F0AF3E7DDC034DAC6
+ 10: 1C5442AF9F2D491BE911, FD19818919D55FD80BCC9EBA0A108920
+ 11: 85A748561995A968CC9124, 69F769B8EA2BE927DADD209300752181
+ 12: 2F0838A1C593A629C1AE9032, 4C8AB614BCF4F7988EB4B93E1DC48EE2
+ 13: F19EE633F8B5E323904469D5C3, F82B28464B4BF73C39B332814E1672EF
+ 14: D6DBE7D82D4C99830FA1A6245125, 94D9EDF12A4A4EE357B647184EACC01B
+ 15: E8D02CBECEAD690DDFC1E48EE16B1F, 2D1355394CD62544D8840302715862D8
+ 16: 74C395F0C833ECB858F6D09C097192C4, 9079E949C4081B348259080AA0AAD85B
+ 17: ECB27927C303ABE439BCD9F9D4E87D5674, 726E8E755398A30E930F2159B510DD8B
+ 18: 86593B1148EF7D5B446AA3AD22001CB66CB5, 63B0D269B586B9C887584498FF61D8BA
+ 19: 0373123872929AAF354B085FCEAB74DD2D28E4, 5FE2491F2603E474D15500DB2E32481D
+ 20: 3EA3D8DC013F2A6E42BFCCEE51BBFCEDD194BA40, 5667BD5212E31F02C8D8B94FAB5A9DEF
+ 21: 5ACC89A28DB162595FD55D63ED2C5B48976E0BA0E9, A52EDC5A3AB7B070B755DBB008D99787
+ 22: 381266462C783DF3B5F3F3570611D6E0A61ABDFF7BA5, C79D371D81511D85D7B54B686AADFAFD
+ 23: 8819DDC964172B3BE049CCBABCF5AA7EDB50BD90E871F4, 45561AD598EB2DB8F7825878786B2CED
+ 24: F514E9F64E90197728E2D061443ED006F2CF2236EC2E65CF, 0C47214A73F6CEAEC1C96FE859C519E1
+ 25: 3B965F16101777CF84C85AD864701BCDD617681B92944386AD, ECBE6B6BA145D10FE0D5042A5F04BB68
+ 26: B573EB75A48CB8F56163A55DFB870017E06940D799ECCECE7C2C, 63A7C16D33F6ECA72B2B33C6FFF4F13D
+ 27: 47A3A96928BC9B28E22C3AF1999A30E271806BD3E6C8FAA4D82D62, 25E319011BA2F72BF7447C8EB36BBD01
+ 28: 0E873D38B34A0857FB82BF278AE07AEF9A4B378A8300CDD96C5BDE34, 6045114D75AE7681C91E5BC508E2398B
+ 29: FF33B9683538014DCF4F7D78CF7126FB43448BF9883D69B824019B05FB, 28AD47D363A7F9A4653C6685F90C2971
+ 30: 58005BF96E194411DF808DB3A6D405CA241986486160313AD092026A0A54, 7D8A8C8E8AB6ACE7312D82146219F37B
+ 31: 20C3DFE512F4EC1F17973BBB164E9F1B77CC3EB37B486119614764F4C7D0E2, 57CEB0625D34AD40935B03C54A1B8779
+ 32: 913F8D366D4C2AC10ACB3196CCBDB5F436CFA92377045EB3A1C066F6ED7DE0E9, F48C8BB647E719049DB38C39EF779CE2
+
diff --git a/notes/cipher_tv.txt b/notes/cipher_tv.txt
index c649d26..01c3023 100644
--- a/notes/cipher_tv.txt
+++ b/notes/cipher_tv.txt
@@ -1965,3 +1965,161 @@ Key Size: 16 bytes
 49: 0133E1745856C44C
 
 
+Cipher: camellia
+Key Size: 16 bytes
+ 0: ED18D83F3153160C5A6D01AC3717515C
+ 1: 1012886CCDF3FFD25E588BA10D6CE363
+ 2: D25562F6943EBE3A7E0EF28D33CF091E
+ 3: C26FDC4539DD1E6D0330B5836AB24420
+ 4: E14A50CE727B74B8CEBEB284FEF3C810
+ 5: AABFD72D334F594344C617EF8E8F5741
+ 6: E8D941419ABE88060835E9BD375455BB
+ 7: ED863784E1590139A2CA50D77450300A
+ 8: 545FCF42030BD764724C3EF5C139B038
+ 9: 08C194E007FAA99997D855A759D10743
+10: 3899D3731500C79D2945AFC2980B4C17
+11: 2720FA4B402AB7F1B019AF6248702369
+12: 3FF6C3C90AB4141DEE5FF30EA2047F73
+13: BB5BAF7545AA774C7AA5A58568F96832
+14: 66349C52709EDE0EE34AB6501B420C7C
+15: E1E93D923504A5421BAEA5F1D61D4C9A
+16: 3C07DFD64B2407BB7575A905F3F31E83
+17: 0FC569AC89ED790F69BBD1E998700C97
+18: 6B6F390AFA1052BD2E8DB0DC261E4D26
+19: CBEA83ED55DA9DED95B87F2BBBEAC37D
+20: CE005DECECB98F5937D5ED26FD83154E
+21: 738301D76316EC4173F124A9C9D6577A
+22: D00A1E40CFB5F2B8FD2C0714580FAD50
+23: 7EBF497C78B72E646EB72A326F1D5C4B
+24: 7E0023900F6000D00737242DA8F2E1B1
+25: 0F7737E715BEF0DEA503E355394540A9
+26: 15452DD70DEBF45BEF39782CDB8BB086
+27: E7464917B3AF060BC763D8959DDF90C1
+28: CBE4B90FF8C66672122D53585198773B
+29: B7262E6CAA2C14B18EE374DF922CDB98
+30: 01E695E3CD87A2FD4B9C49D08D032DAD
+31: AA1686BA0B5C5688D0F370C6E2BFA43C
+32: 9448BA348E8E904992C3F4233C226B22
+33: A1DCD1CB810DFB46BDCE6FBE3A192560
+34: 4345D200A309FA8C5A0CE9EC60EE506C
+35: 54C7F64D9B411BF90B283ED62686D28F
+36: E347E882EC2635081547612B1D9589D1
+37: 36D44CC101B37BB6F6AF68C3FEA3A7B7
+38: F38C2D5B921965D2AFFDBF4EC5BCEC19
+39: F7ED6BF85782F0526301BD1CD1624E67
+40: 7959C134BFC85CA176550EA689F81054
+41: A8FC96504C437F0EFD0BDF6CCEF516D2
+42: 6B88D1A06D7C8C74379FEFE2D6A7C895
+43: 39C21AA165F4A71A161971D89CA5DC32
+44: CC123C40071BF02D282DC83D2AC18226
+45: 0780A63741AE47CD03FA99A74C320E33
+46: DFB0831BA27AA0750701439603B8A805
+47: 0C783CBA4ECD9EEE1F91838259831187
+48: 1456624438B22555B08D59CA50D6E95D
+49: D5F463D983A9A6FE9A0B47C245596D40
+
+Key Size: 24 bytes
+ 0: 1D1DAF85EA5CAE19F5F5EA1DC61E5B83
+ 1: DDAC7FCF2C2F275C7041E7821AAC84A3
+ 2: 591091C3755816AAEB9170D5DF77A0B3
+ 3: C4BC965CDC20E6FC039F07DA2CD10BE3
+ 4: CD8DA54FC48524EDCFEF985C0C39C961
+ 5: 14FA12F39AC3D701A958765B4499FFAC
+ 6: 2BBEA5F3AA140CFFED9F1EB2BC969D56
+ 7: 5F73CA8BF641770D6833A43947D9A5C3
+ 8: 3E872D303B882284AB02393D43137450
+ 9: 01EF55D4CE182FA03216A83A5128F761
+10: 915C2F5793692A6D118D865783317C58
+11: 4368A442B61D6F12D5447F1CB8854714
+12: 3477ECB27ECFF2D7108ED1297DE80F86
+13: 89C875CB55C1CE80FF2D430921FADB05
+14: C5AAFE7A4588D4D9039E4552B3FC9B02
+15: BF1E7509405AB219B540BDD0D3DE7528
+16: 7E5CC85B6563099B902638B7E0D09728
+17: FF04D2350647F117F81DA037A9E11946
+18: EA294A53395A20B391B11AB9F97262F3
+19: 448C801307E9405F740623BA55A45639
+20: 62032AE6EB01322233FB321B2D6A8C38
+21: 79A54FFB9CA25AE315BA0E7B6E59EA99
+22: EDE7E634C396926876A49DB3C0E261E1
+23: E9DA5106B8BD33391C28407E9B3758BD
+24: D8EAF9F744E060695AD1F55F85AF3D76
+25: F1E61F0F467C0785B6053332129114EA
+26: 3119CACB24B012F3B96EFAD3FB856AFB
+27: 97753ACDAFD6224E5D289BF76673A73A
+28: 8D5912FFFD628736C64B3DE01DF1E674
+29: 8951CEDB758DF5EA5D2A78B2A08480EE
+30: 3C0FC9DFD8CF79A5F9F75CC43B1A9247
+31: 4C7047481FE0849EA0416BDC00A52321
+32: 97034388AE8553570366EDFB9F6D618F
+33: F16BCC0FB2B77CCBDC5EF7AB2233599D
+34: 6D94D041196F43F0224B1DAC84165E7C
+35: 313C6BA0AD767259860DCF8003F2F5A2
+36: C5F835DCF63D1C40E56DBAC7ADCE7F3C
+37: DAFAFF6BB46EA9280562E5DDFA793BA8
+38: 5C8C0570B06C595E296DD4A9FB864FCE
+39: 72B433F78D7CA638C2ADA09D99CFB769
+40: B6D7A6C47339743E9739D35D0F08A25D
+41: 6CFD73F9E9781FFCE53C69AD2EF11E03
+42: B7F0BA994EF90642B80FDD798666D752
+43: DD49766125316ED4F546B246A2CFA23A
+44: 8ED53D6CEF3CFB9DB0147F02656EDA35
+45: 95690401D61C84A013EC6D25CCAC5CD1
+46: 7693648B4A6CA804B6F01AE67816746C
+47: F08C5898CE7970C41A5F8C05882CAB8B
+48: 91EC0EC1CF839B58009E6CAAB3FD67A0
+49: 853DFA14A029EB8FB8D693B0A65306A1
+
+Key Size: 32 bytes
+ 0: 5F77DC44E5E6701E8755C1FA176E2434
+ 1: 5C1F70FC144C66D82D8F21DD2A0BA54E
+ 2: A98317BC656475F83E83062A69A17EF6
+ 3: D5B8C0DB1095E65D49CEC82D78FD4C7E
+ 4: 37A537292409ABE5B922DD97EC0F6CA4
+ 5: C7FD40883DE6BBC6059327DA586AD96E
+ 6: F4D19C443A2195B66085DACA7EFFDADF
+ 7: 6F12FD74B4D25C9F2856CAA1BA32461E
+ 8: DFC00046F41BC27684321B980BF68F6E
+ 9: 4A8BECB6A8D57002FCC6FE08B6D31118
+10: 859562FB3727E535BD4A914907822545
+11: EBA65EA3BD622DC044CA5384E568C65F
+12: 79C16A751FBE22340F30462600724324
+13: 8F4FB71B5B3E0C1DB870B4BC81E995D0
+14: 4B82E7E8D64D8EF9D78DA944B292CED9
+15: D873F8D7125A63EBB04473F7331B1975
+16: 2FA25AF9E8D5A4DC82CAD98505E5DA60
+17: C80C24625096E6E9852A6F9EE12735BB
+18: 10D4434CB795DC06E926CFA3B43D2368
+19: 070795AEA2765A443213F9CA909DF6C4
+20: 7184D2F5644306FB6DD55F1C90C111CA
+21: F4FAEDF12FB40DE7CE7B08121A340557
+22: 86CE014AA863FD3030A26E6F8C178673
+23: 5A46BF2B3F14D5FEA884C3361EA87ED3
+24: 456584515D983D17ED4F3AE944BFB2C4
+25: E1E8F394691C2A9123023A8EE3FCBBEF
+26: AC73E8BD1758850DEDAA3817B01E6353
+27: 15AE5395CBC3371F81A6F5B05C52671F
+28: F15AA72D34C4E0EEF8DDDDA90D9A9539
+29: 3325E709043735898EA242E94D169112
+30: 044AB447754DADD4E2709FEE08D5CEA2
+31: E02DD5E86D32B3A6CC7F0016375AEC5F
+32: 790278BD19E2860618E24DC69993F92B
+33: F776D24FD90A43A78D000CFC1189E56A
+34: A3EE4A3D121280750F7C70E55DD40FF4
+35: 32928BBBF98DF4B9E107599DFB30364F
+36: B3E9296B529118B656D27AFF0F4D1A55
+37: 4668FD77100255C3406281EC813719AE
+38: 16F9FF27B26F13300DB8DEE2EDD023AA
+39: 9295F8435D688D12BE631A31B2531482
+40: D86917DF41ED4342C0ABF10628DBD1B4
+41: 1F5215B987C3F079769292E65D04B823
+42: F68B98BD2F12AACEBE78666AA83CA7D0
+43: 09BB635B67279F5A6B1D5C5D880A1357
+44: AE4ABBCC1D35CD8C4C254111D5F27158
+45: 5552B3E39DE67F759799A686222EE4EC
+46: 1CA439434B9FD2F24561A32A0A2A79C5
+47: 0E33BE7CE3B9A5CFF00A73BD27DFE9EF
+48: 6B7056FDC97983173D6B3D5BFC9B09B8
+49: DA293A4CB96FE3608CFFD89B927C9ED6
+
+
diff --git a/notes/eax_tv.txt b/notes/eax_tv.txt
index 95cd7c1..40135dc 100644
--- a/notes/eax_tv.txt
+++ b/notes/eax_tv.txt
@@ -459,3 +459,38 @@ EAX-khazad (16 byte key)
  15: 14DA751E5AF7E01F35B3CE74EE1ACF, 3C76AB64E1724DCE
  16: A13BBC7E408D2C550634CBC64690B8FE, 3D4BBC0C76536730
 
+EAX-camellia (16 byte key)
+  0: , 9E8CDB7237166EF9FD0605A0AD3E4070
+  1: 8A, 23F462AC7E22EB9078DAC34CB1CFFB08
+  2: EC9D, EBA9E2E3112C18CC2991FFF97EF77E6F
+  3: D2A9CF, 913472F45F6D6B087D8AEB34B0FF9494
+  4: 360A7ECC, 6382103D53AB8C9263977AFB1A96AAC4
+  5: 80B52AAFE6, F855787CD6CCA56CD656A0DBC663CAD1
+  6: 0915D546F5F0, EBE17981CAB5D59E6376CFE30DE66936
+  7: 086B525B082B71, 182D76F2DE42F5D0AC252F25E7BC34CA
+  8: 438DA1E9E78B9D2E, 36BA12456C3AC5ED3A0BDF851A651E82
+  9: 0F9C9890152D6AD5EC, 06F3A96F40D794552CA799006E76AE7A
+ 10: 7754241DCD040CC449EB, B576881B5E542A73717A6AC24E516079
+ 11: BB536F70C1111BFAC4D149, DDC6043F2B5DF96418799DD13BD04726
+ 12: 4B530B4F67376C4B7EC1CB29, 43A36C14092F19F168ADF0FD9F557424
+ 13: 55D5D285DC88451148C7B2B143, 7C2CB43BD19808EB90F045E6D6EB70D0
+ 14: B321948117659CB06E6B364D00A7, 1B30A37234E3A13A335EFE6A07B070DC
+ 15: BDCCAC5E956953E6D5C43D9436D453, 98F924C659F4112B1D9DAFFF711FB2F6
+ 16: E0A2F28186D79A9494700E5A30351542, C604F7F47C3F18F236DDB289D287BE91
+ 17: 750D6EF87E1C9E1023920D3F355B2BEED8, 96FEEAC4DA36FD36129F67C3EADA75EF
+ 18: E7F91687119D70793B9BB0114C7B588D32F0, A75052978F26EE6FE5D802BD4C06004D
+ 19: 56D7420981DC556AE0137DB0F1BD1CEC0BC945, CC024D30F19EAA3CDF66E51246FC3225
+ 20: F2D61A0E214472663F5F41C9D66EDEEC2F7C824A, 9706F273AF680AE2537D02BE41A2C980
+ 21: 30F76A83CF8010DF0F49F73C06435E0C5D85EDC6E3, 1F18354A73BF506D229369836855EFD5
+ 22: DB9688FB58EB83AF06A579CE56FBC75D93412790924C, C9DD5350751CFF0AB1A8910AC1898E08
+ 23: CBD64BAB16852F40FB00D9FEEF5365C773CA14B77EF5E2, D6A02105B1BD018A5BCF47A69803248D
+ 24: BDCE2AA8092D4790041750DC922F2D6AA12DB3F41A547C7E, 3DF09D758306DAE21C3AAAB3FC51623E
+ 25: FDFF0AFA4D94CB3019AB27234259ED225B1B3B0F2BDC32CDD0, D64E69725D638D9F0F90C44C6BF51722
+ 26: A9D2CC4F7FB98D54A78293C64C2A41CA19CC1F7B9970F3437AE9, BDFC6B10DD012BA057CCCD40AE14569B
+ 27: 81FE813C4A6A47D34F146DD943092940ECEA77F85339A219B6134D, 5F44590AE8CDF89E13AE2BE4D32AB7DB
+ 28: F618779FC6E6F5B7EE3FB4E937097E6A122B979E3DF837F72A8FA3B9, 00F0A3B4C67F68590AAA0BEF2D399D1F
+ 29: 0A8AB66D218268C9181DB8C6EF542AA4B42E53E4623E3385723024CC3A, F28D7D86317D2F509561DD3392F3EF3C
+ 30: 9CD50C94ED5391BED5C8CE2A07F8955744B275B6C5E5B6F453A5E6185C03, 048E889FF70729C55582003ED6169E0C
+ 31: 1CFD6D8EF6F44265703544AFEB2BBA2A067BE8DAB412E071B66B70E357238A, 0A5BB055E00D42F4291CAB3813FC2946
+ 32: 8E6E6433E4FF879155E0612F17EFC00AA8D5236EFAB5D9D6A912898F3124B588, EDF81BB73FF9288F315B988413432823
+
diff --git a/notes/gcm_tv.txt b/notes/gcm_tv.txt
index 79d3b8d..d7d46d9 100644
--- a/notes/gcm_tv.txt
+++ b/notes/gcm_tv.txt
@@ -212,3 +212,38 @@ GCM-anubis (16 byte key)
  31: 72DFB9E91A78EAFE758B4542206A4A957B4523A58428398C11BCF2AEAE1938, 307D0B876130E82804C1167E03B69B2F
  32: 7275C6EBDC2680DFCB73326A987D2FBCE83E40A9AEFE6351CFDA7251A6FE10A6, 895E6EEAA9BD88594903325A063CA45F
 
+GCM-camellia (16 byte key)
+  0: , 477650012AA6284033E1B85321EEF770
+  1: E1, 2E95EDCCAF3264B5178CD6ED0F2EDEEA
+  2: 314B, B11392D89769FCEEE4B8170F8ED1F98A
+  3: C7CF73, D79DF351C70A7DDA124355490EAF71D2
+  4: 3C369E92, B9345C0A6E509B10A1245F42BAC2070C
+  5: 6F5634E263, D781B8F61B104158D822CD04A9FE7998
+  6: 299A167791D4, F1707A7EF00815631F79AEF3F3CF2599
+  7: 61C5184DE525F1, 615524D1CB7DDA84EE5B91647449AC8E
+  8: C724705EF011DCC7, 5F78479065F8EE14C07C909F12AB9289
+  9: E1466E81002EF30043, 143651985FB01E9882D923615DA0587F
+ 10: E252A74713C90B153C30, 6166F77FBF04809553936EFF256593C1
+ 11: FAB8BC72140D01EAF5F015, 1756C4D44B412F078B0476DAD3711DA5
+ 12: 774DA96F528D758DC098157F, D169FD2BDE61020499B482786BF14046
+ 13: C15708A21A56963D342CCEE9D0, 9C3416DE3CCBB7BFDEB4CCB0A0B767D2
+ 14: 52EDEAE7AFC4D3C77E7ACB31B1AE, FA98CD47050F12F7A95AF55EA29BB57E
+ 15: 48ACDD91D755D9F8602DB17F41C1F9, 5A0CC2D372501E38ED3EC44BDE185E0B
+ 16: 9385B12D8EB0F0507BA643958F4EF377, 8FE23300220D1D2A8DEFF7BA69CC28E9
+ 17: C31A9198E85864D8BC020B5F61FE1ED596, 9865C80843631D26B02A0369B5FCDF8D
+ 18: 4D159E1705839309E31C95E12A5BEA81277C, 0A8907002FEC82725530B4FC2BBC2B82
+ 19: AB6B471DD358000FA8C489B06F448508AA7051, C87EEA614DEC03B4EE2724F6E1CB70A8
+ 20: BFB0EA4F27CEC231815F07ED50E3AE8156172BAC, 09244CB698982CDE8C9030FC309409A9
+ 21: 259FF16BCC807B01FE4870161CD0F06A92DBE886FE, 86A9D502C6BA9804D26EC4B8CA419090
+ 22: 01FCE8F5DBCC4B2351A3319EC1737A84E8D3C959CE42, F337E99A62357057BB508398443E1960
+ 23: 114602337E1655C3965EDB3E7BC4428F7DAD1485D5FF05, 67287E94DEB5D255D512E89508E85B47
+ 24: B0B95F745C9433B741F8EB6EE36117C979CA65E6B9D8E595, BB75BABB42D9C73C4CCF8F9E1F9CCE1D
+ 25: 4DE486D47096B3EB1AD2C6A6F9248DA1FA2623B339E787DCAA, 7BED5402F5B5AC690488C6830D484FD8
+ 26: 40C5770A6B0A5C14AD168C262BBB3BD512E12654F6F57B13280E, 3E123FB667B2187D2DEA581C1E1EAF3E
+ 27: CF20B534737142322FD08B2AC9602F4C447BDD91BD00FD820ADE78, EA8D30E6CA004F31CFCCCB47F0BF7A62
+ 28: A61AAC29A28EAF0192E3B4646E0421D254B12C3D11F491909D18712B, 92B39BFF07D93AEDBA3AECB974859A17
+ 29: 6782FAA7F0D18AC1989FAD68C5C2258742EC691ABE47F744E6E795FF74, C63AA120F2889C6996636DDFB15450A0
+ 30: 79CB100D91BC41C73473723F5069B5D38C7208848B885E729A9604BB053C, 195D327AECF7F6D2BB1CFE019A0C2C0C
+ 31: 7753C753224B63EB00E2773D5CBA726F2B2AE54097E13A2CAAFBAFE7F53791, D344D335666E06DC87E8E30E6C141DCF
+ 32: F8BDD6BD3B27237424BB4E7871F9D893D204D8A4843E8AAE155B844716E2BDD7, 40806139E1038B68346931AFAAEEF1F4
+
diff --git a/notes/ocb_tv.txt b/notes/ocb_tv.txt
index 6429228..78195e8 100644
--- a/notes/ocb_tv.txt
+++ b/notes/ocb_tv.txt
@@ -459,3 +459,38 @@ OCB-khazad (16 byte key)
  15: D870479780CC5B3B13A7A39029A56F, 003D3FCD31D497B5
  16: A47BF1218AC86A60F6002CE004AF5E50, B4EC27091D5DCD58
 
+OCB-camellia (16 byte key)
+  0: , 6972CC27A9711EAE6654851AB8E0C53F
+  1: A2, 208D783961FD532E14376B4EE904FE52
+  2: 1177, C7CC74015F7EDD9A72F7435494D8A050
+  3: 0F8502, F1A708AA0F485A554E2E76592CD9D7F4
+  4: 9986180B, D47186A8B539F890824DEBA223861ACD
+  5: C0FF4519C3, 4430A9453016E4974CFB5380A1F3E95F
+  6: 2AC54E3E6A0B, 6E320BE8DAF4BA0462A57BECC574740F
+  7: 846053E1A37A6A, 5B91B680B92517781DC362C2F3E144E4
+  8: CCB09ECFF76EEE2C, F91E7E245F4C8A404F3ECC7DE49261C3
+  9: E049E2AA271388106E, 8C6981A160D831F4DC57FACE5ACCF006
+ 10: 761782341D52BA8AD12F, 672DC4B06DBBCED80381CE4845757F0B
+ 11: 92AD781DEC4549940265C6, DB04CAABC54E71FE1A9C41DF1ED5C52E
+ 12: D507B77EEE9BE07EAD700143, B3EFCC0B27DC85166E04E7BC39E45C58
+ 13: 5AA1AD6B9CAE3001D4C1CC4048, 424D8A22F7B9ADA30AAC0C1D3D4E77F9
+ 14: C69E96F7A4B9A6F0F2C7EFA72C26, 678144F802AE9DD83D11877779B48972
+ 15: E2596B3FE48EF6EC50D857C8B4E3F4, DDB3BD2B8AB2FA71C7F56C8E57AFF2C2
+ 16: D81664A002E03A75E08CF16EE7670E97, B56A0B0955E15E62C557C6E66782AF4C
+ 17: A8F2696A972A87C784FDC775439470D822, 36E3AD03CB18002A17D49E466CE64814
+ 18: C2B537D807BD1ACA734AA072D9C2B836F588, 449B05D145666D1E5A92E204FC3507D7
+ 19: D5418F1288BFA7D39D23B3C6ECF797397D3D44, B0CFBA612544B8AB159E9D4AD1FFB3D4
+ 20: 2F9522460182291C6F264308E0363B9FE312E517, 1EE4CB38075B67463FB9DE26DF9D581C
+ 21: DF2881568BECA504A66E4B15BEA58AE6E99D0270E6, 3283D46803FC33098BB262FC1D2B2157
+ 22: 4B0083A4CF7E166C8466A5B991AD0CDF71F9DF010EE7, 7C91D9A5DF6C76CB02D83D8C7F3D8D07
+ 23: AC0457474B4193647D62906BD08D8C8EB32BE151555B68, 0A448FF3C468D7CDC945724172CEB66F
+ 24: E6E7786EBECDC296F072CD66C89141C700DE2A8B5DBF6549, 68ACCB5FEC04717FB21FF3B46A34BC74
+ 25: 860865770047A9798D90C9365E9C9F8210CB804D785D65E2C0, A58F22FFC4CBFE3BBA451BE4B3B95723
+ 26: F157588B4F98D798E6850D8F04ABF9905C1BBB2D055ADE1EA424, D6960C1EA6DAF225366374333D38EBDB
+ 27: DE3431977821BC861CD88E4236BCAAAFFE3C894607498FB8D68746, A3D23729464BD38338F4AC5B4D9F5C81
+ 28: 3F2F0AB546E118B76B937D539806DC02D02A5D42D64926A9E1101D66, 3C0D2D23F5DAF7D36DDC0F87B4163F42
+ 29: 3F9FFAE1D7BC62BB80A2FA2728FC33FF02E26CB9F52EA8D03FFE95A49A, 96B45B3F946E629ED974EFA7B66F5DDF
+ 30: A398B66C8425CE9E8A6BF5AB900CEA1EAE811E06AC7BC0D69A53FB2015BB, F83411C72B7DB201B254565D1DD8D1BF
+ 31: 9C760ED6C10A80C52F092ED20AB1D03A52427B6235F3C7FE7541033AACDD74, 8AB98FCA89D1245B177E0AC06E083024
+ 32: C38F260587B3BA9919601BD0A56909FB36ABCEB8968D08DD6B74F1EF5ED7065C, E357D0D56124276790DACA38D95792BB
+
diff --git a/notes/omac_tv.txt b/notes/omac_tv.txt
index 56d8da6..9f8f337 100644
--- a/notes/omac_tv.txt
+++ b/notes/omac_tv.txt
@@ -459,3 +459,38 @@ OMAC-khazad (16 byte key)
  15: BCAB623CAB7AAA23
  16: 9BCEAB857596E478
 
+OMAC-camellia (16 byte key)
+  0: B5664C5148FFB45297703BCC46C19E4E
+  1: 126EC31A554E8B3B635DE4617092ECE8
+  2: FD57148685F4AA85AF48017AFD72B410
+  3: 1427607464A408C1775B4036509E9659
+  4: D8F5A7112CC8A9DF28B331FE7184BF08
+  5: 0E29B0F09409DABECF645F05C4A5717C
+  6: C4155442FDC29685028AF4AADEDCC266
+  7: 92356ACB98AE2EDAABE0D3ED0C90772B
+  8: AA3C828618F72258D91BC391876776C3
+  9: 189458BA4D98E85802E7028E5C57A25F
+ 10: EE652D70328DA00D63B42A5E85D70E63
+ 11: F9D1E5F8E1539F2D657A047755CD232E
+ 12: 56FF5979FD3DEAD90EAAAF79A9AF1DCD
+ 13: 7E8B39D459D5AB449A8C5917B0CD0C4E
+ 14: 822D9B9C434C6FF7F0E5A25281740A91
+ 15: 654909D2836CCB06501CB359C717C1B9
+ 16: E8996FC89D47C91543B7BA3DC1C34B73
+ 17: DC29D51B2372DD7564CF56AF8702924F
+ 18: AD74D081197644DFE2723CABC991B1AC
+ 19: 26145C6DF074CA53125F6F386FBEA373
+ 20: 72C6C760A70FE410FAD113D8BE711D75
+ 21: 099D3B5802D7FB699B6B8F031BE10B3F
+ 22: A9D5DD3988A18AA7BC6F9C050BDBE8D2
+ 23: F7E99E4C3C7D127FF04FF325F7B06997
+ 24: E99A2F7547B5C6EDF3BC2EC2B8F05198
+ 25: 46C42FF49FCCFC49FBC99FEB08FEF10A
+ 26: DC349D600A754F73ACE6A7D2D00D3551
+ 27: FC2E5434ABBA44ABD9D724A9BB6CA2A6
+ 28: BA923927BF0074AD73BA8A6914194297
+ 29: 7DAB39F8D7E5CB93265568E6713C7CCD
+ 30: 9F60259B759B68E1C8F89CC36C7E170E
+ 31: 7D611F8BFEF0491CED8815C0E3D4CAFF
+ 32: 31E04DE5F9D1403C660E39891DE0D8DE
+
diff --git a/notes/pmac_tv.txt b/notes/pmac_tv.txt
index 38ed683..a7b148a 100644
--- a/notes/pmac_tv.txt
+++ b/notes/pmac_tv.txt
@@ -459,3 +459,38 @@ PMAC-khazad (16 byte key)
  15: 93098DA8A180AA35
  16: BACE2F4DA8A89E32
 
+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
+