Merge branch '2.4.x' into 2.5.x

[catacomb] / symm / t / des3

diff --git a/symm/t/des3 b/symm/t/des3
index 87ed8a7..afe7398 100644 (file)
--- a/symm/t/des3
+++ b/symm/t/des3
@@ -120,6 +120,129 @@ des3-cmac {
     2753a7135b48898f;
 }
 
+des3-ccm {
+  60d7bcda163547d348b7551195e7
+    702290
+    ""
+    ""
+    ""
+    aa48bfd6;
+  7dd1dff7dac5c9941d26d0c6eb14
+    ad568f
+    86
+    ""
+    ""
+    06de8798;
+  edd1dc9268eeee533285a6ed810c
+    9b689d
+    ""
+    aa
+    67
+    35d148d9;
+  a9060d2d4b6003062365b0a54364
+    c76c160f11
+    896c4794846ecfa14a7130c9f137120634c9519848a877ff
+    77bf79192a5b50ade5d9cd739a3d1f337f29549e6b0d27a4
+    a0cbf7ade835afc80d0244a41b72699e7f135479dcbf06f7
+    9d8fd60bbb5deed9;
+  ba234085406a6136512061f7080c
+    c07df0591d
+    8fa21f2dd88374d8cde8e160ad10997a21635c
+    6d62c9269029df3e6057acc87638f508046733d9ff61cdbda3b3e98787
+    09be940770a72970058ad3f06c973a2b58a7cc912892bc397eff73662e
+    9146a93e7398cddb;
+  31ebfedd4705e505
+    da1435
+    ""
+    ""
+    ""
+    92740192;
+  dceaa7b1cc49ae1d
+    50c382
+    01
+    ""
+    ""
+    d1803413;
+  a894476b3f102b75
+    2eb952
+    ""
+    95
+    63
+    c416162e;
+  33966f27043eb621
+    b7f65b0009
+    61040ef2f9b2fc5fa450727a9b542cde52ebfda19d0ccc52
+    0f215eb57bb3a4f3ebbbb18ac6c95a97a48030370c33d090
+    b70fe9f3c530c75595207f22867614779980e9ada1c35be5
+    236101f21d127547;
+  c54215abd6b3ad54
+    efc9a38378
+    c5b93bf4f2aad2605faee2b03fb648e27fff63
+    102758fe2b69ac26afa3349829b94586306fed54154f8f28523c03d4de
+    ffc2c6c900f35a8d4c0bc244cf5ebff8f9999f4ce5759b39131585d376
+    9661947e6ea6d306;
+  1600157846b710ee72807a2219bfb474
+    fd71d8
+    ""
+    ""
+    ""
+    1afd62e9;
+  91f24bb65d1563259f9eb53b571ea629
+    c54d57
+    dd
+    ""
+    ""
+    9be5f1b8;
+  2d42f70800df9fcbaca48b77dba18919
+    6d1ebb
+    ""
+    a1
+    2f
+    8ec7e387;
+  0b0467cb9fc2712a199e533fa9156308
+    cdec3f7682
+    81e040a9b9a222bd689aef66f5306ceb0c6b08ac8b0a2226
+    0c571b4a42bb8fdb233bfa6a5cfb0bad7d95214ade49cb3b
+    479741dd816d10d912b027aa913872636fc029c5b3b5e786
+    b52afd4780869038;
+  6f5fe8368131115c037ba323fe1dc815
+    1784873f0e
+    b5b647da6794c18b5337685a96ed65b9aca338
+    527ef19b09c063c46f88de9fd41e72d7b97e23e6eabdff3bcd21149926
+    2659d885994c1c74498d5caa2a19430c3622f508c1754794f736759134
+    1fd64bfce60b9b7c;
+  8878dbf30f1dad89d4b9b12012e4713df46795630e
+    7952d2
+    ""
+    ""
+    ""
+    cbf3fe95;
+  2bb02d7100b8b649377d20a8f083455b663e4ee131
+    5f3c8f
+    2a
+    ""
+    ""
+    622e5637;
+  ebfa921451dcd1af5813b70d30ce2f1fef6ef315d0
+    798391
+    ""
+    80
+    71
+    1a8cd2c7;
+  5da08da3aefc5f8584b7c5e617669c0f16e39815d4
+    e9cfce3ed1
+    ecdf3d264a7f16cb16c2e815f422cdf0c8e30308be3c31e6
+    bc58c0b7cadcb658b970e47479a684b5aefa69a4cd52147e
+    820f2b98a0887f75cabdd9085299ba9d20e0c02e0e997019
+    4b2b92958f792723;
+  d12ca986981a874498ad0abef8bc4fcb70e27e98ef
+    1f0446b42f
+    b144d44b6d00f06dc188d472a784e0c6f21195
+    a3b9f4ae985511265febd11c164720eef9eb1c8dd0b00951f284649016
+    04baa89b0f016a9eb9f9f555b539e33fde914515ab13f2506927f4a0db
+    266553d3216d3444;
+}
+
 des3-eax {
   60d7bcda163547d348b7551195e7
     ""
@@ -437,3 +560,417 @@ des3-gcm {
     fc2c1515c5fc3f727fb3e98ba249a076c3da8668f5e89db6e7956de064
     a2411e499cacffef;
 }
+
+des3-ocb1 {
+  60d7bcda163547d348b7551195e7
+    7022907dd1dff7da
+    ""
+    ""
+    ""
+    cbd24ffb264f16ad;
+  c5c9941d26d0c6eb14ad568f86ed
+    d1dc9268eeee5332
+    85
+    ""
+    ""
+    a6e1ad4b16d8d99b;
+  a6ed810c9b689daaa9060d2d4b60
+    03062365b0a54364
+    ""
+    c7
+    a2
+    df1618790e682c74;
+  6c160f11896c4794846ecfa14a71
+    30c9f137120634c9
+    ""
+    519848a877ff77bf79192a5b50ade5d9cd739a3d1f337f29
+    51d9c953558e88ed892717edb5839471bab17ebda859fa2d
+    673b34362686d614;
+  549e6b0d27a4ba234085406a6136
+    512061f7080cc07d
+    f0591d8fa21f2dd88374d8cde8e160ad10997a21635c6d62
+    c9269029df3e6057acc87638f508046733d9ff61cdbda3b3
+    9e9db1333c288d89f1d852453679fd4a9df932ee424b56e6
+    0e15cfad6c6299f4;
+  e9878731ebfedd4705e505da1435
+    dceaa7b1cc49ae1d
+    ""
+    50c38201a894476b3f102b752eb9529533966f27043eb621b7f65b0009
+    79f213b6e9d3b4a233652364a0741f0a3905112cdcc65fc6a1f02b20e1
+    fb385d47f056ea7a;
+  61040ef2f9b2fc5fa450727a9b54
+    2cde52ebfda19d0c
+    cc520f215eb57bb3a4f3ebbbb18ac6c95a97a4
+    8030370c33d090c54215abd6b3ad54efc9a38378c5b93bf4f2aad2605f
+    1b7e1e5164841c4478deb10a87cc07f70db15af1b12790fb9f8ea16d79
+    e0d1715f5e9373c7;
+  aee2b03fb648e27f
+    ff63102758fe2b69
+    ""
+    ""
+    ""
+    4b884a39fbc7c745;
+  ac26afa3349829b9
+    4586306fed54154f
+    8f
+    ""
+    ""
+    d445ece0ef590e55;
+  28523c03d4de1600
+    157846b710ee7280
+    ""
+    7a
+    0e
+    020e28ecb1a51fd3;
+  2219bfb474fd71d8
+    91f24bb65d156325
+    ""
+    9f9eb53b571ea629c54d57dd2d42f70800df9fcbaca48b77
+    a683ff420e8f9ea9467dd595afc344a0d25d20ea01c93b21
+    2748703cfe3e8226;
+  dba189196d1ebba1
+    0b0467cb9fc2712a
+    199e533fa9156308cdec3f768281e040a9b9a222bd689aef
+    66f5306ceb0c6b08ac8b0a22260c571b4a42bb8fdb233bfa
+    aad5b6cbb6216005d17943984bb41bc4b6ba873ca43cb46b
+    d2c66cd04f05868e;
+  6a5cfb0bad7d9521
+    4ade49cb3b6f5fe8
+    ""
+    368131115c037ba323fe1dc8151784873f0eb5b647da6794c18b533768
+    db8d34944ff3c0cdda5436416fb627c58f9b02d925b59a9b68fbbeda2a
+    06b84a7b2c9665a4;
+  5a96ed65b9aca338
+    527ef19b09c063c4
+    6f88de9fd41e72d7b97e23e6eabdff3bcd2114
+    99268878dbf30f1dad89d4b9b12012e4713df46795630e7952d22bb02d
+    db5cd9c16b245b3b5078d900f5d270cb81567d73703c2c95925a7237d3
+    eef56cad5b7f2ed2;
+  7100b8b649377d20a8f083455b663e4e
+    e1315f3c8f2aebfa
+    ""
+    ""
+    ""
+    56ad76ec7f013571;
+  921451dcd1af5813b70d30ce2f1fef6e
+    f315d0798391805d
+    a0
+    ""
+    ""
+    6542ea8693b8cd18;
+  8da3aefc5f8584b7c5e617669c0f16e3
+    9815d4e9cfce3ed1
+    ""
+    ec
+    35
+    90d173ba8349a22b;
+  df3d264a7f16cb16c2e815f422cdf0c8
+    e30308be3c31e6bc
+    ""
+    58c0b7cadcb658b970e47479a684b5aefa69a4cd52147ed1
+    64348fc5f46a28edab91b5d41e27ab352fa8ca90d322b603
+    b894f7a0cf918ae2;
+  2ca986981a874498ad0abef8bc4fcb70
+    e27e98ef1f0446b4
+    2fb144d44b6d00f06dc188d472a784e0c6f21195a3b9f4ae
+    985511265febd11c164720eef9eb1c8dd0b00951f2846490
+    dc70ae429c73fd871a49ab5aea8ed37196a151ad8d09dc3c
+    f76847ab0c01c5bd;
+  16ed00456331854bc78bf43966eb0cfa
+    9138ddc399084456
+    ""
+    08fe95e81c2533e31c9c1a9851bc2810d858cbbc8424d126b807e6daa0
+    7fcb46d49d63ecf4d49c4578841b1cc435362eb989098c8729fa7c8b7c
+    170621267d144a86;
+  89c3f9099c5ffb824173d7634c04226f
+    30cbb7f0e4a973a8
+    cd190107314717a77456f3ff669c732b58db8f
+    48af65f7cc9e3fb90e1721b730374ffc9bc597f56ccbb2f294b38766fc
+    b0ecb19f5804122fb10b38ce2354dd1b9001c8e4f96d9f3a8b054ef79b
+    e3cfbcf2b101c897;
+  69f6a9f2c0945ffd505003cc0cae9ce021a5f1fa4f
+    fa91544485f1a125
+    ""
+    ""
+    ""
+    efc673f15d727525;
+  8b2b9b8f0911e32d65cc1770a18cbfe6effd1ff677
+    8554acf1270485b2
+    03
+    ""
+    ""
+    4be4ef9aa08e493e;
+  a3c1c4c967c0a458cb948bdd409b687fa3a6827b48
+    0aa3a4c84cef64f6
+    ""
+    c9
+    60
+    3c76403cf147a5a0;
+  b53bf8f957f4b03cf43e89957f9a3e8128f8743d16
+    687b7bb8deb9bd20
+    ""
+    5b70e04c091d205cdad9e9a79b1abf91b0851e5ca605ac84
+    6a5f5444d206a359b01efa29f51c6d3f13c050b663f1ea32
+    4ed8de43ccd151ef;
+  51399587011677508a15dde524af3e2bee0646541a
+    42c2ecccb44d65ba
+    d397abfaf529ee41cf9a05c7efedef3401539c51d2a90bbf
+    7f1bfc338ab0ef5746ea8fdcccd213e33f7e8a5718fd2501
+    db5dbdd217bb8761aea78de2a51b9ab2bcb9559bfae22dfa
+    002834c8f3b3d2f1;
+  4107c8e7d715a92add9589d1f5c054b2d983514605
+    ec590294a319b980
+    ""
+    2068a9f891bc5ba5afabf8c3122d12d7ff3c41122d70d17d4569eaff59
+    9a6b4f24093acdff2a03f9a40494e1e6dd2ed10be75cdf9fb4381f7a1e
+    c492487046c80434;
+  a332ba58d5d5589bfe079753ee1a957eb6d6699e6b
+    7ea2725cb2dac07e
+    cde95759ac46fee6dda7abc8ad68daac90cfe2
+    2d2f1f2968cc42fa8b669ed3bb3542a9cf44bbc8c6254d980398bd94e6
+    14bc7ec21221fab0d0a55be9d505c315ef5ef5a01c9a5d8c71c6a8a569
+    598c7a7659a4ece7;
+}
+
+des3-pmac1 {
+  60d7bcda163547d348b7551195e7
+    ""
+    4ee97adb08a4f1ca;
+  7022907dd1dff7dac5c9941d26d0
+    c6
+    9280792119f1c90a;
+  eb14ad568f86edd1dc9268eeee53
+    3285a6ed810c9b689daaa9060d2d4b6003062365b0a54364
+    d3b9cda12ef855c9;
+  c76c160f11896c4794846ecfa14a
+    7130c9f137120634c9519848a877ff77bf7919
+    ccb225988c72647f;
+  2a5b50ade5d9cd73
+    ""
+    29b6cbd6a39de3ea;
+  9a3d1f337f29549e
+    6b
+    a44255ba14c7c82e;
+  0d27a4ba23408540
+    6a6136512061f7080cc07df0591d8fa21f2dd88374d8cde8
+    4ae6eee38bf7dfc3;
+  e160ad10997a2163
+    5c6d62c9269029df3e6057acc87638f5080467
+    de786269abfb7dce;
+  33d9ff61cdbda3b3e9878731ebfedd47
+    ""
+    8e4e4d58688d0661;
+  05e505da1435dceaa7b1cc49ae1d50c3
+    82
+    1eb3af80bd877e09;
+  01a894476b3f102b752eb9529533966f
+    27043eb621b7f65b000961040ef2f9b2fc5fa450727a9b54
+    ba1f17ab53c77f9c;
+  2cde52ebfda19d0ccc520f215eb57bb3
+    a4f3ebbbb18ac6c95a97a48030370c33d090c5
+    614b8997f580de04;
+  4215abd6b3ad54efc9a38378c5b93bf4f2aad2605f
+    ""
+    79469a20ba34f900;
+  aee2b03fb648e27fff63102758fe2b69ac26afa334
+    98
+    69f377b3ea8e925c;
+  29b94586306fed54154f8f28523c03d4de16001578
+    46b710ee72807a2219bfb474fd71d891f24bb65d1563259f
+    6e0adaf190bd2ea1;
+  9eb53b571ea629c54d57dd2d42f70800df9fcbaca4
+    8b77dba189196d1ebba10b0467cb9fc2712a19
+    129deaeec0e03d30;
+}
+
+des3-ocb3 {
+  60d7bcda163547d348b7551195e7
+    7022907dd1df
+    ""
+    ""
+    ""
+    9bd7647cc6fc5088;
+  f7dac5c9941d26d0c6eb14ad568f
+    86edd1dc9268
+    ee
+    ""
+    ""
+    651a2beca10057bf;
+  ee533285a6ed810c9b689daaa906
+    0d2d4b600306
+    ""
+    23
+    61
+    55bdc89a749be10d;
+  65b0a54364c76c160f11896c4794
+    846ecf
+    ""
+    a14a7130c9f137120634c9519848a877ff77bf79192a5b50
+    04994fd2405c66040b24f1e112d12a373a5ded3204e93dfc
+    4d28060d06c1e6c9;
+  ade5d9cd739a3d1f337f29549e6b
+    0d27a4ba23
+    4085406a6136512061f7080cc07df0591d8fa21f2dd88374
+    d8cde8e160ad10997a21635c6d62c9269029df3e6057acc8
+    bd32ead43e0c7e3cdf30ec74e82e9db51a480c4bce6dfdfe
+    2440122fa77e088a;
+  7638f508046733d9ff61cdbda3b3
+    e9878731ebfe
+    ""
+    dd4705e505da1435dceaa7b1cc49ae1d50c38201a894476b3f102b752e
+    e7086ac5c54bba010b3597e95d8035ba213d20c55f50558f13f3725cb8
+    5f2cd9483cb3a2ac;
+  b9529533966f27043eb621b7f65b
+    000961040ef2
+    f9b2fc5fa450727a9b542cde52ebfda19d0ccc
+    520f215eb57bb3a4f3ebbbb18ac6c95a97a48030370c33d090c54215ab
+    960f222b5a4b66a7a416bf51be1cbfbaffd7626fd3449cfac5ec66cd94
+    0cfa7a7a8b52f6d3;
+  d6b3ad54efc9a383
+    78c5b93bf4f2
+    ""
+    ""
+    ""
+    f3be635a1f9bbcfa;
+  aad2605faee2b03f
+    b648e27fff63
+    10
+    ""
+    ""
+    27972bc75183a1f2;
+  2758fe2b69ac26af
+    a3349829b945
+    ""
+    86
+    6d
+    1449c4672751ce11;
+  306fed54154f8f28
+    523c03
+    ""
+    d4de1600157846b710ee72807a2219bfb474fd71d891f24b
+    2f9edc04b832738964e4ef2c18a17b1eaf8ec0a325e08b9d
+    df25c2d0f9430d6f;
+  b65d1563259f9eb5
+    3b571ea629
+    c54d57dd2d42f70800df9fcbaca48b77dba189196d1ebba1
+    0b0467cb9fc2712a199e533fa9156308cdec3f768281e040
+    c6b34746675339e4f07cc680e5b8e3e5da5541a92c659459
+    a6d7adc34d54cb89;
+  a9b9a222bd689aef
+    66f5306ceb0c
+    ""
+    6b08ac8b0a22260c571b4a42bb8fdb233bfa6a5cfb0bad7d95214ade49
+    79c706a66a8ebc8376e149588ab5584dcc7d59a37782abce2725bf2831
+    9d6ffb6e4cb098a5;
+  cb3b6f5fe8368131
+    115c037ba323
+    fe1dc8151784873f0eb5b647da6794c18b5337
+    685a96ed65b9aca338527ef19b09c063c46f88de9fd41e72d7b97e23e6
+    da06bb4d2dc9612e2b9e1f38b4a9cf88c5f93c0ebbc12dc6894c42fb73
+    86be658d949b0120;
+  eabdff3bcd211499268878dbf30f1dad
+    89d4b9b12012
+    ""
+    ""
+    ""
+    a2599ce8b6a5832e;
+  e4713df46795630e7952d22bb02d7100
+    b8b649377d20
+    a8
+    ""
+    ""
+    1b9d7c64f893467a;
+  f083455b663e4ee1315f3c8f2aebfa92
+    1451dcd1af58
+    ""
+    13
+    d4
+    7702114c8465f527;
+  b70d30ce2f1fef6ef315d0798391805d
+    a08da3
+    ""
+    aefc5f8584b7c5e617669c0f16e39815d4e9cfce3ed1ecdf
+    23275152a0a4c447adf86084cad8e537778f46150a4430aa
+    a44aba0c5685823a;
+  3d264a7f16cb16c2e815f422cdf0c8e3
+    0308be3c31
+    e6bc58c0b7cadcb658b970e47479a684b5aefa69a4cd5214
+    7ed12ca986981a874498ad0abef8bc4fcb70e27e98ef1f04
+    55917e61b80378e828b2cb53911b751df969fb0aaf39a0a1
+    cc006e8fa8f47da1;
+  46b42fb144d44b6d00f06dc188d472a7
+    84e0c6f21195
+    ""
+    a3b9f4ae985511265febd11c164720eef9eb1c8dd0b00951f284649016
+    67426920d7bb581d90c8c9b561d504d9729a024b2d26a34233f624bf35
+    3e0e6eaf9b8d41c2;
+  ed00456331854bc78bf43966eb0cfa91
+    38ddc3990844
+    5608fe95e81c2533e31c9c1a9851bc2810d858
+    cbbc8424d126b807e6daa089c3f9099c5ffb824173d7634c04226f30cb
+    42eff82d31f0ca1cb79604219601c56c9d4e60ea08ab0e2be33b87fd70
+    70e2f64112ef6d62;
+  b7f0e4a973a8cd190107314717a77456f3ff669c73
+    2b58db8f48af
+    ""
+    ""
+    ""
+    f8608b8da49f9700;
+  65f7cc9e3fb90e1721b730374ffc9bc597f56ccbb2
+    f294b38766fc
+    69
+    ""
+    ""
+    df345d63832f4e3d;
+  f6a9f2c0945ffd505003cc0cae9ce021a5f1fa4ffa
+    91544485f1a1
+    ""
+    25
+    eb
+    17c6a45486274633;
+  8b2b9b8f0911e32d65cc1770a18cbfe6effd1ff677
+    8554ac
+    ""
+    f1270485b203a3c1c4c967c0a458cb948bdd409b687fa3a6
+    359c9f7d642db7d7d35ed57a183a25212c054d25a4de09e3
+    065d208592dbdc5c;
+  827b480aa3a4c84cef64f6c9b53bf8f957f4b03cf4
+    3e89957f9a
+    3e8128f8743d16687b7bb8deb9bd205b70e04c091d205cda
+    d9e9a79b1abf91b0851e5ca605ac8451399587011677508a
+    271c63ace6900ca3d2ea38737ff73f9298b4f6484ff4c916
+    32315b959ad39d8f;
+  15dde524af3e2bee0646541a42c2ecccb44d65bad3
+    97abfaf529ee
+    ""
+    41cf9a05c7efedef3401539c51d2a90bbf7f1bfc338ab0ef5746ea8fdc
+    0a1bc356fb7cbe2959c09e1c504326d0544a16fa91596ca1bfbf69cd9f
+    0c1a33dffaebcbb8;
+  ccd213e33f7e8a5718fd25014107c8e7d715a92add
+    9589d1f5c054
+    b2d983514605ec590294a319b9802068a9f891
+    bc5ba5afabf8c3122d12d7ff3c41122d70d17d4569eaff59a332ba58d5
+    0e2f842eda3840dd0b22d2e5ec4e7280d96916ca08fa43b74ce34d1be9
+    32dc28ff4706c6fb;
+}
+
+des3-ocb3-mct {
+  24 d3d27b14989225a9;
+  21 eb3be38e3517c6d1;
+  16 07135a64481e5862;
+  14 812edbcd44bd9e1a;
+   8 d3d27b14989225a9;
+   7 eb3be38e3517c6d1;
+  24 70d5d3c75417;
+  21 93e83240fae6;
+  16 58382ba741ab;
+  14 6c492c0d482a;
+   8 70d5d3c75417;
+   7 93e83240fae6;
+  24 bdc8b8e1;
+  21 4407c007;
+  16 0654310f;
+  14 e2591768;
+   8 bdc8b8e1;
+   7 4407c007;
+}