diff --git a/demos/tv_gen.c b/demos/tv_gen.c
index f3dd7fa..196c756 100644
--- a/demos/tv_gen.c
+++ b/demos/tv_gen.c
@@ -420,7 +420,7 @@ void ocb_gen(void)
 void ocb3_gen(void)
 {
 #ifdef LTC_OCB3_MODE
-   int err, kl, x, y1, z;
+   int err, kl, x, y1, z, noncelen;
    FILE *out;
    unsigned char key[MAXBLOCKSIZE], nonce[MAXBLOCKSIZE*2],
                  plaintext[MAXBLOCKSIZE*2], tag[MAXBLOCKSIZE];
@@ -448,7 +448,8 @@ void ocb3_gen(void)
       }
 
       /* fixed nonce */
-      for (z = 0; z < cipher_descriptor[x].block_length; z++) {
+      noncelen = MIN(15, cipher_descriptor[x].block_length);
+      for (z = 0; z < noncelen; z++) {
           nonce[z] = z;
       }
 
@@ -456,8 +457,8 @@ void ocb3_gen(void)
          for (z = 0; z < y1; z++) {
             plaintext[z] = (unsigned char)(z & 255);
          }
-         len = sizeof(tag);
-         if ((err = ocb3_encrypt_authenticate_memory(x, key, kl, nonce, cipher_descriptor[x].block_length, (unsigned char*)"AAD", 3, plaintext, y1, plaintext, tag, &len)) != CRYPT_OK) {
+         len = 16;
+         if ((err = ocb3_encrypt_authenticate_memory(x, key, kl, nonce, noncelen, (unsigned char*)"AAD", 3, plaintext, y1, plaintext, tag, &len)) != CRYPT_OK) {
             printf("Error OCB'ing: %s\n", error_to_string(err));
             exit(EXIT_FAILURE);
          }
diff --git a/notes/ocb3_tv.txt b/notes/ocb3_tv.txt
index 5e9e8bf..64df75f 100644
--- a/notes/ocb3_tv.txt
+++ b/notes/ocb3_tv.txt
@@ -3,567 +3,567 @@ are of the form ciphertext,tag for a given NN.  The key for step N>1 is the tag
 step repeated sufficiently.  The nonce is fixed throughout. AAD is fixed to 3 bytes (ASCII) 'AAD'.
 
 OCB-aes (16 byte key)
-  0: , CDE5AA0562BC4D474EFBB4120E4C5BFF
-  1: 9E, B60840CA7005A169C1240E3BFB401AB8
-  2: 75DF, C606FAD65B2CD087774CD0EB341AD265
-  3: 78309B, 26179C93AB865167FC583166E6AFD275
-  4: 0DA474F6, A55358F6EBF78F63C45AEFA5C63FAF17
-  5: 2BE7DEDEA2, 95E6590B2A19D85F25E4A76861F7CDB3
-  6: BE808ABA55FC, 6C9E74B2BA0D628834A2C2FD8AF9CF39
-  7: 7B20C2D42F94E5, 5B293A423119EF044A5E5E5E70FC87DD
-  8: B7CE5AFA00FC9843, D5AC1CF000137D8E0710DC63457E5F73
-  9: E8EF6A913D905BEAEC, A96A005A2A0F08BCEFA7169D69E347E2
- 10: A15B41ED2FE26F90C0B7, D8453A7F07D90AA3E48BBE792DEFBC84
- 11: 5CCED9699C5524623AEF4A, D7450C6465DF3AD2513B799521995821
- 12: AE70D6492673FC870675AAE2, 697EB5B96673EB7FE48A07A1F2C1E957
- 13: 23C3E43575A9D80938BE58D6F1, 2CAFDB3ADABFBE0EE48FB1DD31D67ABA
- 14: 235E50ED798584EEB7CE7F31490F, C26DA5513F19D6C9345EEE2D9B24EE30
- 15: 99BECD55D0CA96718E5F9DDDD127BF, E1A4FAF9F68CD80C997EB59FA8B6A38A
- 16: 8EDDAE4DE1D32CA64D741A8D0371745C, 603603E91FB7EBA3F9247420C3AB36FD
- 17: 52F17D54375D514A518EFA8A1081990846, 7B5C4EBB3B1AA523288770151550B97D
- 18: EFC039545414A9D26B58934BBAE30D587082, FA4CFB8B873933154A24C58A1F469146
- 19: E4756B6C55FE1973E4CD1ED5CD15AAC1FAEFD3, F32D28D2559EFF18B2F00F344DA975BA
- 20: 8F47FC80A73ADDE004F69BCABFBAFAAC7EE38D50, D80913FBFAADF1C5C3FA8734C74DEBBD
- 21: CBC47AE59B62F9A5AC8B1A0B27A54EA98DF1FEFE29, C34597A3E452216F9D8B53FB32E11B86
- 22: FFECFCE641E2F16F656A47157248D39C78A928378831, E8D7ED60F3BD44DCD676F06C43BF18CF
- 23: 8B4C8A02A2D2CA06691A29AB7E856C058946A404DFB78E, A8F44E1BDF86BDC4CC80BE55B2A8906D
- 24: 97D0A8D76D8CEA8E378B66E94B498127997C60A9EB0E1D03, AFB2B208164DBE1408694BFE8E87A5B9
- 25: 81BB7CC0A206760A631EF633BF5897B407BD27A20C28DE334A, ED82026689CD89BD4E777A74DAC791DB
- 26: AB69BF543CB1E731CAEADA9C8F09AB81720D446BDA453AF87D1E, FC588E24304E8CB47ACDCF1AF111DA99
- 27: C5FC023E000F16C42CE63AB26C3FA4FFD8373E4EEC97AB8EC0A9CB, 99598DBDE114FCFED0B5EC710A61B99A
- 28: AA200F54FDDFEEF3AFA3447149F5996643E4E63ADD57339129F83BCD, 1C6645CC83112B031F156E9D191BE806
- 29: 3E75A6B5DA18FE0F918094CDE11F0109BD206D68C570E4DCD7C0BA6E05, 669779DE7B8E1A657DE51C4FBD8FA8FA
- 30: 79EA616591785C8EA654E90E819920E20A53CB420147527FA9D2F92B9835, CBC3557ECB9D850CA17ADB726EB020FF
- 31: 35709AAA8B6C28254C1A75FE6CF13E7D90EDF1AEA677FB1057FB6C0ACCAB98, 491E0662C259D03C2E72A58736B6F709
- 32: 59459AD454CCECF40D4FF30E748CD1BA17314C9EF158D223AE2A736ADF7E2397, 2C3240DDD2FA281A567D38C4FA598ECE
+  0: , B314B579B54365D9094A8A7544FECFA7
+  1: F9, 3E49FF310B88634BACA91D55DFBAA185
+  2: 04B6, E13FBD06086CAEF7AD042C93D7BB6FB0
+  3: 5E9389, 04216D3227A79ED90D60637AACA49318
+  4: AD4A090A, 71FF49510C87EE5FC004162F146D4C1E
+  5: A3D8218932, 5AA9FE79861F6B5BC8F3E238D0221388
+  6: F8FADE0FFCCD, 04FB1C91F3B23E58F6B9614648B1A653
+  7: 92C4F8CC40044E, 232C049DA70A9AB4B6B3A03B286180C1
+  8: F93B1744D7C77AA0, 21FBF572E7FE551ECB5025BDE9ED5984
+  9: BA51E012FF90E40800, 117280C3D04F2376D4B2F020AA661146
+ 10: 71CE4295BF396C6B2338, BE21F998166D7EB96285884217FA8086
+ 11: E8BD27F4EE71D7C8B92B32, D6004359B714792C44B1EF5F9CA04F3D
+ 12: 44F561EA59DD0DC2A2FFF982, 6AAE8B19D5D6FE35A510E53C35C74AE8
+ 13: 644B54237E20C68249B4FCE531, 806FA9F25EA420A8B4CAFA7620C7256A
+ 14: 2AC152EA88E036E58667960CAA99, 04351AF74BC428C37282EF2A85C85B08
+ 15: DBB19579CA7E525544CA6893556BE0, 6847407644710A2DDDC128E4C7223FBF
+ 16: 457557479FDC7F70CCDFDDD53EC950CC, 8B9C8D93E60A881F625B82E200B021BD
+ 17: C07EAF5328D338CA4601560F513A2A4AC7, E882049660635CF0D13F6058773141DA
+ 18: BDEAE23389E05F719CCD723DC972F2C884D3, 0E40806F30CF1F788C3C6D10B89096A2
+ 19: D5F334BC7A5196E460D52F89E129F33D2C9F91, 00C4EF195CB474CD880DF1B6915EA357
+ 20: 74435B9ACFB72DF8D67DE0BBB2F18F34EF1C5962, B33A91F1AFEE65F56C781AD7047E55C4
+ 21: 31618C38EEB4A77E0769131E91F4814C7DFB825409, 8307F47A53FD8CB7B82211E8121738DE
+ 22: 45ADEBF8F29313F13C3919A4246C96142485B58D074C, 268C4072B1FB58F0491EFF34756C1250
+ 23: 2E11364612BE88875F506FD6603CBDCCA10188B3F6BD79, B782DB9E311FA0C3F1489DA839CF37CD
+ 24: 565DB17A001D87FF3B432D80CB6DCF84A389E306845D4BAB, FE514CA6EACFC08D6CA02D4F34CA223B
+ 25: 7819A4A63E4ECE3FB6DBC5208A5E0ECC5803E22F28C083C6B8, FA00969B7C91711E0E70027D13FF0407
+ 26: 27186491315F2F00D125C1266C442FB3C7B6FC824DE4A30B3EAB, 084DA787A8AA2D108B95F3A5B69BFA52
+ 27: 3545DE774BF9CFC3AF51602CCEAFDAD54302C8FC75C3FC1794C6CD, 68A18C2F767BDADD023D85B722BE8D6D
+ 28: 73AB104D83AE82A4D0AF53065D488EEA47C05E201A667581BB046E98, E65DAFCC4DD662232C895602DD8C7582
+ 29: B7B26992F361B7D9CE2782304C6C62495E46216304075A787395948752, 38F99FA3C086CE6B2620302931DB0BC8
+ 30: ADB1E4FC3217F82C2851122B8EEACCFB1C731565AFF856E201E8EEE702D1, 615A3A991F4BA240768FDCB4D9CF16DD
+ 31: F2CF0958F00F11E8564CFFD9AEC71451344E2A35DE7D82D1AAC14649BCD34C, 04E97E02B50CFCC86EC0B9A958057F66
+ 32: 914755B90B12CF5720CC0176AED145ADEC862E51B237AFE862477CF91D729768, EEDA6BE8E7875AA7E1E3393DE81FBAF7
 
 OCB-blowfish (8 byte key)
-  0: , 33332FA5A79E3645
-  1: 38, 66779E3613C5540F
-  2: 3443, 48D3E25F4007A1E3
-  3: D1ED65, 486767AAD7B4DCCF
-  4: 6FC4D34A, 50706E35463CE200
-  5: 7F05718FCB, 4AFB55795A94172B
-  6: 9AAA6E72BC1B, E060FA18168A31FC
-  7: AE90EE07B41CBF, F47C611E9C02D095
-  8: D4D67E11C84600BF, 9DACA76000861745
-  9: C4DBBD53B65A321CC8, 9E5A12890282120C
- 10: 74C14E2DE4BEC704CF1D, F1D432FBF8B17265
- 11: A57514B6A91B733A1467C2, 6E54A6A9F56D8459
- 12: 9CAB77627D8EFA9438451F3C, 4925FF74D2CDB33F
- 13: 2E5BC3A020EC249DA94E8DB4E8, 30739AD56648C917
- 14: 807B29C5AF9AF93906CFE876B081, 97901FE44444A99F
- 15: 6BD70492F763A704CD5351E691BF07, 2459A0B9332CF14A
- 16: 1F4919EB6CAD8D19B755157FD1A2E89A, F7EAE8DB5F5FA9B1
+  0: , 6C3BBA12B543C3BE
+  1: D6, D72F643440F08AC1
+  2: 8208, B7FD2E2D5FF4B273
+  3: BB2B8F, E6B6A023460F07B0
+  4: F2BC4A6C, 7B9D26784038A593
+  5: AAFDBD8EC2, 24E6F671E7A0D394
+  6: 929326B18E7F, 5C6CEAEF7B63DA71
+  7: 085C9A0013CB23, 2C0BA203FC706398
+  8: BA45E34414383ABD, E367DDFF2B9E7B51
+  9: 1287AE007E03F4B6B6, 6EDF52831D00F616
+ 10: 2871B39ACFE7E8D7C326, 9ED4DB2D5ADBC902
+ 11: 46DF7AAFBE096C26536BCC, 497B8F7930B03150
+ 12: 7F794AD0A6673F9DD9BA09FB, 4B6817508EF74773
+ 13: 138D1877D61021E526EFBB9F9C, 0E18238F3112C0F6
+ 14: FFFF1DDC353F4C0F832C73D4C4F4, DCFCECFEE8B0BDE8
+ 15: 5B8F209B6FBCCF323773CDE26B1ECD, BE11C1DA023F30F7
+ 16: C3C1438B50A1124556164A38D12FEC6C, 532740AF7CB776B0
 
 OCB-xtea (16 byte key)
-  0: , 5F751041CDB0C2B5
-  1: A5, C48C22CADB797CF7
-  2: A3E9, CBB821F70FBAEA3A
-  3: 7CA3C5, 686647FF8466C56A
-  4: 318C2DA8, 65C58584A3E9118A
-  5: A7C02B6438, F87A48C547971C30
-  6: 314FBFEE9BDE, E62DC6E65FD35E8B
-  7: 87481270584EB8, C582AC684B8D02A0
-  8: 1E5E0DD030860CBC, A19FF0144005994E
-  9: F0BDCCA3C2463850A5, 15420E4C10821445
- 10: B6D1C598C7046F921299, EE9C28659EE2927E
- 11: B1376A4D9B3EF59B873917, 0DD3005E47CE72DB
- 12: BC9D026F374A89B8A45E55D0, 09DA1DDFDC3A5463
- 13: CC8DF93BE2D71601CDC52124A7, 9623D92C2FD9D62C
- 14: 90854B2161951CEA934AAB4E2B6C, E80632AB9F2CE421
- 15: 7ADE7A19FD0BAF71BE1C6DA601F6D3, 90612EEA15A64111
- 16: FA21FE68977D60D51ED897915945E5C4, 1A9344DD8E25D45C
+  0: , D00F0AAB89FD2268
+  1: F4, 5EC48A975A5284D0
+  2: EA67, 4D7DDB44F00B1914
+  3: 19E6F3, 5DC77905DE7BCA27
+  4: 164F891A, E41BFD4F3D256B72
+  5: DD08DE502D, BB92537DED07B1D5
+  6: B176A93723F9, D6B5BBE9BD9DCC2F
+  7: 9F0CBA46793F6B, 3936294EF1745B93
+  8: 04CC55A49B65D296, 4BAD576455149F19
+  9: 7D6FCB8FF28FFE7DF7, 40FEBD5048374447
+ 10: E5B23D64643BE920B5DD, 7E980F9F6A1C1E24
+ 11: 07D48D6A863286C485C169, 14FBE819A4E05066
+ 12: 4DF565F388F75E453554CB98, BB63ABAE98B89A0D
+ 13: 3B839BF161A9A873C67D864412, FFBBE368571140CE
+ 14: 35D0E47C7B52F63D9CD52B5EF7C1, FBBE7080BE16A358
+ 15: F657C137AD01E24A2E09EAE9669060, C61609D640AED997
+ 16: 06BF9F739218FAF8469393E4A880401B, F1A833E2FF0F59D1
 
 OCB-rc5 (8 byte key)
-  0: , 4287F61BB46382B2
-  1: B9, 753F79A4BB0CC986
-  2: 4FC1, 77132F07D73B20C4
-  3: F1009F, D0113ABB5CD465FB
-  4: D68B146D, 5CFA18D483741043
-  5: 3EE7237B8F, 0AAF3E6746AC93E4
-  6: D6C5D714B773, E1C3A97890A4B86B
-  7: CF1ABC07E56F1A, 96215C8CC5471BBF
-  8: 9783988AE164F9E1, 0680B375E3A0D562
-  9: 9ACCEC35CF126304F6, F74653152A177CE9
- 10: D94C215F59ED195DDB5D, A5AD88DFFAA297F7
- 11: 911BCE3E464282F3F67A3C, 561F90837B05F0EE
- 12: 48F8A06D30CA2C53D2B7176C, 5BA9AEA8003B2DD7
- 13: B66F45A34FFA2CE7086D63E1EB, 0C8D09F2F4C46C79
- 14: 15EFFA2ED88EDBE91FBBAED12128, AFCD680C7DCDBE27
- 15: 5B54DEDCB7D14FD48373C1B93CF084, 226A5920A2E712D9
- 16: DDDACAEAE7BAB3029B1D841502F3F8F1, 98527F33CD759F1E
+  0: , C8A6E737A8E6C157
+  1: D5, F9FC436713D8C578
+  2: A52B, 620A27B44F9DB42E
+  3: AA4253, AC7574A061DBAC3E
+  4: 3E9241AE, F5011F6F49F35AB7
+  5: FB39924246, C53004198FD2C046
+  6: 847A3249B1E8, 92B4300BE557D04F
+  7: F8BC0AEC7A0DDC, 27CCDB48F5AC84AA
+  8: 5A7A91DFBE572B10, 67D4775F5AA660F8
+  9: 475F7E67910AB33762, 2193ECC897A7E0A8
+ 10: 8F7254CB03D427D123F3, 2814085372D28E3B
+ 11: 0669B3DF133675FDF0E6C4, BD2282F47C5AB17A
+ 12: D3041D4F0C79FBFE6155DAAD, 01228ED90A077F1E
+ 13: 2A46C3FEEDBF49B14520FB1786, AB61B06971BE04FE
+ 14: C3E5F4749B28E6C70263B9A49411, A0D06FCEC6F8C051
+ 15: 5A307C6E510C7B7F0838B9FD3B3CC8, A7F7A41558848158
+ 16: C2E2DD4DEF101AA2EF8696B9FDD24B03, 614D0606D5BC577E
 
 OCB-rc6 (16 byte key)
-  0: , 3BB834902D39E5E91D89B0DC0DDF65EF
-  1: 2E, 9B9135C04DA988AD3D2A71B8330EA0C7
-  2: D7CC, A4D984EC457906AC76D633086DDA5FBB
-  3: 394491, 35413A2E1936F2C5347BC3F11DE5C5E6
-  4: CDB4E8BC, C92E3FB50FDA7292D8889CAF1239C669
-  5: E073807488, 293B4362693F5CB7F87B499B5DE802FB
-  6: C423B1D2250B, 4C1C672BF015B68FFC5496C1E4845038
-  7: 0A9221803183AC, CB7E94F239CDAFAA2E85C8F6F84D291C
-  8: B11DF4E8DFE0DDF5, 388330327A540AA342FCCE9DA8722974
-  9: 4F22BE632E97EAC40A, 52A80B5BABAD91063F005A90366F5D03
- 10: C078544308477C436C1A, B71ECF0393B5EDAC6A6885E589B8495F
- 11: 70D055E1DD32D2968F27E9, CC203EB94EA969ADA6AC66E38114AC15
- 12: 444A3B67B3DFBEBF25CF1EB8, 0D46A4E88E25DE2B876B53D6221BC155
- 13: 82DFFC0FF3AA208EAEC9AFFC95, 90EB11D825B92AF732659F5E3A57AB3F
- 14: AED1A39332ECFF633DB4DD4F53D4, BB14AB91B3CCE190F780BA05D94B4FF1
- 15: E98CDF3BAA07AF91F30D984D1B31D0, B74AA68488959CEB0434D0DF258E6206
- 16: C6EA56068EC393603313926A54E79808, 8D7EC011133F2E419AE27DB99265BB51
- 17: F28D6DC79AC812B4E14925AABC7A18800B, F125CFFDA992F6336D88E3D6CD5DC739
- 18: 419AB005309458BF84572AF5EED46DC0D90F, B0A5A2D13EC928BF3DD2434079A20528
- 19: 64D64C8F3ECDF0DD43B6BEFA045FAE72D79D0D, 9FB86FB186B57602E609F08E76FDD8D0
- 20: A8EFCDA63D38273404E91241C40992A82DB63F23, AF116B5369C3B6C5A8709252537DDDDA
- 21: 39A5A5EF3CD91B27138BBB784CBE027B57A81603DE, ECDF09F22FB185D110F6997C891F8569
- 22: 464381184976612C15D1589DC1AAC2C922D69F3FFD31, C18416F51FA8502C06AAEABDBE5AB22E
- 23: 21F0118E17188E09D5E5C6E53DB97BA2585A122FECD6E9, DD7B583A17B07967917D7603D453301C
- 24: 109AE231C1810250AB181BB094099D4B21B08B948A9F7934, BA3BD871DCEC2A0D75C1B54F3C5AE870
- 25: 080BA8AAFB8056A102BFB37864FF0533278F2AB3A23D42F719, 4566DED8A3B4E9CA441B87EC18BD5E4A
- 26: B7531B5B0E7401491248451B6833F738F4700B9F7FA13C262125, 9F6B4E956A338907E34BB91EFA5D2A26
- 27: 7473E5550DB57A75C1E63859580DBB7E0E4704E4360EF4AA0FB3DF, 0E1C543C18F93E853143C8B21CDF6327
- 28: 8D8CB57288A98D1A3CC315045DDAE1388C90F6C6EBD9704E91F9657A, 9FF33BCB85A5AE936244B7C24C2F7909
- 29: D4951C16BE95E67C9FA9579465AB44187C1777B0C4050D3878FA82B7A9, C9F3EF7588B041DF17E5333EB397D015
- 30: E28CAEB88F590D3D7D0FB6F7DD7EAA88C091D67B72E67B297E280F048C68, CB855FF11691C31A423A88525F7941EC
- 31: A043763CAB64783E8637382E5DCA023356DC8FC02F7A9F314B448DC7C2A4AA, D35E089232C405B0928A99149555C406
- 32: DB2F18A11D7726DC6EFAFFDB160846968EDE06A251E03CB92ACE0F435E6DD698, 7FBF8E2F2047216C0062B6B070FC39C5
+  0: , E55863F7B850CEA28023BA8E2AB1F4FD
+  1: E5, C1F5CEA421F84AECACF622BCE507BD21
+  2: 6443, FB3B7992E057AA4A0E31E8718093740B
+  3: A1E36C, 0BE1B8CC538E60FDC36165AF5D273F41
+  4: 4891FC23, C6ADA69F1A613830CFF5E564F01FEA93
+  5: 6AAFA8549C, 6DDA8C3720633B9E83BBF2DB356EEBCA
+  6: 254EBFFB3C60, F092EA5FE0DA6B90DD5F2FB75FF92960
+  7: 1DA9F258ACA84E, 762E38C6545C3ED4AF970B09C6747CFB
+  8: 289067E54AF4FFC9, C04CFAAC0D919AD6027A7D923705443B
+  9: 65E083C54F9CC7C228, D6A4A1AC4144217BC07329BCDDD6F27F
+ 10: F78CE1BEE4471E9830FE, A503FBBE2378505EFDD50AD4FEE587E4
+ 11: 31874B00827B810588A635, 287CE2ECEF9247BCBF7537DA052E6A86
+ 12: AC8CB1138A4BC5A19BA96DC3, F443C67A2CC51FE2DF38A8B6C0F08220
+ 13: EFBFF1BCDF7B3F66A402A01459, 274A2DA9F33DB5203A1EBF90366E5064
+ 14: 7A47F5FBA688594319CC14B33458, 9107C62E140339F3FAB445113331DE4C
+ 15: 69957805FC3C51C59F9149306CCED0, C887CB0B1D880BE0ACA16AC513019721
+ 16: 6735D0D5D2ECFB68B718B8A95AFB8922, C97E9187ED00C6D9FAFC76511BE46AD5
+ 17: 00F51550A1875A3517FDE2A3038E1CCDAB, CDA7AE39A8B8708E91A3EB7C94FA7BD6
+ 18: 85184BEF9A31A8F4CBB5CAA56FF5C63845EE, 5BFA7FFF2072E7B4D9AFEA21D23755CE
+ 19: 025F6ACB1A85173A639D8FB24ED4B1E08339B8, BAB248C26F24FCAA94328C9BB0821E55
+ 20: E18DA8E16897E888C73743E0BE165A6F8CC94A04, D759682D03ECE0888B07915D6E3F5FC6
+ 21: 6B94BCF8DE2F326BC7D6BBE1FE7B744E25E717CDC3, A69D284CB8B279297A4FEA3B6561171A
+ 22: B9AEBFF5E08E82451A486BFFAAAAA2564F36BEB8B00D, B0F0B98B97DADF33B25AACE289D8BF9B
+ 23: 5F3C5797CC821B3A3B8559C5A5AF422F85B2803B7A4D9E, E01492AC89D7CB9F87FB8B23B6E55152
+ 24: 2760B653AE34625A78ECC775BF4584DDE6B2D0A1063C7B8C, 2FDB63B68839C6250E0C5F16351C31BF
+ 25: A5CD59CCA78AA4A95B1C1CAFABF90230FBC9F6BE66E1AE7575, 0EE3390FF12980B9C3DBA27802FA7F01
+ 26: 4E9D19900631CBBF3F2326C129C90AC6B5BC3889E1392A05E542, 3CE0EC540949EBF4D70E98B17BC37D58
+ 27: 5448E01EF054DC8B4B6C148CB05D5A20F50EBDFA42E59FAE178058, BD64C93FDE56099E206AD57958A259C4
+ 28: 9D62242B65C51F9BCF41177BE9E992AAB7721A6EB3584CCB25FE13C1, C93E44C0AF6559D8045D89B98CFF59D4
+ 29: B72E80500D0ECA63727E82569B3BCE66F11DADBE374BD0672D0880645F, 8419544A26D030E30085ECF8F97896F1
+ 30: 28F27958226709140EA0867D285376E1B14890F44A18A219E1CAB02FF62D, 77CA96AB5A1F36E7564B7010ED08E540
+ 31: 80F7CA76B988519731D76C4D60DA0E5C77BEC17368C9B237AE60A910312334, 962C1F0C4E7C8137863A48E6E5BFA44B
+ 32: 1B43CDD2D0E13ECAE95F2DE4782760679CDCCE5E74A3C3E6614BAD86DFE073EE, B5A6A14CA26E60AAC3B5C9DB0723ACE5
 
 OCB-safer+ (16 byte key)
-  0: , 818F824701DF2D6F384E39A6B33C8C7B
-  1: BD, D1BA735E4601B977CEE4C846DF801030
-  2: 97E3, 4ACAA433A1F4BE2459D8FB5A46C83D97
-  3: 54A32B, 837526FBF9334EEE32444898D72A6FAF
-  4: 550BF0B6, 66993BCE9CEEBB0E42E734EE72F71F6A
-  5: B9DBB41DDA, 5BF83E90030911DEC1F706A0CA3EAEF8
-  6: CFFF407F7559, C3F9471E5B38384FB1882D4B0FCD4164
-  7: 27AACCF405075B, 16E59258A2639EBB74A622FE58B10D50
-  8: 6E0E5FCE730A1E0F, 74F51050BAC882A782DD1D66A83367AA
-  9: F4A70127DDD496C035, BD93EAFFD5A2C36A354950DC3548925F
- 10: D6C82811BF1493C3065E, 9252733A1C829D9328E810D8E1A68AC2
- 11: 6AC43EB973A878E80ADF13, 9EE33A4F9F9FE039A7BC0B3395AABC24
- 12: E54F88B6A05961399FD4A842, 11354D65DB61A2F42683E3ABE65C1518
- 13: 2771576E1EC6533061395C206C, 1BC2281E33BB360A7EB488A87FD3422A
- 14: 59FACB5C29A24EA7B2ACFF73C3D5, 1D1E65A92DCE815BFC61C067F919C9D5
- 15: CEB8B9CD33CBB8638BB3AA463DCAFC, 4B6307B67D62F0C9C2A17407E6A6D37C
- 16: 1E9BF87DB8A50018945D20F1711939E8, D21689B5C7AA20421E1B0543C44CDBF8
- 17: CF466CFF02460FDFEDDD55D32E7B81F7DE, 34853E04F800B867FD81101337396B5C
- 18: 7825EC997E35D69B7807EF09520FE262D9ED, 0C56E50B01DDB6F79C0796F644566365
- 19: 0DE8DC870E440E81E884FBD240F135C0C51904, BFA98A06FC10F61ACA04A3EB83F4E4C9
- 20: D7B6238F58DFA34AFB01F7E863A6239A643EF85D, 72D58FFFCB8EDD2B212E384499556655
- 21: 0C39A6472C20069C81B86D017C29996D332A7934B6, 00200B481BD27D3E7F3B5A93B01E8CD8
- 22: AFD445996544CADF9DB1095A8ABD1B85139C49ECE807, AFA537A91C7B5B461285C1916587C5BC
- 23: F5971CA871AC2AD43E5FD3B7F135F8F114E1CB8475CE3F, D2AEEFCC904BCC19BF1746D4F4C12B2F
- 24: 0E501E14E1D90A21882A39AD8BF30415A5A19F45F930C9B4, 994BEFD4A19281466D6DA15A136AE7B3
- 25: 91DE86170B63B8A3429DE5A9686CC7033A76ABAACD196E1AC6, 1D19585EB7F4215499C3E5E95E6D9B3B
- 26: C32E3723685B361A29A931AEA09029A3ADF4DB5E6FE03ABA1374, B7E237316BE981CF1BB7EA2C0AAB4FE2
- 27: A7C3BEA3BB8590EA4533EE86CF6A98F555E4C75C31648F7539FBA2, 4FED5804515A9C83A1CD7E0FF18EA714
- 28: 4B801BE2237D8E46B2989A4CB914929B9DED959F14DB78006ED1BEC5, 6A8315F87E69535EA157E1F7C46772F6
- 29: 868A2EB898BD7AF43846C7792BD0C30BAF0B278796BD8CF74BC5BF0BC2, 600A8C9D4DAA2907DA94F0F6C5ECE1F2
- 30: 8F9C5C2BF2C5BFB33535E5A7793D18341B9B6D5A788765196068843B0E49, 6EDC9F4E8BD16E030E6F63ECBAC407B6
- 31: 626D32D56088410B8B0E106ABCFB6B80A3F51C68A6FA648C45B93B5FA79A1B, A1C9660396698CDE92C48E5C79C95FB4
- 32: 23735C7C0AE0FF5FCAC7D16377090DCA9FD0E679248E04EAC56752BD0AA790F3, 7C8EE978EEF3E9BC9F5E18902CADFA94
+  0: , 8F56A79150DEFC6B2CBB3FB6E359FBD2
+  1: C9, 8E316BB1D0C29B6D7A5A87099B85B72A
+  2: 2060, BC6DEBA562045204F685BD4AD1095614
+  3: 0CB79E, FF5C3DD5E0D3C587F73B79871E18D92D
+  4: EB055446, 68712BEFD76001DEBEB0D49FB45753C9
+  5: E936796698, DACC5325D10076E3454EA244FDE2C446
+  6: E64E038A3E72, C790A04E48892CD267FC323EC8606BE6
+  7: 3530F74D417ACC, F0383D56F2FF810F37DFEC884A7F0189
+  8: 2B616C4A95A3C681, C2D5793720F925F74693C7A8E117860C
+  9: CE0C99100C05C3BB31, B1F94A461CD2F81E31AABB949E2B2866
+ 10: 2F4556261D59FB7104EF, F061D0F70B0984C57651ADC2C500FB90
+ 11: B0DC48C26496AF66330E6C, 68276FCFD1C9AC88C54429CA7714662E
+ 12: 5F2ABA85E68BE0FBCB8127A4, C1FF0E5E54CFCB1109E8707E6EFC5548
+ 13: 52560F88ABD9EF2BE8F5693CC9, FDC0F5DEE4C0739869C8D310EDE6D8CB
+ 14: 3FB7DFB38F9CB53B932C09BB4953, 156BFBDE08F2665A3F7C79F711042B40
+ 15: 09031E49212D7F8706DB42929EE5FE, 8A0F8A6634EFA7E56471178F6F906CED
+ 16: CED816F12E02E14B312C6DD520BDD936, 4FE5C914D17C426A3BCF5799A4BE0FA8
+ 17: 30180417B91D913762B8066964F01F7050, F9FF5A968C3B5D6F6F8ABD5BF23461F5
+ 18: 9135A4CE4F8DC27758B9F158F515F89C8B9C, 7B3E446236E33F999D7B586205B55D33
+ 19: FE2BC52A5AD051401471D2487803E2F70679E9, 902CB619F522AC61EE70C5407E23441C
+ 20: 7FD71CB30B9836C6CABAC78AC336BD5775EF3027, 7E6419511E3886BD3736D1BE13FB8599
+ 21: A946EBC8A4F779A6FF805B2B4F9D166479A25C71BB, 850E57C9BD78774FC4CF5BB1A956BD4D
+ 22: 1F3101AB8B7FA06DC3194D66F3997C990C79DD69669F, AC4962DAACEC80D993E52A2170ACF145
+ 23: F8BA79427B329475C7374CD1F48518C5064D3796683978, 39D4EE512DA456B0E6EBE7680766756B
+ 24: 52CD976F3DE59CCAA8E352161BD7867C026D39142FDFADC4, 7BF77402B6CDC953487A1A4C87AE4ED7
+ 25: 1A1D64F1B73C52B698FFED8DCED76292807AB3676004B63064, 6E16BCC6F312A92E80FCB10DB8BC659C
+ 26: 171AF49F6816848A355D92E7DBFD769587EA2B988076BA5D5918, 9F821AC305325BDB9B12B44F82882C63
+ 27: 025152E05F44E7F05C2B4BA3B0023544CFBBEC8F9A98C13E931E2D, C8E3228E2B74FCC935BE1802E092C346
+ 28: 96B96648528B740D15504E299E619A6D0B129407DEFD04C1BF405AA6, D0721CC578C44EF15FAC882A8F49617B
+ 29: 9136905B84ED8A403CA83DC0DE081CAAA0F8E4F775FE0EA1E3E20BF223, EB474F78BFB6BAC8E1B1867ED405DC38
+ 30: D65A403FB587A6839C071167ED096B46FB480468F7C1F702F1B2479CDA5C, 8E82A3BA76E1AFCD82E324FEAC9E3084
+ 31: 017E3A54463EDC279879A07FD7BFF1225CEE307BD8741B6013FE4C9A454EB8, 10449A44C1F90C64CCCA5D808AC705A5
+ 32: DB9C895FF4A59D407344B8254FCD416F0D5EDB2ECB639CF226DEAA76370FB79D, CFE8C49CF0E323F694FAB1805A85DC93
 
 OCB-twofish (16 byte key)
-  0: , 594164A8DAEA1C847BCD04E06EB69AA1
-  1: 82, D86AD044B55DC09DC6302700B728C9F2
-  2: CAC8, 910C748DABA8A3CEE24C888295E15BF7
-  3: AA0A64, CDF692384CB4A1F2B9355F7DA2CF6D82
-  4: 8558D35A, 4F542602753901709C33D1B3FDFBDBFD
-  5: E3AE8A5EDE, 8196572296F1D18D5AAAE6EB7B3DE383
-  6: E602A86B84F4, 2F6FE22A3A5506BA8FABA92CF153B53D
-  7: D9FDAC7CFC1C7F, 735A47BA7F9F8242AF59B65555A89D8E
-  8: D1ECDD40593FC01A, E98A3D894F217A645C5576EABBD0DEAE
-  9: 0A085D49B094924621, B50611A43EEBA79B129A4A7CDE1D6933
- 10: D28C9B15530A73167396, AE4BDA212228FF92044359A8BD49FDCF
- 11: 4ACC04003B2DB52BF6AC9E, 14436E44AEAD95DB04151409AE0554E9
- 12: DF4A0500653E45E0C9B0955B, 5D1F14392C117752D25C608B88D27FE4
- 13: 779E1F3875A3DD5957585119CE, 09CA0CE358A026F4A0587AACA17D6483
- 14: CFFC6F342044C9FE27A77DE2F08C, 86E1A306D08BF4DBF1E9C0B8109F542F
- 15: F512032FCE7598AF164F8BDC979F4C, D9923D9B1434A1C7E8A705B28EFFFF44
- 16: 8F81FCF56B506E0848C49D252053F86B, 1DF7C9EE369191347758689A06E725F7
- 17: BFF875AE91FD5334B7BF7C0A589F86A27C, DF7FE649DFE3101D3EF0FA54D89D33FE
- 18: 4659BEA017C75E61588021CF8937D7C2C6A5, CFCD5D0F8122361909138E92B6C03134
- 19: 9484B68F9F02BEF42A8E861435026112C5CFF0, 3FC907A83E8DA1AF5FFCB2691FADAEB1
- 20: E13ABD911540BABA4F7F86A40DACD095C0DA2A3B, 2553A726A8E320D4A42B670933304075
- 21: 2F412FC9B166B8F4069245324946E9D2C70BC893DD, 2E434FE6C1C71F390BA463263EB49EB3
- 22: 1B4FC8CFC047959880F22A36ABB1E825260EDFEBE84D, 455666419750CF6012659EB68EA93706
- 23: 86DE014441AE5E868C335AC480A227507304F416AA1DB0, 4861EB2C1860B5FE68FD844C93F957D7
- 24: 98DB0F92C96A6A4A76FD8388852E30EE9D4B397DD36DCA23, A6A5136EF28DD468B8C9BA27D0423E08
- 25: 012701CDF2BC3F72A6DDBFA8ABE102D44531AB30693F3C92D9, 7A0AF791A2AA53FFA3C17867B9B39FB9
- 26: 3B6A8D60F5A580EC5676D3F656E98BFDF4A3F1C38F63B51A0A0B, 74CF48B317AB5966856CD1F84C1C53A5
- 27: B5DA5A540BD8C1FE05DF994A780E8FC54D0C84F9979515E4EF60B6, C1CB0C8D114C218D4C7650BB9F2F9732
- 28: AFD1259572B60A5ED77B8CDF9E8C31CFDA25FFAD45A6CDD614F83500, BF4F4E01D34B69F7460361C0B653137A
- 29: 1CDF78F6CF70428A19C87EFC9F2A861AB35CB03638003F701C57F5A108, B005D9CB01E35A08329ED34EEDB51C2B
- 30: 97A60FD030DCFB8E8DA4FAC24682C8A7901168504E6D494431EDC44BD2EB, 9958A0B0908DD27D3377268EDDFF8196
- 31: AD36ED716E5C956BC6766EA376E18EC1456258DF590E3425235493ECBAE133, F31D35D8D6E24C90E47C12E35F300826
- 32: EFABA1D19F94A4C288E3EF8353A919F06EC1AFD2ED802C82BA6806F26B93B581, D599015BC0A240AB62E85D3284E111BC
+  0: , 924B3293251DA82CC6843F4616DAA68D
+  1: 01, 4B07AF17FF5D6C2477E90B7843F19D1B
+  2: 5CFF, 75BF06BF38FA2BEC8A3A546B9E29741E
+  3: B31197, 0923C75169AAFCA604EDEFB93E7C5D83
+  4: 8AF83046, 29C744B4A6A1DB80CF625B490FD25A60
+  5: 0D0AF40357, 477754E1995FC70B3D4D7E6D6DDDA77F
+  6: 9E6765559AED, 389733D5DCAD65971EDB674B2479F13E
+  7: 113AD2738DB565, 366AE5F327EE4BDF2CA04A3B82FA3A3F
+  8: F2235181D51EB014, 3418DCFFEB24E4D94DC72F7F3876A978
+  9: 303087A4458E3063AE, F3E6B83CAA0A07261BA9D384087D6D5A
+ 10: 98FF08F0E42331B68492, E532298F60E06BB72C57596957400E16
+ 11: CD40F0F4D8000E5096262D, 8AF824C0EC17FF0F88371BF3E05AF7BD
+ 12: A7EE8BD81168FBDC359375E9, E20FD7E1914136C94223F6DF67386099
+ 13: 8BFD44C8A327E7835A9D43A52B, 7AF41E1B25A7BF4D1F5868F0E047E2DF
+ 14: 8DAF93847C1B3D8220B7748A9823, 9787A3B32FD7EE08835DD7A9277F5A4F
+ 15: C602FD9F13259C4D3E3700F89CDDBF, 5711A41B4666248FC3FAE3FE8FB9E861
+ 16: 972734035B0C78BF774279BA3DB7CB0A, 23E96A558B3A64D95FE1669923E10CC5
+ 17: 9D8B4DD8259B51DAC20C4C64693E20AEC0, 66E07F2BF239C0541DF19254F53820CC
+ 18: 4F76EDFD8C101BF1A20B9D337724BE0019A7, E046081F3CBD112CFAD56D9A32FDC6F1
+ 19: 59B667CDFCCC1634C9891DD0D3809A682EDA2C, A0F8E38B41BD82E8010F917F4629184B
+ 20: 0DBF3DD74E0D165C095468824E431B8B5650EB5F, DB7B71633206184ECD6157060DB2E443
+ 21: F5A457AA7ED8C131ABE99EC2C1008DA022D27908F0, 794C3E20F41E7D32B70BF043DBD0D86E
+ 22: ACABF3932E154342873B1EB770A3E5E31C629090EE8B, 4D998537CAFD3453A5D748EF09C81B69
+ 23: 850CA96B3B1287A8726E2B11B7B17EE321CF7D65481F73, D78C52190C81FCCAD299DDBCA72D95BF
+ 24: 5060CD915C916D082579B571FCF340E82224A9704398E033, 30EE449934C54F531D2702F8F1B9F510
+ 25: 0C47F5CAA3F2E8ED47F016918B634474B004B357A35337F14B, 9D749132486F07B06D25428B592CD767
+ 26: F01B95D67392793ED557D2C7289CF899C053ECC5E8BD28BA662B, 3760662B33EAFF659DEDD2AD6E7B32A5
+ 27: BF8B0FB0B069978F0EEE2120F61B6437969C0BDBA700AE279B3239, EF2A1D664F26DAB4F9E8142730C2942F
+ 28: 64E68C83E76FECF44BE02B2E44F182C1F6A08B8DAF396BFA3B395A18, 55AEE32957B9B15AD35F172849308919
+ 29: B594643A43A91DD34A75D30B259EEAFB75145C91D8A862F2526CF47A35, 0E60E4118213E89C28BB71A8003A94FC
+ 30: 5D2E20D31A1F6C48EBF52B63FAE1CC09C85F2307E509CBDD4E8771B65787, 11D347399697D4955028F7B08EE32B93
+ 31: 8726247FAEB21D7F8927DC3E90267ECD744A8452C64B9EBE08D1A590BFA1F9, 8D75DAEC7E4438E7C701A392346EBBF6
+ 32: 0DC0EE528456FEC203AFB12A55A4D3A901B9408958E5387EB42E75730D98B6A6, D7D682F57C1E1671BE459EE33BEA6B26
 
 OCB-safer-k64 (8 byte key)
-  0: , ADC114C0D077300D
-  1: A9, F24A07BC00CAAA0C
-  2: 75A7, DAD101DA4CB6D700
-  3: 0EFFA0, 9A098D97F685CE48
-  4: 16438C72, 739EE029D575F395
-  5: 303FABFBF8, 00C4C2494022E52C
-  6: B1209255BE6C, D068FBF0EA49BAEB
-  7: F784608D57ED05, F3395D67FFDAD746
-  8: 7AF185590214412E, DC524433F8A75A16
-  9: 44FE566F96CF0B8A37, 71846BF7025901E7
- 10: 1618A09FAC353DDB5685, BBDA87FF67B5DF14
- 11: 7F1907238DFBD66679FC63, 48F1009DD129B0B7
- 12: 40B3AD0A9C2B65670C0FD968, BA95C8A250D6EC75
- 13: A64662338728218AE4A9D387D9, DF0079004B48083E
- 14: CBDCDB3E912682AD5990ECCA0453, 102A70C169347128
- 15: 3A924FAFAAE941784360E30D0757AC, 16B8BED72BEC1950
- 16: FB1E63659F958EA320BD015599A3551F, 5AFE10D792095AFD
+  0: , 60AE63AE99A88F09
+  1: 44, 0B3706AE0C2E2E1B
+  2: FFC9, 2DE3EFEA9DA4E0B1
+  3: 9EDB9C, 3C6B708DDFAE78BD
+  4: 4F411B9D, 7B5C8D7355207D99
+  5: 137EFBA977, 8F5A27A51F6360E4
+  6: 518F478CF00F, 5D9D0B18CF5A3441
+  7: 8ABF02E8C3B6E3, 2A9F38EC4EEE4B66
+  8: B46D658ED0580427, 154E306DA82C5B04
+  9: 97C857F1454868744F, 235006CFBF3746DC
+ 10: 75D9C1CED5E4A9D74B83, AD470CD821D5A3BB
+ 11: 8BD62F6A7984C86BBC5BC1, 44BFE38FC9B0E173
+ 12: 3A7C8ECD7732D6546CCBC28F, 5ED6C3E7AFB1F896
+ 13: 52C030D775D19B605CDFA5ADE4, 010FFFDAFF4868BF
+ 14: 6740280BFAD4A8844626BCCE6FB2, 80A60FD0D0A15DA7
+ 15: F5B6DD3ED6612F59B8A073E3EC5033, 36F2EC985AB2C969
+ 16: 02581A19286680A999FB9830DCB77BEC, 3015B26725FB9D53
 
 OCB-safer-sk64 (8 byte key)
-  0: , 52BD1FFF50351BCE
-  1: F7, 4274F3D1A0CF5BA1
-  2: 28B3, 4BD97A9EBA18E5FA
-  3: 1EA215, B6D28CD00E7B1098
-  4: 93129898, 7A9F3FF172C91AE5
-  5: 36BC2888B7, E6A37037F50199F7
-  6: 1A24F1C9D32D, 3A0472F6372EDDE9
-  7: 1A799D9CE0C2CD, E3BFF559234C265D
-  8: 1C43DDAA18FC9A97, 851499FD6C0313C5
-  9: 08AD38225230BDE500, 5B9558370016257E
- 10: 3E00DA672753F931226B, 47901E285CA2AD82
- 11: 892F0D4C2302EDEC2C3587, 1D4C71FB290104E9
- 12: 124E7EBE7D643EB6B2426644, 0DA9ECE397151EFB
- 13: AB1BFEA636E3E4189677433CAF, FEF2E8389207857D
- 14: 79A206C4B23DBBD7422432A32093, 04FE9BD236AAAEB2
- 15: D8997D69B89058F0AE974A241DB76F, F395D15E6F18E555
- 16: CE7B2A79A46AB5F0FC5B55A0F751245F, D6E1523F75489CC9
+  0: , 2B5F164039EC1FF2
+  1: BD, 3072BD9737BB4DEC
+  2: 71F3, C358816473A2C3F0
+  3: F370EA, 83F377FF988F1B51
+  4: 98565D32, FCA53CD3A9DABBCD
+  5: EAB324F774, 421AF23FCAD01DCE
+  6: C5B0814A9FEB, 9313C6B3088C3924
+  7: B2BE28DB8A7CE4, 4D01C1E7AA97B299
+  8: E410D82D4064AED0, 9BE40E1610857C31
+  9: 020B907AF549B78C87, 041F712E41020281
+ 10: 340281F8C266EA8C7A32, 6ABE5616D2FA74EC
+ 11: BDC98894B81C6D27E1B68A, 0C04AC90EA1A9CA5
+ 12: 8499598100F79CCB99658CC9, 80BF184C2A145C77
+ 13: 225E9058E1E04C0094A7930951, DFF29FC9970FBE6E
+ 14: 2921DB3AA293E8EBCD1624227B63, 66C946BB38353006
+ 15: 666A373BB8D5E705B7C6FB57366FFA, 9107520B8B727240
+ 16: 99A7DEA8DB637CD1C92C814D3C1A64A2, 88086A2AB997BBDD
 
 OCB-safer-k128 (16 byte key)
-  0: , 233F1509E202E728
-  1: E5, 47D8BEBAF965745E
-  2: 754D, 290AF209DF1FAACB
-  3: 76EE38, 2B2077CD08A9F56A
-  4: 54B277EF, 8498AE1104DB117F
-  5: 549B360B06, 8B6B990840CFD666
-  6: 4687E79DAD45, A72CC518980419E2
-  7: 00A89236339443, 1BD4A6F472218B05
-  8: 2898F27243B4DC08, B0CF6DE09DF4F6EB
-  9: C0FD319C9AD18A842F, AD6526380D323480
- 10: BC924B95E3CA0EF2EF51, 262F667D40D4EDE5
- 11: 0255999B9317DE741F3C73, C148B4E3C0D7D6E3
- 12: F4DAAE53F04D5E977CD98015, BB254770D37F80CB
- 13: ADE0774EE8F303A96FA110DE09, 9547EEFE854DD99C
- 14: 0824C8FF6D62C849A8EAEFD06B4C, 613B264BDCD0DF4D
- 15: 6C69F69F3F4A28798E141003E7A9DD, 1BBB5B912118AE95
- 16: 4727E3139B38396F294CC2D532BE5FA5, CE8039B0BF3D7247
+  0: , 40A7E9B40AAC05E1
+  1: B1, C22564913F5A2BAD
+  2: 95A1, FFA940A16367A92B
+  3: 9B2C72, 13AA7AC4A229C17F
+  4: 1F986AFF, 38FA204AD590363C
+  5: 6D8575E1E4, 29C7A65AC4CB96E1
+  6: B66053304FBA, 90FDB74422EF97D2
+  7: 3AF64A001B7F6C, 00BE93CEA7F27105
+  8: 838E09F49FA3AC15, 74621705326B0B30
+  9: BAB2B85FAC5DC83489, 8AB828D9D6C23621
+ 10: 3AEF47ED7CCDE4D085D6, 1DAE20BED85FC6EB
+ 11: 16B8926C2F2B591C16671E, 9059D39D4896E541
+ 12: B7F7F74BC766AEC2C927E8D9, DD8CD0D361E458B1
+ 13: DFC4F2CCCECE6C37BCDDDAB3E8, F43757F2561806A2
+ 14: 981C89C0D2BC84D757733661FEBE, 2E6739D64A66F8A4
+ 15: 71CAE38513289770E2144C85F86ECC, 7E6B772ACADBB5E5
+ 16: C762E3C8CA8934312AD0FFA260AA21F3, 147F6D215719D80B
 
 OCB-safer-sk128 (16 byte key)
-  0: , 6B06914D0E070584
-  1: 33, 6E16F49996CED793
-  2: 2C9D, 9001E62BEB613A8F
-  3: BA9381, 791EE199D5BFD651
-  4: F7A81D0C, D128ACC4FAB2941E
-  5: 66D1DC880E, 08D3EB7D405F26E0
-  6: 90F8FCEC0067, 23CD39807B169E1F
-  7: 7D559F904AC0E3, A9C685E5657F4A34
-  8: F317A68CAE96032A, 9654658AF84528E0
-  9: 3FC34820F421D931B9, B480CAE6B6D61FFF
- 10: 173ADC60BCCBCFB18966, 1392B2FBB86EA6EE
- 11: E1EDC19C2E4AE5A20668EC, 17A2A7FB18440B50
- 12: 0F346BDD0C5F1685B281493C, 8169618CFBBC84A6
- 13: 74597EA4DB09F6A38565316AA0, 192F1B3F863B20BD
- 14: E5470A157BB18E7456A79C5E40AC, F49954A039514F1E
- 15: F055944B9C518AE9D44AB407C32F35, 0A45830C1175B3A0
- 16: DADA8AEBF57928C9D13EABC840B335A4, 67AE540EAC0129DA
+  0: , DBC0A566E43D78EB
+  1: 7B, 0A5B7E6504D09E0D
+  2: 93C6, F0965D809512F60C
+  3: 371A02, 26C1101DFBD5B5B5
+  4: 9289CC21, 1DD5B6E7B434D085
+  5: 462F4E430E, 359A72726D607F77
+  6: 754822D87238, D2C3C36B578EDD54
+  7: ECD5B066CA1099, 43501B21F2F3B81A
+  8: 0B5E88DFE1EA77AE, 02AB5CE6F21ACD13
+  9: 37B1F29B385FBC7719, C5C3276464EE75F2
+ 10: 3DFDF3F96F069D16D073, 1B3815F5E66D9B16
+ 11: D71B6574B09AF3E2892702, F23983243BA05358
+ 12: 3FDF716461B02B1A800FBDAC, 76DC47B577DB0428
+ 13: 2A401964D55907EC06AA5A865F, 48D2A85A1394C9D7
+ 14: B92B44D7D203675484CBA922C7A5, 03CEC9B3F03FF6F6
+ 15: CBE7F6D81C4FF6E0E7DDCFE4DC9865, 7DFE226E27765F3D
+ 16: 54D4EC026089660D0A5DCBA3C6096F27, 07E13D50E610167E
 
 OCB-rc2 (8 byte key)
-  0: , CB28E7BD706EFF65
-  1: C8, 7E3F5A176F71601E
-  2: B632, C91680B7A52A3DFC
-  3: 41435E, A97F1A5EDA202127
-  4: 81BC4015, CDE53BAE0F178F51
-  5: 97628A29F6, 5CFD18FF1112E76F
-  6: 6218ED3F0875, 10F80C337AC529B0
-  7: 797E08DE799E97, A3E5BB262953E00F
-  8: 5ECFED1D31A7207E, 559893E2748E3982
-  9: 91BB1BDF184D3733E7, 9EC128ADD1B550DD
- 10: B31DC920C7EEE1F29E72, F37AE3B755C95181
- 11: 9061478D7846AE093557D6, 9515937DAD0C3859
- 12: 56918DD08F7D60502FDD9CB5, 24B6903992B8107A
- 13: 3F1D1C1F745EAB05459B2DB86E, B4475B5A5ACB91E5
- 14: E00B385EC963602982A0BBDC3182, CA06E1DD1CB9637C
- 15: 40BB2FBC9DD133E3958D5073DF9FF9, 2E5ECB03309630F4
- 16: 0AEE1927D6439C8BFCE6984DEEF2E6E9, 398561F898EE36E5
+  0: , 64AF97108168F222
+  1: 7A, 8D76828ABA00E9F2
+  2: 92B4, 46173CDD4000CF80
+  3: BDA76B, 418CBA55192C3C14
+  4: 39770C9B, ADDB0A3DE174E8BF
+  5: 7DA3100250, 55CF46A530E296CC
+  6: 1B685D542DAC, 414D5D3AA58B2D9F
+  7: 6A1172A01FAE68, 707C8FFDC3A28162
+  8: 3643C5C11A14FA6C, 4340696B5CE9A559
+  9: DBABB16A1D908AB735, 7307611EC44A8CE2
+ 10: DA209E874A3D0962826D, AA3119B1745C547A
+ 11: 2F4543B7EF467676601565, 3153CD137ECC8642
+ 12: F7F776D30C833802C3B03EE9, B35BCE4DE7356F87
+ 13: A19B3618727C8AD0071AA068BF, 137CAB9A02D34F23
+ 14: B6B06B70CF74EE900BC8237D6C88, 8393EC248840E83E
+ 15: FF7316B644450C96A7FA19912282AE, 08231DF3DCAFB00A
+ 16: 018FBDF023323BBA7BECF9BCEC49C645, 3CBFF9B5F03F97F7
 
 OCB-des (8 byte key)
-  0: , E5E4D924A3DDA7CE
-  1: BA, 2AEDAEF9CA1A9C7B
-  2: 0F37, A8FF952EBCB5C27C
-  3: 2AAC55, 9D7CD4AEEDAEFBC3
-  4: 9D1A16A0, 5064135780E6BFC9
-  5: E1B26204F1, 1F1D5449C214F528
-  6: 6A0D8B244E3E, 78DAD555E2977E74
-  7: 08CAA94D23DE55, A1A1B7972E3B5413
-  8: C1EAB716F806D038, 906CD254EAD1F9D2
-  9: F4E8F83B0B48250236, 12D96AD38BF22277
- 10: 4FACF4CA8F9D9C1CB61D, 6448284C9D8A6B38
- 11: 8AAD13A87B869AF1FD5CBB, 5C44F3C0642313B4
- 12: E50E78A36CF3AAD27A962F82, B796C10A692F72E4
- 13: CBB785CDA5263F8B45915942FA, D7D18C57408D00C8
- 14: 39EDAA0F16DF4BE3E1F4CC9B93F5, 5A78D4D529E658A2
- 15: 1D8B9D2A0779F31AF61A172E563E21, DD9D78D160903970
- 16: 4F5AFE126EA161ED8EDFA6AD9640B9DC, BE20EEFB088C1BC2
+  0: , ED4327DD4269EFF8
+  1: 9E, CF026B3E06459E45
+  2: 6695, EC7373BD53E08021
+  3: 2B162F, 2009ECBCCED951CC
+  4: 6D2383BA, AB01479F7CA86837
+  5: EF7AF7B925, 6C499BB9C50F2867
+  6: 9A209AEEF740, ECD38B6E578E5BB6
+  7: 64A6847FBAB815, 04CCA3BD0B5A0E86
+  8: EF6E5AB10AFF4637, 6BA435083EB73B42
+  9: 9DF882164AC1093A6A, 6F675349AD4A5F0A
+ 10: 2A387714DF49F0B198CE, BF11D193B33332CF
+ 11: A22B9ACF695E509D7DACE0, 30AD5F8E9BEBAECD
+ 12: 6FE138F1AD18AD82566FA62D, DDE29234BADCB116
+ 13: 5E999D45A65F1E7B8D6E23928A, B42126323E230103
+ 14: 450ADBB95F5D30C4ED07EF5D61C6, C9AEF234D2A62D84
+ 15: DA6EA48D2FD0CD148AF3C820B35D8F, 17EE5C13C4EF2230
+ 16: 929440B304802E9963E645962D03311E, 3F70A65858B4CFFD
 
 OCB-3des (24 byte key)
-  0: , 30D1F1D526BCDE16
-  1: CA, 737A0D73F465DEC6
-  2: CB98, 3F772C5AC706F24F
-  3: 0C764C, BC80B99A6ED9FBF5
-  4: 01525168, 6DE48387E0F56E2F
-  5: D7463F67FA, 90018E688367A3E7
-  6: BF3DD0750CFE, 6E1965C24DA3E913
-  7: 8EFCACB99A8D0A, 0727B907696F8FAD
-  8: F8E92EF758BA48CB, F863DC4B8E73339C
-  9: 5E9DA0FBDDCD0DD3EF, BE6482A44DC7E537
- 10: 5A5466EA4BB3CAE7B020, FBED57DA0D91AF2F
- 11: 78F1B76EDAE923B875E1A0, B6C4FEB194193A65
- 12: 5CA677153C30E14C457807BA, 7F0FCE7505AF14D4
- 13: E748CE1E7F9FFAB9C9983D16E2, 01D3ABECE0DEA2A2
- 14: CAD89FC73FE93E17D2AB4D8B36E8, D682B9F5F39513C0
- 15: D3B5BDDE86E988628357B3EC622357, 12180A98DBEA8D4B
- 16: C9962CDA2141ECF9F8E5178307E526F7, 105CF6D040987D93
+  0: , AADB051E60C3120E
+  1: 01, 20A7FE8C75FB9E6B
+  2: 1F2C, C1E73FE3B49807B3
+  3: 18BA50, DD5049D65C6E3E41
+  4: 831F26C5, 29A93FC7BB7028E4
+  5: 0F2687749A, 5A17CDD57275D990
+  6: E859252FE864, B546B6CE8058E9C4
+  7: 45664737F4B25F, 9114205390E66F64
+  8: D05C5A3578EFCAAC, 7633784CDB458899
+  9: E4C51E2E306B4304DD, B13F8620AFB606B4
+ 10: 69A5B1ED52EE639927BE, 01DF9CA135E1F0F8
+ 11: 470473A317D7F261425751, 201A0B1E678D47F9
+ 12: 835834F8FC21B8CB27D2E0B1, A48CD87F705E1816
+ 13: 8CC41824101B5F330CE1109AE5, E68F62A44E2E15C8
+ 14: 9EDE893B691E3E5A0322B8DABC7E, FB5997E400EEABDC
+ 15: 7E71195F9CD039D025A8A4F90E718F, 2B68E17F3B544A09
+ 16: 1D217BA1D0F2FA051258E65E4FC7D60B, 089A17777546EA21
 
 OCB-cast5 (8 byte key)
-  0: , 53EB91E57923FE43
-  1: 53, AC15D2C444C5E407
-  2: F3B4, 448E3405E97FF5F4
-  3: EA2BF7, 23A7798222027AFC
-  4: 2EE3166D, 0BA3E584C8B6C7C7
-  5: 3A8EFA1923, 088B5F14925C1054
-  6: D4C03D32CCBA, 7A19BF98BBE14AF3
-  7: A2CD3D4233DAB8, C44AEB4C39572364
-  8: A0EB1F16AA4E2F82, FB7CC3CB4EC595C0
-  9: DD3A71458B8DAD91CE, 1565FF64BCC0094B
- 10: 399948E91E4EE7D2E0CC, 03BA85E452E52DE8
- 11: 8B589B04321BC35F591499, 14E0DBB700E7BE85
- 12: D2C1A33EBE900EFB656797C8, 13498FF76B676EED
- 13: 534C1BA008EC89D2AF43B21725, EEE64FC92802CCEF
- 14: 5368EB18C2157B667D098B8580BE, AF8BCAAC5AFDB0B8
- 15: 6BD7F55DE1A4718A6B3B6EA4D43031, 1C6BEAC4FE0D480E
- 16: FA1E5410E622051400CAD151211916A7, 3EC52677421255D2
+  0: , 77D9102CCB59F03F
+  1: 65, DFB130E2B4B8CDCD
+  2: 752F, 3C025A7E3B0C0677
+  3: A32F20, 9877D937F0078B1D
+  4: 2721E6C8, 0F40ED1C23EFC71C
+  5: 95C4269DCF, D2E25B933FE78F63
+  6: 8CB240723A3A, A6704E1218CA3CB6
+  7: CD2CA6456A5416, 99EA298978513F00
+  8: 95094FD229EB9EFB, 055771E04E1FE0B1
+  9: 052F37165BB7B31071, 00DA99C81DF5A15A
+ 10: 31B4551AD67991DAB505, B61C6F06889500A9
+ 11: 1F9E4C34E96D8BCCD9AF55, 9D7A3D3C78D456A0
+ 12: 856E2E4CD20DD9BE45E0CDED, 6FF332546BF351D8
+ 13: 65C3B9E6ABEA205C75A43F2D18, B877EBC583A65589
+ 14: E41F26A7F537A32B15DC6115E973, 4CF3710865E33BA6
+ 15: 0AD880644E5BC87CB4D702F0074085, 60567AFD8C6D52BB
+ 16: 03C0CB1D2854BC9F286422E8BBFE4A36, EB10E5429866623E
 
 OCB-noekeon (16 byte key)
-  0: , 7F0EEED1FD7FFECEE2CAC95477884E58
-  1: 74, 97B25EB4C8A4A01BD8F4F4CA2AC26B13
-  2: 20FF, B6D315A991297456529355CBAB74B231
-  3: 8FD23D, 6DEC092FBEA42213EE4B795E52A91484
-  4: 868F9D8B, 7A4E1EFD87F0A4D82571E025DC8976DA
-  5: EF59D700F0, A7D7A4CA5AEAA4F193C4CC7A6A311C86
-  6: BCD16ED4DE78, 8C661423A4EBE84AA863BC62894D2FDE
-  7: D1996ECF096D77, C99D7F79307F08986E151F44A9B3409E
-  8: 88BADF7ED86D024C, A39E95FDE8C15D3F0B4D439A3E9512CA
-  9: 2DB1F66EC64B3A3309, B85B0530B581FF599F04E285B0DBD562
- 10: 6627C3586AB1A43777AA, DCD0B6E4749D0D983B777947B2E7DF94
- 11: D47B10151EA15496D68D0A, 5462DBDB94D194DB01D03CB5719799C4
- 12: D997EF4B4782C959D7FEF298, 00E39632CE89CBF5892D8A55BABD66CD
- 13: C3684D24C78AF4542E088949D3, 302FD96F20FA01F841DF8E3FF634EA65
- 14: C0FF61350FFC8FA4CEA857E69770, 1EA083FEEA89B019044A56176D47A209
- 15: 35896DB08FA2B837AE7F73F563F1A5, 5A1DCAA52F051A78552AE4BECDEB5EBD
- 16: C44C28E2EF2B145B57030B5D403300AD, 615F4D3C2342397C323D91BFB6F35537
- 17: 925BFCFD598EE2167823204E531C09D744, 769A60612D34E0D76C65812E437B366B
- 18: 56FF27AF89F9A438EDA0F00D83C864A58C90, 4122513495F866E7A154FFBB49ADE999
- 19: BB9C0633EB07E5053E3BD64B7ADC2D15C497B9, 42074FDF7C3D5919769C3168FC0DA9B7
- 20: E77E666D6B6C206274E8AA6BC21E615399B10B60, 15DE064D9EF7F61518FBC130AFD27633
- 21: 26835663DB363A54E5B5DF6C080579E007A3936979, F4D635FE378D957143EF215FEFF1964F
- 22: 20F33C26AA97C924FAA320D147703A2E44A0CD2DE9D0, 8BF2C8D6A46F938146FD964C272315C4
- 23: ED3EB5440B984DD5DD81136AA7BFF25A51329EEF01FE59, 7A07644AFD20B4AEE7612A8B365CBBFF
- 24: 51086917EFC1EAF5DF11811573ACB5977FCF090E2A287223, EAC6812D7218A315D6859BB7A71899B9
- 25: ABFB3BA3588D0B04ECFAC7A43B8801C5C309AEE607E5EDBE24, AFCC1659F0D6CA1B9FA37ADC5B13E6C3
- 26: 77381C4A7E18FF7FD5F3ED5710B924C7935A9CDC0B8EA761FD68, CBC15B38DCB4549514F49650EA47E4F4
- 27: 91AD26366BDC121CC316BCFF1C73B97D73F4D267F1501967C9724C, 9D4A729FB78ED0A38E741FC380D62323
- 28: E3B7762DEECAA467384D25304A8C20887C3424230D84DA976F6C3316, CC2C5112C9208CFE165DB913FCB8A331
- 29: 7AE2A23472737F9587065CC5254DD64074C6C8D64E7E6198927FA30788, 9F4542664F18DBD85286D59EE8E33D7F
- 30: 67AFAD81B4283C81131D0C7E411872D937A6D657D780FA23D62624B62154, 6B2DBA7CDC032A51D9FBAE63EACA43B7
- 31: 1424442606ECB6ABCA1CDA3CF492357AB7EB828537A9B8E1057644663CBB03, 4B4A8B2C2BEEE927161080570B7E7A8E
- 32: A26EA76C18D7145F8569335458BA0919A7E70BB9EBF328D2C22D07B2CFA6B38E, 0AA05190DA1D44EADC609CED2368737A
+  0: , B23A40302652E204B694EA78AF5A8FCC
+  1: B1, 5245C8680A6F4520168B173A39661249
+  2: CE8C, 05763A489DF8B88DF01862007B2D6655
+  3: CB7D55, E14463F2230FD60AC779B5608F708A13
+  4: B4E9D036, 78A9A918D7CC6E742F22BBAB7781CC7F
+  5: 0CB35CAD63, 1A010E65263EDB85039E81B8BF88B978
+  6: 7094335707F5, 8EC8C49EFBB77AEF2B443855760CF5D2
+  7: 734E7D94C8BD6C, 5E701C5886A72499A79B3DB6A6F865A7
+  8: 5375C12BD7B724F8, 3C12E52B9E0DB5967AA09C84DC4D48BA
+  9: AE56D9F446D45EF168, 297EED4ED9671F7D9E6433E189C754AB
+ 10: 203F357C80E760BB0D47, AEB8CCB8AA3D0752266E9BFF4B501832
+ 11: 12A9F075BF911C0691338A, 317824AEDC90F284C3702A651BA50488
+ 12: A4F167C8D051DC582892E5B0, CCB64B2CD8CB62212003A4E0A4065B23
+ 13: 42B2F2B5E43D407E2E2E047957, B81F80502CEE49C84BCE21A942BD6206
+ 14: BA5562041E71339AA676E1BFBE07, 7C0920E33B1AD9257FC6FF8732EE4BBA
+ 15: 1D1DE906DDBB4C3FB367DD7FB59622, 10D4E97FF5495A4250B60A1238D21B3D
+ 16: A06A25AFEC795738D0ED17542EF1E691, 1D31E82501E1779FC62E8A2847D89631
+ 17: F7BAFF86763A1BE37F6ABCAEB2E8A64411, 4F3E5E7009B8A09CE47ED7E67D9B6B0C
+ 18: 15A97D2BEA9DA105282144776C710A047F1C, 79406BCFE7C9E8283AA851ACE9D40AB6
+ 19: 80FD02BBAD283477394A3DF93FD6323AB2718C, 30FB621D3A41DD01BF8F4E7EFFE93C22
+ 20: E091A9D6C14A60627FF6BDC59DFE85E9528AF3A6, E8D5A085BC63B7AA48761FE4431A7966
+ 21: 76FC712E7BE90A93015045E96DC102FFC2DAF113AD, D563F913F2A90D653C0764F276F8D0D8
+ 22: D4A6E1FD6DC7504CE40F4A1A7B9342ECCC03CD3788F6, E6C45E97B3B2E00C2DD0C639EC056485
+ 23: 7DB75AADBA75F026F430C7B9A59E4E0F228770990512B1, 09BAFFCA7F69156C6ABD5FA7A8F1F39C
+ 24: 18AF0400D1FCC74AFFD5D2FE4F8224A29BD17DB2294F89DC, BAB2E20E100E6292658A7BBE67F96E13
+ 25: DE47E5BD43101F0688D7149811511E549C8846AB71B35A12F8, AFD0DF5FAF7821759DE3AD928B239570
+ 26: 1826EEBA81A57174214F9953BA88F4324456127D7F7ADDCA8036, A03FF1F7B71611D8E9B41DA61E191A90
+ 27: 73D79CFEC44F7274720BC73B7F2422BDB79A9DE6245B08B006F654, 00F66AADBB4110E77A7A788A1B0CB4B2
+ 28: BA5F0C34A1DF413378C6F49E09BEDE1ED757935934C1FDCD978C2B3D, AC286CAE6E7C3DC2CEE3B6019F5A1662
+ 29: 231AB287C2156BD0E590632E057D7EE92B6DD7976AFB75540FB04FC84C, 12420BEED7F377C4792A0940EA91C34D
+ 30: 7B06F611F07763C65EA542EAF679DDBCADDA4B61238F489331184FAF764D, 56FCBC05F1E3B57286B1AE881FF04BF4
+ 31: 17C5B1127E3D08737590EFB2FEB17562E7FDB4B21A768595ADDD9697CF9B46, 6F4BC0A033BE040350FF4958866BDEA0
+ 32: 4667525E9B39821CF08E6C7A7E37A5020CE23F81DEF05932113E9A6B5B3F9BCF, 5C0350C6F7299192947EB22ED415B05C
 
 OCB-skipjack (10 byte key)
-  0: , 509609FAF6B2A760
-  1: 1C, D19D4AD11B65B435
-  2: 328A, 252CB779130397D6
-  3: 6DA4D8, D67C555D873050DB
-  4: 31D7BF8B, C92EF449E99E4689
-  5: AE263BC571, 4D840A59C00B4462
-  6: D3BFDC4AB208, A28415ACC9B0110A
-  7: A5B72B226A5DDD, B414058C98FD853B
-  8: CAA29B280DDD3C15, 4D26BF4D0C89E38E
-  9: 5254ABED0835B8EB8D, 606061B9A2E80198
- 10: 2EF661B59DD3F2EF31EF, 9185BD6F1AB894B1
- 11: 65124843D1E57AF3F68BD8, 8B3D629B42A7083E
- 12: EEB3427A492FEA461196E2FD, 5B02BB30264C4773
- 13: BDF601AE59455530E8CD5D4733, 42CCC4F51CDD9AD1
- 14: 8563FEEB2847AEA38D940953882C, E233C6110A0E77F8
- 15: 766A8BD4C655ECC0589BD0A3EE65A5, 1374E4A3F96D13F8
- 16: 85BB8A319C9FAC34E3FD694727747DE3, ED65F930AE6DE12A
+  0: , 463C1E4DD1A03085
+  1: 44, 754EDDA8D5F6395F
+  2: A91F, 19D6B04F49F65FF0
+  3: 8572D7, A97380A827EE921A
+  4: 8B6A518C, 28F53D973490974E
+  5: AE64F0C5AD, 3A01F1B733C27295
+  6: F9075088FDBC, 25B88A75E41E1181
+  7: 454FA7B9ADBD08, 27EAC47AECF83243
+  8: 658A1888D9405313, BDC5DA72A5B4A18E
+  9: 5BBAC180FAA537AF97, 5BEE47690DB770C2
+ 10: D5A1526B948F67F282ED, A5CC6F9F770B9B64
+ 11: 6A51609E928064B6CC9B63, 9BFD9968FAD94974
+ 12: B3C69893E260B791A9C3A843, 78685FFD8835AF00
+ 13: CAA5800B6B5C50949F4EB8519B, 39AD309E4BFB47B0
+ 14: 2B12D18B98AA3B3084837E2AF840, 920361326313A489
+ 15: 0D2F21E3B3DB3D2B31B880459DDF22, 86307ADEB332A89C
+ 16: CD489F4272596715EC86B770D89BAA7D, 2006F5269A5D1C58
 
 OCB-anubis (16 byte key)
-  0: , E8D6A3FB8D3E664DA78571CA8BFCB95B
-  1: EA, 03E38265C85DE60108B7098A51B5E341
-  2: 670D, EEC6A709FD9A74551467CE9F330D9032
-  3: 42A726, 1E45B0C7F9B143FE17904412B8F88DA0
-  4: 7AA61A9D, A89163D9B707F3B83082BDCA2CC00712
-  5: C3D7E3EB14, 0DE7F3A68788E854603CEF766A25B63C
-  6: A160A9CCE0C9, 6DC1504CD1368E83BDBC113EB95DD895
-  7: 18415CDBFB78CF, EF372363366B5868AC287F1B43CCD739
-  8: E40D6DD638AA2C9C, CB3B89CAA74ADAD76CD6ACC7C2CEF3B1
-  9: 7AEA37ABB7582721D6, E01A28646610DEB22E7539CBB6696BF4
- 10: 03F16C187F6DEB996299, 74F6018D51DE37D77A30021583F07658
- 11: 9E080BBD30A520A3B47AC5, 0457907DA3AD8467B3F0CA41B82E584F
- 12: E673042F50FD247F04734C59, C7917428BCC7D932DE373CB03954A7C7
- 13: 0A0F2CFB5D4F3F7EAD1B0E3C57, 2717CAA7A3AEE7873969971F884E70FB
- 14: 8DD2128500F515F917862726FCB8, 3313A88FA208776F305F1BB344748E85
- 15: 625D855CFA0097B136B47E41AB21A8, 8B7FB512341B339AAA45F9345B16B66C
- 16: 6DC9BF9F13D8ACED3C07DFE183C4C21D, 1E8B9686F5D564448AE06B5C6408D2BF
- 17: 6193393E9CE9087EF765574FEFCBD599BA, A2C14ED8BDDFDC988AF9CF2C71CF6277
- 18: 3F06E79CEB0FF301A0C6D8076D4241F549E5, E1838748BF36D2D37D477B89E7327338
- 19: 15963F7AD2C5DA43D46523880E0329F70527ED, 6471F1CFAB79ED06BDCFEBDF0AD3C98B
- 20: 3632F3B578836AFC8B9456DEBD853564602AEFD5, 4FE167E3AF7AC854D02758F68DBFFD08
- 21: 576EBD9F85575741C7FB50AB8DC1C9E8762FEAB590, ACB4386F6EA5F1C30C10C1D032A32CF7
- 22: 8DE26C7278A29F8721EBA3B66FC8900242EC213C047E, 46F25D10117CBCDDC5FB2CE2044342E9
- 23: EC5781849EF2B46A02F9624CD225A4FED1E6F876B10437, 014680D2681AA27B55EADF71E198B091
- 24: C7FE74EAC6C697C2878132D127541BC4CCFF6C6EE0AF9926, 9BB9C5AFC2321FE0B771C99B1A4CF273
- 25: 232091C00F1CF16D2A7D05A403412A13A0070491370E86DD53, 5F7AB245670B2D2FF8B70B520ABC4070
- 26: 6D3A0812C0EDF89E4A9EADE407C4E7CBCB068F0BD8463B67B0D9, 96E638BD35F910653098D36EE011A8E1
- 27: BCC775956A49BF8914E37A59D32DB49D334B40133ED0D72692D7D3, 4F9B0FBEEF6DDD17A7D30392E2B14C77
- 28: BFA70C11B18D1E9E74A2C91C967E5F0F9B5A43001ECF7C8F286DFFAE, 0D71543408255921DE67189D999D2A18
- 29: 4FDCE50EF26DCB4106A81554B2F97166C6D9A018E340FDE9E2B7FD350E, 6A73C694FA85CB83272C0EA856B83E0B
- 30: D0C9F3D92BADF1A874DD47B1926B509191AF06D720D4C05F4BB6F314D6DC, 2F54556E01233BE6B309FBD11D2B9289
- 31: CB9F54B5936B90530B68A11A50CA4568AC2423A137066AAE38C2C5420DCBAB, 58277F655B1F71939B61E49200E8DC3B
- 32: 08015545AC92A9F77C8B1ABB42CF3EF2C48C5A1E40C5F0980684A21D8E03F445, 54FA9E6195A3ECE7AF469FC179C36739
+  0: , BAF3C352341E4E8F5E1FE11C9CB3E151
+  1: 1E, 01BAEEA2431B9106129937F135D46215
+  2: B586, AC89B511AC5F80B2E6F9E6BC96DDCE15
+  3: F28FB1, EFF43DCF8C909D51ABD58CE44461C35F
+  4: 2AE6B0DC, 36A21C9193BDB12FCACA73E756C6D75F
+  5: 4A37080738, F90B5BBA5A103EAF4ED01FF845F7F6C3
+  6: 369B9FDCA431, 85C530F58C7DB80C6E8B1F3A9A593C69
+  7: DF0388D34583E9, 4EEF27EABC10A78488F82E8105C52C2C
+  8: E63011F0E310F68A, 8AC5A7B20B6F4E160EEFA6D16DD868DA
+  9: 93FBDAD02B07A03C8D, 2C968FA16435934EB40F27019AE00F87
+ 10: 6D91E68224DEAD679298, 2AE270894D8618D4D92485B51B7B5658
+ 11: 53B08EE1F8FFF2590B7CF5, FC9A33C9221C06ED7EBB1D3C33BB0FE9
+ 12: AFE762CDB97A411E0F6D8422, A9A1028C6055FA627007E65CAFE5618C
+ 13: 781464F6A0739FB8EFD8C6130F, 1DBCCACDDC218B76FC27F444FC0CCDB8
+ 14: 1F9AEFACB5D87693CCBB9D173529, EE13B9890D0E05EAF61E1BBE8B0ED0F9
+ 15: 107248D8D565CDBD520E50A139531B, CD7220BB19B95C496FC901C831AB7CAE
+ 16: 1045F21485E1C4FB812D9428C4D29D7C, 08035EF80327E3D238D98A09E3B48542
+ 17: 68E48C74D09B7D07F38BFD1722F6DAF18D, 9D94E4B7CC4F00F1716D830D953E1DC4
+ 18: BF9D274E7DD49FA2ACEE1D65DEB0A5A74D2D, BB841A83356BED14D2A06B5D7F5F8556
+ 19: 4586B730D46E9BEBE34EB52242DE954CD39B90, 40981229C0DC8D47C69AA261D2BC960A
+ 20: 11038CE2E4AB2D2F8258D4DEF25F102352468350, 1EC047D2BD87BDDF02068BFD5742688E
+ 21: 25E4D441758E4953D463D0BB63CAE2B8D5F78B7968, B548855DEC4C11C10F74983D6B426A41
+ 22: 1711526E226559666D2439881650AEED6DA12EA01A72, EE6D4D29BDC8EC975ED90340910EF829
+ 23: A70447A0317930D20C5EBB0841528802B948DA7E437EED, CCB551453425652D6535DAD0A5890431
+ 24: 57D82A93F29B4B2C2CE4D2326D2E224836F0857EC8035972, 87E1F70A7D4140A58851A2C4F0E39F0F
+ 25: 5F065C6406B07A8CA35AE0F05D0D48C631C6FB3D7655D5F6BE, 2E3EE16DFA370D0F988615CA063DD62F
+ 26: 3DE835DAF81C17F45DE11431A6F8294FBDFC062F237A7DF30E1E, 401F8841A7D97F84438B905D2C03A416
+ 27: ABDF9D5E996364C628D4DCF67ECC870117E8CC5A6C52E4663C26C4, 05996C80448BCB0C4B311E05AD0B4C5E
+ 28: 1C2401BB1DA2CEBA1BB56C69728FDAEE42FBFA374E57DE1C593494E6, 8491B62BBF372C671C311A97C173BBE3
+ 29: E504321BA399FFB6E3187B645635273A92C63D014E337EC266334BEC7C, 026444BAAD6C4EF67C660180CCC6E7B4
+ 30: A61D3FCC22988166F57F4585E936CB8CD714713355593780F54EED1681E7, 3507D5E0185318CC4577C5FECB3A348D
+ 31: 55AFBFA3A57B960AC0F8B3DAE6EA60165FF7D5A77731B05BCB7E8C647487AA, E25444D551A823650757DAAD8ED6B588
+ 32: 5553F81F123EC0697C26B00BF20BE287C0A1E9C4035C8EB3036F6D58C8A3B83B, B7349CE03F264F816305A6D46C274980
 
 OCB-khazad (16 byte key)
-  0: , 2D528A56D24DA0B1
-  1: DD, 195FF8AA3642FCBF
-  2: 8081, F96BF0542DBABB49
-  3: A3BDB4, 53B2301ADA9F2471
-  4: B65B1104, BC470E5528C50AA0
-  5: E3020368BE, 36911628972321F4
-  6: F6D17AFCA3E8, 2BBA5E3BEA80D17F
-  7: CBF398ECFCA361, D79987D6D0751DC8
-  8: D625BD23AC106E16, 91CEEEE861A07568
-  9: E28B40E0D810AB8B28, EC2AB51CB46F101C
- 10: A831B14C2E0F1C583F5E, 17AB8A4B822A4D9C
- 11: 1CA32A525BA0A8A141E852, 7E2A30A9FE7BCA18
- 12: 9B7F20DBEE7E7735FE7BB8A0, E881254902FFB81A
- 13: DEA8DB05EEBD550B9A36B5043C, F7DE10A41ED5450E
- 14: B6681197883BCC1EF3F880D15CC8, 7CC43F7E2D10C161
- 15: B5F13633767C37E2A5BE44B95AC80D, C66A029513179FAF
- 16: BBAB31F93B165465FE5E2133810E46C2, 146A3AA6A6A68E2A
+  0: , 5C7E2DC1EDC4A2C3
+  1: A0, 261565EAA758EDE4
+  2: D9A3, DB69625E0A482236
+  3: 24FF77, EEDE8B25C54FD6FC
+  4: E50379C7, 593CA74DED369316
+  5: B97E794387, C3B94E37EC8CC73D
+  6: 97D5EA990145, 8A4E4D0EF6BD0D11
+  7: C99C82C3DE57A8, 05CFE7406F2CE99F
+  8: 234CD0F6D7130A26, DDE441C5490AEB12
+  9: 92D4A7184BA6675978, E1581CE1444BE08E
+ 10: 8081C79F87CD727AD54F, 9A9A96082EC690FD
+ 11: E9D3A5084F343F1918B4A3, EFD4542587D3C5DC
+ 12: 03883C6376ECDF6920A13B10, F516CF01CD535DB6
+ 13: 6F0561BDD4344CBD5FC4A97848, 20C8C8F2CFACB2FD
+ 14: 84471FFB6BBB222902E8AB2C352B, D119D45DBD7B7D22
+ 15: AEBC54E4987FA01FA7EE237514D703, 7021FAEFC48DA692
+ 16: E907A9DC08A3152106399AA178A2B445, E756B6BBE721A3CC
 
 OCB-seed (16 byte key)
-  0: , 31FC3BE15BE66DE898D8E64F043EF5F2
-  1: 13, 71D7F7D74329C74E68209EBCEC6ED76B
-  2: 65DE, 63484B2DB036CE460F25E5F42FB996D9
-  3: A6F3A8, 779A84F1B325BC7746DD61C982C0C84A
-  4: CD93DE8A, 78B2B22BF20F341225D239AD89BC0400
-  5: 39D1DC6410, 6BD9D8849627A1C866C8882686F59F8E
-  6: 1A90FE8478E0, D99148D2185D130069D1007F759F1952
-  7: 7B021158285E6F, D64304C2FCB0C4207E1172D9F5EDFA54
-  8: 3938321C337EB440, 7535C124E443A1AAC16FF84A8A2D4E73
-  9: 69D89353ACD77C251A, 8BE9575D98A8F6BBA1BCF49F0D133A57
- 10: 4FA9D0AA53C795D8B4A6, D424622976F53C3F862D9C09780D134B
- 11: 10E2F16190079B783912FC, 3354E1E8AC4D661B82C1BE44A094E9C0
- 12: 87769AA867DF8624E1C6CC9C, 537FCA01A65D7783E7DF1D337D6F71E9
- 13: 0547E2F6A8017FF31D24EC9F20, 2ECC8DD05C36CCCB1262FFBE6A810E79
- 14: 6B234F55551F86F2478D6A7E910C, 91863300122086508F0259054125736E
- 15: AAF361AFF276F996740A110F1868F8, 9DCF980FB47D0533D168490887E1718F
- 16: 114A274873A4E60CD175DCC60823DE3F, 9C5F32D0D32F82FFE776025BACFFBF20
- 17: B13F7DC743D559613F563315D68EE30AF2, 9FDA482FEFFFE96F8F748A7B0DA24D71
- 18: 79A2D1D9667777680DB25BB68105378B7981, CC45BA5C13450BCDEACEDD602729A337
- 19: 683E53C85E7000019CD5B8C78FB66E3D4EE0C9, AA4533EBB37F197D1402143CCB0887F0
- 20: 546D9B5CF8FB4BC20CE200C67ACBEB79530AEEA8, 5E9C1CF09C360A0F0C386BD93A9C91F5
- 21: 8CB773A96DA7E4A83FA214BC94117CE042CC2620DD, 058229EBA77FF300E0448C29D37C839A
- 22: B13348E2E498E2A02B08CD94B5A66786334B0A415C4B, C9E19F610CC82B0242E8546272D20E3D
- 23: 53BD3612B86412C39B98C322AA0E6352A1A3A66A992EC2, 3880B204A156302679F07932103DD531
- 24: 30E2B86833BE1A5187E65F4EFC24D1F753EA2B5D89C87F06, 99FCBA36AB397837A7F9F53C0EF7DBC6
- 25: 03D03F968292C26A26CA833F5F186ACE9BC5D2B6678C4DC220, 3F34D2FBDFBD688A03C29E49B02DDF04
- 26: D443389FE849AF4A74DBDFA2936C8D7DC0C69721C2B3375DFA24, 10198F7477ECF631207AACEC364638A2
- 27: BAF661D4BA70F9E310CD930F36DE90CCDD9DB3473B8A5747A0B5A8, B080FEBEC0497EB16D978E3B8DFFDB77
- 28: 5FE274B3A042BC903879B600C0DF31EB66A260D8ECAE09E45DFA4650, EB35B008EBB5098CFA03B010E1B4AD4F
- 29: B124A2D8B0187DD409C7CAA44764C587052FB9B4750CA0DB0174D120CB, 2C48CC7B2D61D68B311F294AE6D6292B
- 30: 8488F0C46151994F7798F70F55C7DA1D242B58CFF49BBFF458D5E574EAD0, 94C2D7BB27BBE184AC75213C1147DA71
- 31: 84050C6EBBD37CFCB7DAAC665A15FE459E420FC32CB7677089B236E6EC06F4, 5AC1CDFB43DC955D727FDED9847D9CCE
- 32: 3EF03B96631A35B492DD1DC49D7862AA4D0DBDC9161D46711FA5360C1B4E76C7, 567869D045CF62531A10C6B9C3E4CE29
+  0: , A7D37A371F0B3596ACF3856B5D18B45E
+  1: 49, 3C671A1AFA5B253DD8FF67FFED9C33E4
+  2: B986, 2A069C4C6FF67FA6880D6EDA8490A3C6
+  3: F78307, AB6D00AB217E62E1C2863A63E7E805FF
+  4: C43CDED4, 9332E6E78B574354B866EB49B951AD6E
+  5: 47FBFDFF71, 14B3A25479FC36C71C837680871855C9
+  6: 4662362F3992, 28B8B162DDEAECC2AFD92C343C49D986
+  7: 64BE9B49D4E3F2, 6DD06663768ECDEBC64980E0FE11BA9C
+  8: DC6F456F02349DDD, D4CBE9414C65BEA4F1340707410A8D6F
+  9: E0C1166D7CA0A919B2, E7B742D40ACECC618A9012DA72C0DBB5
+ 10: 1E9B38CA4B1D2E41173F, 6F87E9D8B7EA96249B533FFB626773BB
+ 11: 7598A106F4A42DC2EBCEAA, 8A1358443F492C6996ECA14D41FCD91A
+ 12: 79C43C511A13395E5F1D259B, 0955EC3B5D6999D1DACA88E4B4B0EE77
+ 13: 39DD979B5CDC450D7E7D49136B, 78E5E86F6FE3EFC5827BF7F088EC8FF0
+ 14: A1C18979318C625FA4FCB0D40FC0, 6F9508959B87F510F3E7B39FF3237B7E
+ 15: D3A55B637FAF068BC97C52265B7DFC, 8C940DFDC990CAD1A08179784E668012
+ 16: DC120E50B38579CB4A45DC7D45C29AE6, 2E0939B538B26E0009B198D5C3E6DE17
+ 17: 266CD82BBCA8FBC6D146CD10DB417685F9, 0AE1614717E23EEFD5F9BE7916494A71
+ 18: 00741031BC893E10F6B86698B4B3787FA14A, C297ED582832F4B77C7AD820F5637EA7
+ 19: FFCF3CF4B06AA83E05E5C049DA2A4F1AB4843A, F2FB3E63B88B56E9D680560F346C6144
+ 20: 381DDB2637F17F8FFC619AF59A4DCAEA227E95A5, 82D692BD1F86AFD28EE140D021E69532
+ 21: 6267EDEE16E3FD95356079CC4366BCAA0739C5831B, 9D4F17B8A5E85E5CDD18FE16D6BE29F7
+ 22: 0B79A1E9B3EE98DD6EF57E4F23171D84D7250562B4C6, D76DB52F53F51553C604FF17E23253B4
+ 23: 1DED7558063E2F8B18514B8F5A3446981D6CD648ED098B, 0B209EE39335BD6336309D1DE1EBC379
+ 24: E3E3CF278C9FB18005A468674E1EC0CDB5DB5B42ED1CA4D3, 772C852C854303FED2DE41F8437E81C7
+ 25: 8D0F93686527DD62C4101B213B88930E375167E48B04446B90, 11BA6E13F45B82FD916644F859689AE6
+ 26: 1B45865FB91DB5E93D87569DDB8A1CC395381E875E5CA6EAC1F1, 8BCB49BD6D413542DC88156758EF8CBD
+ 27: 06C381B8028DAC54D785CABF55B47AD7BD2CFC6D66C4B538F287F4, DEBFCDB4E6C7A43B7D7E0983D4FC0C87
+ 28: D71A0CE6A88F80CC922189EFCA5696FE5C8F6557AB744698E4A65222, 4DCB5B5B0F9794D776C4C63C3E00C78C
+ 29: 23099CF8578E878B58589D6FFCAC8E6A74B373074D90E0F38ACCFB6117, A5B2C145ECF768842A957E47A8511D2F
+ 30: EC19652D148810E8C714D184263FE7E961FECE4C9CFD30D6921C32D2D4A9, 74B900BA5F4AE547C19221081DDC1F91
+ 31: 9DB58E1FEF922A4A1F99602710ABCA029E8A10383465C62967EB0A466F11AD, 08D4FF277C8DA53A2598201B255B7FD7
+ 32: 1BD03BAB70BE842FDB12E49DEB04AE477335B0B3930E75A27C37EBB1594099E7, 3A6DEAE1C289763C4405DE86544DF401
 
 OCB-kasumi (16 byte key)
-  0: , 8A6AB01A47834615
-  1: 23, 5184BF3E82D10C7F
-  2: FDDB, EA45B282D973729D
-  3: 8E3693, 432EFEDC2F238A6C
-  4: 2409AE69, 7899D1928D55C08B
-  5: CA037E6EF1, CA831CE963C9AD95
-  6: BC530A4140A2, EA77571BFFF105A1
-  7: 98B672C2D201EF, 607822313DBC9796
-  8: 26F9AB69E145B531, 7951CE4DC8C47F98
-  9: 30BFC33675F27F7EEB, D17DC60BF79939D2
- 10: F5F816B636D91279AC1C, E2C7B48991DEEF2F
- 11: 705C47FABE7905757C0ED2, AADB2A403B861D55
- 12: 50DEB9C57870B744152ADF08, CB6126DAB93504D1
- 13: 767CB16AA8380C8F25A28A2039, F2C271CC48E067E6
- 14: 3A67656FD8B6ABA8BE7F3BE6C123, 462B6736DF6DC3B1
- 15: 21FB98C62DF932E70D05EB915BA8CF, AEFB635A4E0B6C60
- 16: EA8305ADB368267AB86F3ADDE5EE1719, 97E72E1B174A04F7
+  0: , 85F676BFBCB7B036
+  1: 2D, BD6D4E9C82E5CA26
+  2: 724C, 2AA67DB029E78720
+  3: E762C3, 3217E72AF565E98F
+  4: 5A14AF1F, 6DE5CCF42AE4372D
+  5: 3FE0C9B5BC, 5E8CCCB96F1971A5
+  6: 647D9AE7286B, 1C53A14119C1A650
+  7: B1A5078D8E09BC, C2F46899E85A43EB
+  8: 4AAEF1B9316A1D2A, 4ADBC39C6CD59480
+  9: 97C4036A9EDB69F305, 7AF592CAB645C899
+ 10: 2F2EBFA927812C6F6FF9, AE0DEC9D2D8E5BB4
+ 11: B98061CC8801BE7A640651, 2CC2F1BBF418C4BF
+ 12: 9EE7742DBA13B66994FC5C53, BE6A9A6EDD45914C
+ 13: D1DBCFEEE8F2F5E94F74774CCE, 6D9377693CD38F8A
+ 14: 7D8C7B966FDAB2C4027220C77CAD, 8AF85A125D36D09C
+ 15: B254AE0DFA35531477D50906C695DC, 4FE0519983397BB0
+ 16: 223FB914E44BE1755D94F963BF701F90, 0C8D07BAA2D66E4E
 
 OCB-multi2 (40 byte key)
-  0: , AF7F5567D2CFBAA8
-  1: 15, 66BDF680986FAD17
-  2: C94C, D35B49ADC2B24181
-  3: A0516B, DBA6331562F87FE7
-  4: 49C24A69, 6B88C358FF40AD0F
-  5: E1839EFAB4, 08B6C2F97518E402
-  6: 71CF3D6DC458, 7CA89CC9D23CF4CE
-  7: 02AC7B36DCD0CC, 00331F043D5FB756
-  8: 216F3088BE2553AA, 8A58C76BF8EBC046
-  9: DA0CC0753327707AE3, 8716B1FB7196CB14
- 10: 12B88569BDAAACA144AE, 71A031364BF44ECD
- 11: 35B7F2ECD911F86DA2040C, 7649CD32D29AA258
- 12: BF20840BA08B0C85BEAC80B6, C8BD34015F1E3578
- 13: 2A3F508352AA5673BD5A880093, 9987F70EF92CE4E6
- 14: 5DC44D52A234D9A1ABA4C9BF8301, 728D3D9BC56140E7
- 15: 5FCB0AF77D9BA605056BA9178B15FC, A59675797C1307E2
- 16: 09BB95F7F998572CC38719BC4047BA3A, 5F4DA28D281C7FE9
+  0: , EA28ABA0D6F4E490
+  1: F7, 951E5C33632C1B2E
+  2: FD2B, 1C5912FD3190C3B1
+  3: 6AD41D, 38D5D04491483BE4
+  4: 611E46CD, 2B4C4AA96B9D4DE8
+  5: E2E52662AE, 24BC447CFACF4EA5
+  6: D3BEA1AD5905, AE39AC799F3BFAE5
+  7: 67FF55F2B4C49D, 426ECF9B4FAEB310
+  8: D823598A47C17669, 662829935E1DC1B2
+  9: CC194A8DF3491A595B, 559D45F5E4029FCF
+ 10: B51207427B00FCEBCA20, 806928EDDDCAAF67
+ 11: 95AD2F304AA91A0521BCF8, 0DD36DC4BFECE04B
+ 12: 13999C2A8C566FE58AFFC34E, 7D2943749BC160F3
+ 13: FEF35288E697EC0B96ED7351EE, 5999E5EAD14F635D
+ 14: 02DFF262D43C7796030F68DBDDE4, D6EEC27981EA7FD2
+ 15: D70DF509F5A6ED361C96F7B59C5F0A, 4B3F0ECE9E727DF4
+ 16: 966600DC680F216DB2591654161C51F2, 2F9985210161A9FE
 
 OCB-camellia (16 byte key)
-  0: , 3F877FAB2796D87C990AE311F952ABD1
-  1: 00, DD1FC339F770744F39B1A41A3A82CAEA
-  2: 2676, D350A1789213678BDCF07F1C42856456
-  3: F2BF5D, 012AD9BAA22496920EAC7ED7747C261E
-  4: 7C421EA6, 1187E883BE6BD6D6A67F175B187F276C
-  5: E709524F55, 36B849B052B8C5BA55AD9526333C0FF2
-  6: F49A3BEDA44C, CBCDE03DD9C5EBC7591329C5023F4F7C
-  7: 6BC6BA030C3E8A, 726E39A65F92ED22728ED4351DEECCFA
-  8: EBFCF5FED85EEACC, 5E390FA62857DAC97225368029263E00
-  9: 3DD92B177D039DF76F, 224D361D1A7D660485A9B3FD11DE370A
- 10: C90774C14A42828E7EDB, E6A48823F8F004EE5A178C37B87BA06A
- 11: 39089E93DC6E76B827B701, C2AAC46E4D1DE7F319B1E2592F9A29B9
- 12: 0C0C8ED5B3DD2C0A67606172, 2EA84EE1736B4F6F0C0A133C345B328E
- 13: AF6770413CDF0DCE68F447F76D, AB462C2F2524940FAB9A57A17FA2783B
- 14: C210E4CBBB5FD339B3FF90A722BD, 05A92BEFBFFEDA7F5FEB9BBC6E7BC363
- 15: 90FC04748C52CAA59BF6C92FF11F1B, 991C959C9E3B58D783120FAFF45C29E6
- 16: AB86F4DC4EDD4556F168A98249235F02, 92585560E23DFCF81B8551AA94135BB2
- 17: A160C9534C3E2185013F6D5D76E0218E7D, 9A3CDDFB67DB71D8E5BC4BE4D8EFDC4B
- 18: C08635F10D090C6A5DF4DC43DD9B58D50EC5, CC8A076D653B3FBC2AE34A8A0FF42609
- 19: 24C18B9EED5029BFAE91D440608BE46F9798AA, 9A56608D45081C2E5A8C9CC163A307DE
- 20: 5946CFA51DD90646F09CE74F96D4603CFB20B7A2, 1CD0CE9985AC99F2600B5D762BF46EC0
- 21: 08D8BB0667DC8106E365D7D685392DB987EFA5D3DF, C969DB2859DB494DDD57E9F93CF2C279
- 22: 4AF8331829032CD8BCFEF44CFB2DBC8F0931E055B7A2, 623C86EC7059B580124530CA201740F0
- 23: 45A7C23FD71657BEDA626937C187038D9E1872FBE029D8, 32E954062276603C2F588852C6A17B6F
- 24: 2EACBAD372A281A6AC79D6A13EF4D8F5FB0AA15224C7DBEF, 059A4622EB369FFD2A50565351202907
- 25: 405576484E48609F1BB950DEBE5F3915660A80E632E033DB4C, CAEAAB99D713B860F29E03AF719B5FC6
- 26: CC701CFF33D7CD69D6E9C20E15FC629B5375A3C9F8A9CCBB194A, B5F1CCD9E6C6DA25766CC11FFF313040
- 27: 1FD00A679D2F29518B5663A10CEBB83975C1D3183FD9F9617BBCB8, 03FCE87FFFEE68464DBCF9181280C0EB
- 28: B92D0C160F1A13504B55D9969CF9A51A3F0DFCB4911F7A4712D0E8FC, 8B858E49BFEE49A17F2D7E9A83CF2143
- 29: 5EC88A34A42C155A1F59947BBFD90B3FC8699EC8294EDEBEA75D8416CE, 1B8A62889CDCFAAB60FE80D8E9B764CE
- 30: 1A2D76510AA8AEC8ADCC71458E13592DDEC46CB2C92D551CDF4DA3C190F4, AD08510F3F1A2CBC608634D6431BECD5
- 31: 19ECDC6B7F8EC795F9E6D7E0E02F410228F9EBDA404BF3D998F99D938D3009, 58AF4CAFE7DDE4E99EC617D3A2AE600D
- 32: 6FCB93EBC43D6EE05E3EF20109328DFABE6D9D814BFCB7180AE36BBA1B96ECC8, 36032D6860317FF56E7033DCD8161FDC
+  0: , DFF7EA9ECD4E2AD37B9838E85F9D36EB
+  1: 1B, D5D37222F530EA2C282A4D8BC55A08EA
+  2: B73C, 5163F4BD7CBC03DA1B31C7C1105B5511
+  3: 42B8CB, 997087C18C191D560E3FCF70E77A3C15
+  4: F533FD5E, 15275FBDDED6459BFD8FBB8FA08DDD3F
+  5: CA7A675DD6, 11604097A97E10A4724799DC6A349F34
+  6: 00F4D4CAC81D, 9165C7B49928D47A8F3C17C0B029F44E
+  7: 8751CBEEC4D29C, F541920B2E92DE956B6468EF83DFECB0
+  8: B851DACF29824BF3, C16660EB40CF830FFD263C52C1FA8C97
+  9: 8646C3D808426E03E8, DB30D0CE9F7DA93162D69D42F0B4C644
+ 10: 0715BC4E51EAF610956D, 2475EAB0B92533BD574550F316C86746
+ 11: 12F6C6BE1A4AAD391BCDB4, F1F387AB03A4E36965CF41C6842950C4
+ 12: 4F85DAC1AB5B6D48CFA75266, 57B3ACD0FB6D2F8B672BF097E7C559A9
+ 13: FCD56B0CAF30F6A29324AA3067, 437461CFA9DE7562A572085439CE5B5D
+ 14: 612BD3BDAA826CCCC76722699D51, 90863205C506D85FEE095B32F3E1DF93
+ 15: 5C85AFD2B6A6FC85B282B57D48642E, C59DBD94D744A6F3745EBD9D4EBAE0F4
+ 16: 64173080FB3CB43EA8FD41F23DB88587, D80103E4C578DD4B79A23372E34ED967
+ 17: DBA50DDBF3B3F064F8E40967EB53769FB3, 4751B6EEAA9B2E49BF8B23A3BA13807D
+ 18: 04B8D0D351F3FA3B3B3F641A244EF7036825, 6BB18750DCEBD39DC25E42233475BE7E
+ 19: A15A0C3E91CE8AC01C8A5291D24FA0514453A8, 5DDC4FB9D6C7AAF7660B763EADAAD969
+ 20: 6E223B742F768FA57651AD90B6BDFAA772E6AC04, C987C8A3A27605B6CE04B25777286875
+ 21: 1FBFEA7AB374D972FBF76456048F77745D8E7B64C1, C301981D5C17473953B00818967E9230
+ 22: D642F5D05092443C776E53D6FCF2B65F6D25E8E98F89, 5E87E6BFA1EBD436909126197B2CCAA5
+ 23: A8270C56D2A0084670A0C5D8DA2B495A849D1BFC571912, C4D32192AC893C87C900EE2F80443789
+ 24: 431ED5C50F16D509C8229156E9BF0A7E1998F48F0032D91C, 960F4467E129A002CAC3F75EACCC7D73
+ 25: DB57EDEBCAA10C4B8E0194CEE7E778FDEFA88424883DC476DC, 069F456F5AF43492AEDC7FC24A0ED875
+ 26: DC8AF80FE840605041638184A00F683FB0AB86C4067550B4DB49, 862057189AC987639992EA9F49C7158E
+ 27: 6A67318A81F95E33F741C95BCBCD8623CBF26D2D8801D0E745DFB6, 22DA5E8C63CEBC5A6957FB1A01AC7571
+ 28: 70587F34F31CF711F2558C7DB1B04334DD58D850930ACDD5825EE131, D2436CA4FC757B16509CECA1272A2955
+ 29: 736DF200A877930DA3EC2FD0AF53F08285E02EFB519A443F50B9E2F1F1, 22607EA2C6F1AE1B73785554F9440F2B
+ 30: 62248D90EA60163F9CBDFAEC498802AA816915273093D375B02BBE22241B, BFADB3689B3863AB997D101380F7156A
+ 31: 41C092516DC494E4E165EABAF939858EDAE3D3DAE488D14EFDB0E850675565, F45307A495AFE24E29E2AB744311F07C
+ 32: EFFEAF5A73C2A825AFEE12A2BE80406937C75D4264FD937A310FA57C7D5D01CB, 3B430C0DA47DAA069FCC5C92C5427396
 
diff --git a/src/encauth/ocb3/ocb3_decrypt_verify_memory.c b/src/encauth/ocb3/ocb3_decrypt_verify_memory.c
index da54ffa..9288d33 100644
--- a/src/encauth/ocb3/ocb3_decrypt_verify_memory.c
+++ b/src/encauth/ocb3/ocb3_decrypt_verify_memory.c
@@ -69,7 +69,7 @@ int ocb3_decrypt_verify_memory(int cipher,
       return CRYPT_MEM;
    }
 
-   if ((err = ocb3_init(ocb, cipher, key, keylen, nonce, noncelen)) != CRYPT_OK) {
+   if ((err = ocb3_init(ocb, cipher, key, keylen, nonce, noncelen, taglen)) != CRYPT_OK) {
       goto LBL_ERR;
    }
 
diff --git a/src/encauth/ocb3/ocb3_encrypt_authenticate_memory.c b/src/encauth/ocb3/ocb3_encrypt_authenticate_memory.c
index 1f81a26..10d1617 100644
--- a/src/encauth/ocb3/ocb3_encrypt_authenticate_memory.c
+++ b/src/encauth/ocb3/ocb3_encrypt_authenticate_memory.c
@@ -55,7 +55,7 @@ int ocb3_encrypt_authenticate_memory(int cipher,
       return CRYPT_MEM;
    }
 
-   if ((err = ocb3_init(ocb, cipher, key, keylen, nonce, noncelen)) != CRYPT_OK) {
+   if ((err = ocb3_init(ocb, cipher, key, keylen, nonce, noncelen, *taglen)) != CRYPT_OK) {
       goto LBL_ERR;
    }
 
diff --git a/src/encauth/ocb3/ocb3_init.c b/src/encauth/ocb3/ocb3_init.c
index 1d88736..9cea63d 100644
--- a/src/encauth/ocb3/ocb3_init.c
+++ b/src/encauth/ocb3/ocb3_init.c
@@ -41,7 +41,8 @@ static const struct {
 */
 int ocb3_init(ocb3_state *ocb, int cipher,
              const unsigned char *key, unsigned long keylen,
-             const unsigned char *nonce, unsigned long noncelen)
+             const unsigned char *nonce, unsigned long noncelen,
+             unsigned long taglen)
 {
    int poly, x, y, m, err;
    unsigned char *previous, *current;
@@ -62,6 +63,11 @@ int ocb3_init(ocb3_state *ocb, int cipher,
       return CRYPT_INVALID_ARG;
    }
 
+   /* Make sure taglen isn't too long */
+   if (taglen > (unsigned long)cipher_descriptor[cipher].block_length) {
+      taglen = cipher_descriptor[cipher].block_length;
+   }
+
    /* determine which polys to use */
    ocb->block_len = cipher_descriptor[cipher].block_length;
    x = (int)(sizeof(polys)/sizeof(polys[0]));
@@ -114,7 +120,7 @@ int ocb3_init(ocb3_state *ocb, int cipher,
    }
 
    /* initialize ocb->Offset_current = Offset_0 */
-   ocb3_int_calc_offset_zero(ocb, nonce, noncelen);
+   ocb3_int_calc_offset_zero(ocb, nonce, noncelen, taglen);
 
    /* initialize checksum to all zeros */
    zeromem(ocb->checksum, ocb->block_len);
diff --git a/src/encauth/ocb3/ocb3_int_calc_offset_zero.c b/src/encauth/ocb3/ocb3_int_calc_offset_zero.c
index 2d5a976..a80c6b7 100644
--- a/src/encauth/ocb3/ocb3_int_calc_offset_zero.c
+++ b/src/encauth/ocb3/ocb3_int_calc_offset_zero.c
@@ -21,7 +21,7 @@
    @param nonce     The session nonce
    @param noncelen  The length of the session nonce (octets)
 */
-void ocb3_int_calc_offset_zero(ocb3_state *ocb, const unsigned char *nonce, unsigned long noncelen)
+void ocb3_int_calc_offset_zero(ocb3_state *ocb, const unsigned char *nonce, unsigned long noncelen, unsigned long taglen)
 {
    int x, y, bottom;
    int idx, shift;
@@ -35,6 +35,7 @@ void ocb3_int_calc_offset_zero(ocb3_state *ocb, const unsigned char *nonce, unsi
      iNonce[x] = nonce[noncelen-y-1];
    }
    iNonce[x] = 0x01;
+   iNonce[0] |= ((taglen*8) % 128) << 1;
 
    /* bottom = str2num(Nonce[123..128])               */
    bottom = iNonce[ocb->block_len-1] & 0x3F;
diff --git a/src/encauth/ocb3/ocb3_test.c b/src/encauth/ocb3/ocb3_test.c
index a9bfb61..f12f897 100644
--- a/src/encauth/ocb3/ocb3_test.c
+++ b/src/encauth/ocb3/ocb3_test.c
@@ -27,7 +27,7 @@ int ocb3_test(void)
    /* test vectors from: http://tools.ietf.org/html/draft-krovetz-ocb-03 */
    unsigned char key[16]   = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F };
    unsigned char nonce[12] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B };
-   static const struct {
+   const struct {
          int ptlen;
          int aadlen;
          unsigned char pt[64], aad[64], ct[64], tag[16];
@@ -163,6 +163,44 @@ int ocb3_test(void)
    },
 
 };
+   /* As of RFC 7253 - 'Appendix A.  Sample Results'
+    *    The next tuple shows a result with a tag length of 96 bits and a
+   different key.
+
+     K: 0F0E0D0C0B0A09080706050403020100
+
+     N: BBAA9988776655443322110D
+     A: 000102030405060708090A0B0C0D0E0F1011121314151617
+        18191A1B1C1D1E1F2021222324252627
+     P: 000102030405060708090A0B0C0D0E0F1011121314151617
+        18191A1B1C1D1E1F2021222324252627
+     C: 1792A4E31E0755FB03E31B22116E6C2DDF9EFD6E33D536F1
+        A0124B0A55BAE884ED93481529C76B6AD0C515F4D1CDD4FD
+        AC4F02AA
+
+        The C has been split up in C and T (tag)
+    */
+   const unsigned char K[] = { 0x0F,0x0E,0x0D,0x0C,0x0B,0x0A,0x09,0x08,
+                               0x07,0x06,0x05,0x04,0x03,0x02,0x01,0x00 };
+   const unsigned char N[] = { 0xBB,0xAA,0x99,0x88,0x77,0x66,0x55,0x44,
+                               0x33,0x22,0x11,0x0D };
+   const unsigned char A[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+                               0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
+                               0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+                               0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
+                               0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27 };
+   const unsigned char P[] = { 0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,
+                               0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
+                               0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
+                               0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
+                               0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27 };
+   const unsigned char C[] = { 0x17,0x92,0xA4,0xE3,0x1E,0x07,0x55,0xFB,
+                               0x03,0xE3,0x1B,0x22,0x11,0x6E,0x6C,0x2D,
+                               0xDF,0x9E,0xFD,0x6E,0x33,0xD5,0x36,0xF1,
+                               0xA0,0x12,0x4B,0x0A,0x55,0xBA,0xE8,0x84,
+                               0xED,0x93,0x48,0x15,0x29,0xC7,0x6B,0x6A };
+   const unsigned char T[] = { 0xD0,0xC5,0x15,0xF4,0xD1,0xCD,0xD4,0xFD,
+                               0xAC,0x4F,0x02,0xAA };
 
    int err, x, idx, res;
    unsigned long len;
@@ -206,6 +244,36 @@ int ocb3_test(void)
            return CRYPT_FAIL_TESTVECTOR;
         }
     }
+    x = 99;
+    len = 12;
+    if ((err = ocb3_encrypt_authenticate_memory(idx,
+                                                K, sizeof(K),
+                                                N, sizeof(N),
+                                                A, sizeof(A),
+                                                P, sizeof(P),
+                                                outct, outtag, &len)) != CRYPT_OK) {
+       return err;
+    }
+
+    if (compare_testvector(outtag, len, T, sizeof(T), "OCB3 Tag", x) ||
+          compare_testvector(outct, sizeof(P), C, sizeof(C), "OCB3 CT", x)) {
+       return CRYPT_FAIL_TESTVECTOR;
+    }
+
+    if ((err = ocb3_decrypt_verify_memory(idx,
+                                          K, sizeof(K),
+                                          N, sizeof(N),
+                                          A, sizeof(A),
+                                          C, sizeof(C),
+                                          outct, T, sizeof(T), &res)) != CRYPT_OK) {
+       return err;
+    }
+    if ((res != 1) || compare_testvector(outct, sizeof(C), P, sizeof(P), "OCB3", x)) {
+#ifdef LTC_TEST_DBG
+       printf("\n\nOCB3: Failure-decrypt - res = %d\n", res);
+#endif
+       return CRYPT_FAIL_TESTVECTOR;
+    }
     return CRYPT_OK;
 #endif /* LTC_TEST */
 }
diff --git a/src/headers/tomcrypt_mac.h b/src/headers/tomcrypt_mac.h
index 94d4a14..b74761c 100644
--- a/src/headers/tomcrypt_mac.h
+++ b/src/headers/tomcrypt_mac.h
@@ -271,7 +271,8 @@ typedef struct {
 
 int ocb3_init(ocb3_state *ocb, int cipher,
              const unsigned char *key, unsigned long keylen,
-             const unsigned char *nonce, unsigned long noncelen);
+             const unsigned char *nonce, unsigned long noncelen,
+             unsigned long taglen);
 
 int ocb3_encrypt(ocb3_state *ocb, const unsigned char *pt, unsigned long ptlen, unsigned char *ct);
 int ocb3_decrypt(ocb3_state *ocb, const unsigned char *ct, unsigned long ctlen, unsigned char *pt);
@@ -302,7 +303,7 @@ int ocb3_test(void);
 #ifdef LTC_SOURCE
 /* internal helper functions */
 int ocb3_int_aad_add_block(ocb3_state *ocb, const unsigned char *aad_block);
-void ocb3_int_calc_offset_zero(ocb3_state *ocb, const unsigned char *nonce, unsigned long noncelen);
+void ocb3_int_calc_offset_zero(ocb3_state *ocb, const unsigned char *nonce, unsigned long noncelen, unsigned long taglen);
 int ocb3_int_ntz(unsigned long x);
 void ocb3_int_xor_blocks(unsigned char *out, const unsigned char *block_a, const unsigned char *block_b, unsigned long block_len);
 #endif /* LTC_SOURCE */