From cbe61e6febe0660d2d69a6ccd876163d663da49d Mon Sep 17 00:00:00 2001 From: Sanjana Rajan Date: Sun, 30 Jul 2017 12:12:02 +0200 Subject: [PATCH] key expansion for aes decryption keys, aesdecrypt function --- src/crypto/aes_kw.js | 14 +- src/crypto/cipher/aes.js | 355 +++++++++++++++++++++++++++++++++++---- 2 files changed, 328 insertions(+), 41 deletions(-) diff --git a/src/crypto/aes_kw.js b/src/crypto/aes_kw.js index 265cd053..ff6f7a88 100644 --- a/src/crypto/aes_kw.js +++ b/src/crypto/aes_kw.js @@ -18,7 +18,6 @@ // Implementation of RFC 3394 AES Key Wrap & Key Unwrap funcions import cipher from './cipher'; -import AES from 'aes'; function createArrayBuffer(data) { if (typeof data === "string") { @@ -91,10 +90,8 @@ function wrap(key, data) { // B = A || R[i] B[2] = R[2*i]; B[3] = R[2*i+1]; - B = pack(B); // B = AES(K, B) - B = aes.encrypt(B); - B = unpack(B); + B = unpack(aes.encrypt(pack(B))); // A = MSB(64, B) ^ t A = B.subarray(0, 2); A[0] = A[0] ^ t[0]; @@ -108,9 +105,8 @@ function wrap(key, data) { } function unwrap(key, data) { - //key = pack(formatKey(key)); - //var aes = new cipher["aes" + (key.length*8)](key); - var aes = new AES(formatKey(key)); + key = pack(formatKey(key)); + var aes = new cipher["aes" + (key.length*8)](key); var IV = new Uint32Array([0xA6A6A6A6, 0xA6A6A6A6]); var C = unpack(data); var A = C.subarray(0, 2); @@ -128,9 +124,7 @@ function unwrap(key, data) { B[2] = R[2*i]; B[3] = R[2*i+1]; // B = AES-1(B) - //B = pack(B); - B = aes.decrypt(B); - //B = unpack(B); + B = unpack(aes.decrypt(pack(B))); // A = MSB(64, B) A = B.subarray(0, 2); // R[i] = LSB(64, B) diff --git a/src/crypto/cipher/aes.js b/src/crypto/cipher/aes.js index 339f70c1..d3ea5938 100644 --- a/src/crypto/cipher/aes.js +++ b/src/crypto/cipher/aes.js @@ -46,7 +46,7 @@ var S = new Uint8Array([ 22 ]); -/* Precomputed lookup table for the inverse SBox +// Precomputed lookup table for the inverse SBox var S_inv = new Uint8Array([ 82, 9, 106, 213, 48, 54, 165, 56, 191, 64, 163, 158, 129, 243, 215, 251, 124, 227, 57, 130, 155, 47, 255, 135, 52, 142, 67, 68, 196, 222, @@ -66,7 +66,7 @@ var S_inv = new Uint8Array([ 224, 59, 77, 174, 42, 245, 176, 200, 235, 187, 60, 131, 83, 153, 97, 23, 43, 4, 126, 186, 119, 214, 38, 225, 105, 20, 99, 85, 33, 12, 125 -]); */ +]); var T1_enc = new Uint32Array([ 0xa56363c6, 0x847c7cf8, 0x997777ee, 0x8d7b7bf6, @@ -604,6 +604,276 @@ var T4_dec = new Uint32Array([ 0x7b6184cb, 0xd570b632, 0x48745c6c, 0xd04257b8 ]); + +var U1 = new Uint32Array([ + 0x00000000,0x0b0d090e,0x161a121c,0x1d171b12, + 0x2c342438,0x27392d36,0x3a2e3624,0x31233f2a, + 0x58684870,0x5365417e,0x4e725a6c,0x457f5362, + 0x745c6c48,0x7f516546,0x62467e54,0x694b775a, + 0xb0d090e0,0xbbdd99ee,0xa6ca82fc,0xadc78bf2, + 0x9ce4b4d8,0x97e9bdd6,0x8afea6c4,0x81f3afca, + 0xe8b8d890,0xe3b5d19e,0xfea2ca8c,0xf5afc382, + 0xc48cfca8,0xcf81f5a6,0xd296eeb4,0xd99be7ba, + 0x7bbb3bdb,0x70b632d5,0x6da129c7,0x66ac20c9, + 0x578f1fe3,0x5c8216ed,0x41950dff,0x4a9804f1, + 0x23d373ab,0x28de7aa5,0x35c961b7,0x3ec468b9, + 0x0fe75793,0x04ea5e9d,0x19fd458f,0x12f04c81, + 0xcb6bab3b,0xc066a235,0xdd71b927,0xd67cb029, + 0xe75f8f03,0xec52860d,0xf1459d1f,0xfa489411, + 0x9303e34b,0x980eea45,0x8519f157,0x8e14f859, + 0xbf37c773,0xb43ace7d,0xa92dd56f,0xa220dc61, + 0xf66d76ad,0xfd607fa3,0xe07764b1,0xeb7a6dbf, + 0xda595295,0xd1545b9b,0xcc434089,0xc74e4987, + 0xae053edd,0xa50837d3,0xb81f2cc1,0xb31225cf, + 0x82311ae5,0x893c13eb,0x942b08f9,0x9f2601f7, + 0x46bde64d,0x4db0ef43,0x50a7f451,0x5baafd5f, + 0x6a89c275,0x6184cb7b,0x7c93d069,0x779ed967, + 0x1ed5ae3d,0x15d8a733,0x08cfbc21,0x03c2b52f, + 0x32e18a05,0x39ec830b,0x24fb9819,0x2ff69117, + 0x8dd64d76,0x86db4478,0x9bcc5f6a,0x90c15664, + 0xa1e2694e,0xaaef6040,0xb7f87b52,0xbcf5725c, + 0xd5be0506,0xdeb30c08,0xc3a4171a,0xc8a91e14, + 0xf98a213e,0xf2872830,0xef903322,0xe49d3a2c, + 0x3d06dd96,0x360bd498,0x2b1ccf8a,0x2011c684, + 0x1132f9ae,0x1a3ff0a0,0x0728ebb2,0x0c25e2bc, + 0x656e95e6,0x6e639ce8,0x737487fa,0x78798ef4, + 0x495ab1de,0x4257b8d0,0x5f40a3c2,0x544daacc, + 0xf7daec41,0xfcd7e54f,0xe1c0fe5d,0xeacdf753, + 0xdbeec879,0xd0e3c177,0xcdf4da65,0xc6f9d36b, + 0xafb2a431,0xa4bfad3f,0xb9a8b62d,0xb2a5bf23, + 0x83868009,0x888b8907,0x959c9215,0x9e919b1b, + 0x470a7ca1,0x4c0775af,0x51106ebd,0x5a1d67b3, + 0x6b3e5899,0x60335197,0x7d244a85,0x7629438b, + 0x1f6234d1,0x146f3ddf,0x097826cd,0x02752fc3, + 0x335610e9,0x385b19e7,0x254c02f5,0x2e410bfb, + 0x8c61d79a,0x876cde94,0x9a7bc586,0x9176cc88, + 0xa055f3a2,0xab58faac,0xb64fe1be,0xbd42e8b0, + 0xd4099fea,0xdf0496e4,0xc2138df6,0xc91e84f8, + 0xf83dbbd2,0xf330b2dc,0xee27a9ce,0xe52aa0c0, + 0x3cb1477a,0x37bc4e74,0x2aab5566,0x21a65c68, + 0x10856342,0x1b886a4c,0x069f715e,0x0d927850, + 0x64d90f0a,0x6fd40604,0x72c31d16,0x79ce1418, + 0x48ed2b32,0x43e0223c,0x5ef7392e,0x55fa3020, + 0x01b79aec,0x0aba93e2,0x17ad88f0,0x1ca081fe, + 0x2d83bed4,0x268eb7da,0x3b99acc8,0x3094a5c6, + 0x59dfd29c,0x52d2db92,0x4fc5c080,0x44c8c98e, + 0x75ebf6a4,0x7ee6ffaa,0x63f1e4b8,0x68fcedb6, + 0xb1670a0c,0xba6a0302,0xa77d1810,0xac70111e, + 0x9d532e34,0x965e273a,0x8b493c28,0x80443526, + 0xe90f427c,0xe2024b72,0xff155060,0xf418596e, + 0xc53b6644,0xce366f4a,0xd3217458,0xd82c7d56, + 0x7a0ca137,0x7101a839,0x6c16b32b,0x671bba25, + 0x5638850f,0x5d358c01,0x40229713,0x4b2f9e1d, + 0x2264e947,0x2969e049,0x347efb5b,0x3f73f255, + 0x0e50cd7f,0x055dc471,0x184adf63,0x1347d66d, + 0xcadc31d7,0xc1d138d9,0xdcc623cb,0xd7cb2ac5, + 0xe6e815ef,0xede51ce1,0xf0f207f3,0xfbff0efd, + 0x92b479a7,0x99b970a9,0x84ae6bbb,0x8fa362b5, + 0xbe805d9f,0xb58d5491,0xa89a4f83,0xa397468d +]); + +var U2 = new Uint32Array([ + 0x00000000,0x0d090e0b,0x1a121c16,0x171b121d, + 0x3424382c,0x392d3627,0x2e36243a,0x233f2a31, + 0x68487058,0x65417e53,0x725a6c4e,0x7f536245, + 0x5c6c4874,0x5165467f,0x467e5462,0x4b775a69, + 0xd090e0b0,0xdd99eebb,0xca82fca6,0xc78bf2ad, + 0xe4b4d89c,0xe9bdd697,0xfea6c48a,0xf3afca81, + 0xb8d890e8,0xb5d19ee3,0xa2ca8cfe,0xafc382f5, + 0x8cfca8c4,0x81f5a6cf,0x96eeb4d2,0x9be7bad9, + 0xbb3bdb7b,0xb632d570,0xa129c76d,0xac20c966, + 0x8f1fe357,0x8216ed5c,0x950dff41,0x9804f14a, + 0xd373ab23,0xde7aa528,0xc961b735,0xc468b93e, + 0xe757930f,0xea5e9d04,0xfd458f19,0xf04c8112, + 0x6bab3bcb,0x66a235c0,0x71b927dd,0x7cb029d6, + 0x5f8f03e7,0x52860dec,0x459d1ff1,0x489411fa, + 0x03e34b93,0x0eea4598,0x19f15785,0x14f8598e, + 0x37c773bf,0x3ace7db4,0x2dd56fa9,0x20dc61a2, + 0x6d76adf6,0x607fa3fd,0x7764b1e0,0x7a6dbfeb, + 0x595295da,0x545b9bd1,0x434089cc,0x4e4987c7, + 0x053eddae,0x0837d3a5,0x1f2cc1b8,0x1225cfb3, + 0x311ae582,0x3c13eb89,0x2b08f994,0x2601f79f, + 0xbde64d46,0xb0ef434d,0xa7f45150,0xaafd5f5b, + 0x89c2756a,0x84cb7b61,0x93d0697c,0x9ed96777, + 0xd5ae3d1e,0xd8a73315,0xcfbc2108,0xc2b52f03, + 0xe18a0532,0xec830b39,0xfb981924,0xf691172f, + 0xd64d768d,0xdb447886,0xcc5f6a9b,0xc1566490, + 0xe2694ea1,0xef6040aa,0xf87b52b7,0xf5725cbc, + 0xbe0506d5,0xb30c08de,0xa4171ac3,0xa91e14c8, + 0x8a213ef9,0x872830f2,0x903322ef,0x9d3a2ce4, + 0x06dd963d,0x0bd49836,0x1ccf8a2b,0x11c68420, + 0x32f9ae11,0x3ff0a01a,0x28ebb207,0x25e2bc0c, + 0x6e95e665,0x639ce86e,0x7487fa73,0x798ef478, + 0x5ab1de49,0x57b8d042,0x40a3c25f,0x4daacc54, + 0xdaec41f7,0xd7e54ffc,0xc0fe5de1,0xcdf753ea, + 0xeec879db,0xe3c177d0,0xf4da65cd,0xf9d36bc6, + 0xb2a431af,0xbfad3fa4,0xa8b62db9,0xa5bf23b2, + 0x86800983,0x8b890788,0x9c921595,0x919b1b9e, + 0x0a7ca147,0x0775af4c,0x106ebd51,0x1d67b35a, + 0x3e58996b,0x33519760,0x244a857d,0x29438b76, + 0x6234d11f,0x6f3ddf14,0x7826cd09,0x752fc302, + 0x5610e933,0x5b19e738,0x4c02f525,0x410bfb2e, + 0x61d79a8c,0x6cde9487,0x7bc5869a,0x76cc8891, + 0x55f3a2a0,0x58faacab,0x4fe1beb6,0x42e8b0bd, + 0x099fead4,0x0496e4df,0x138df6c2,0x1e84f8c9, + 0x3dbbd2f8,0x30b2dcf3,0x27a9ceee,0x2aa0c0e5, + 0xb1477a3c,0xbc4e7437,0xab55662a,0xa65c6821, + 0x85634210,0x886a4c1b,0x9f715e06,0x9278500d, + 0xd90f0a64,0xd406046f,0xc31d1672,0xce141879, + 0xed2b3248,0xe0223c43,0xf7392e5e,0xfa302055, + 0xb79aec01,0xba93e20a,0xad88f017,0xa081fe1c, + 0x83bed42d,0x8eb7da26,0x99acc83b,0x94a5c630, + 0xdfd29c59,0xd2db9252,0xc5c0804f,0xc8c98e44, + 0xebf6a475,0xe6ffaa7e,0xf1e4b863,0xfcedb668, + 0x670a0cb1,0x6a0302ba,0x7d1810a7,0x70111eac, + 0x532e349d,0x5e273a96,0x493c288b,0x44352680, + 0x0f427ce9,0x024b72e2,0x155060ff,0x18596ef4, + 0x3b6644c5,0x366f4ace,0x217458d3,0x2c7d56d8, + 0x0ca1377a,0x01a83971,0x16b32b6c,0x1bba2567, + 0x38850f56,0x358c015d,0x22971340,0x2f9e1d4b, + 0x64e94722,0x69e04929,0x7efb5b34,0x73f2553f, + 0x50cd7f0e,0x5dc47105,0x4adf6318,0x47d66d13, + 0xdc31d7ca,0xd138d9c1,0xc623cbdc,0xcb2ac5d7, + 0xe815efe6,0xe51ce1ed,0xf207f3f0,0xff0efdfb, + 0xb479a792,0xb970a999,0xae6bbb84,0xa362b58f, + 0x805d9fbe,0x8d5491b5,0x9a4f83a8,0x97468da3, +]); + +var U3 = new Uint32Array([ + 0x00000000,0x090e0b0d,0x121c161a,0x1b121d17, + 0x24382c34,0x2d362739,0x36243a2e,0x3f2a3123, + 0x48705868,0x417e5365,0x5a6c4e72,0x5362457f, + 0x6c48745c,0x65467f51,0x7e546246,0x775a694b, + 0x90e0b0d0,0x99eebbdd,0x82fca6ca,0x8bf2adc7, + 0xb4d89ce4,0xbdd697e9,0xa6c48afe,0xafca81f3, + 0xd890e8b8,0xd19ee3b5,0xca8cfea2,0xc382f5af, + 0xfca8c48c,0xf5a6cf81,0xeeb4d296,0xe7bad99b, + 0x3bdb7bbb,0x32d570b6,0x29c76da1,0x20c966ac, + 0x1fe3578f,0x16ed5c82,0x0dff4195,0x04f14a98, + 0x73ab23d3,0x7aa528de,0x61b735c9,0x68b93ec4, + 0x57930fe7,0x5e9d04ea,0x458f19fd,0x4c8112f0, + 0xab3bcb6b,0xa235c066,0xb927dd71,0xb029d67c, + 0x8f03e75f,0x860dec52,0x9d1ff145,0x9411fa48, + 0xe34b9303,0xea45980e,0xf1578519,0xf8598e14, + 0xc773bf37,0xce7db43a,0xd56fa92d,0xdc61a220, + 0x76adf66d,0x7fa3fd60,0x64b1e077,0x6dbfeb7a, + 0x5295da59,0x5b9bd154,0x4089cc43,0x4987c74e, + 0x3eddae05,0x37d3a508,0x2cc1b81f,0x25cfb312, + 0x1ae58231,0x13eb893c,0x08f9942b,0x01f79f26, + 0xe64d46bd,0xef434db0,0xf45150a7,0xfd5f5baa, + 0xc2756a89,0xcb7b6184,0xd0697c93,0xd967779e, + 0xae3d1ed5,0xa73315d8,0xbc2108cf,0xb52f03c2, + 0x8a0532e1,0x830b39ec,0x981924fb,0x91172ff6, + 0x4d768dd6,0x447886db,0x5f6a9bcc,0x566490c1, + 0x694ea1e2,0x6040aaef,0x7b52b7f8,0x725cbcf5, + 0x0506d5be,0x0c08deb3,0x171ac3a4,0x1e14c8a9, + 0x213ef98a,0x2830f287,0x3322ef90,0x3a2ce49d, + 0xdd963d06,0xd498360b,0xcf8a2b1c,0xc6842011, + 0xf9ae1132,0xf0a01a3f,0xebb20728,0xe2bc0c25, + 0x95e6656e,0x9ce86e63,0x87fa7374,0x8ef47879, + 0xb1de495a,0xb8d04257,0xa3c25f40,0xaacc544d, + 0xec41f7da,0xe54ffcd7,0xfe5de1c0,0xf753eacd, + 0xc879dbee,0xc177d0e3,0xda65cdf4,0xd36bc6f9, + 0xa431afb2,0xad3fa4bf,0xb62db9a8,0xbf23b2a5, + 0x80098386,0x8907888b,0x9215959c,0x9b1b9e91, + 0x7ca1470a,0x75af4c07,0x6ebd5110,0x67b35a1d, + 0x58996b3e,0x51976033,0x4a857d24,0x438b7629, + 0x34d11f62,0x3ddf146f,0x26cd0978,0x2fc30275, + 0x10e93356,0x19e7385b,0x02f5254c,0x0bfb2e41, + 0xd79a8c61,0xde94876c,0xc5869a7b,0xcc889176, + 0xf3a2a055,0xfaacab58,0xe1beb64f,0xe8b0bd42, + 0x9fead409,0x96e4df04,0x8df6c213,0x84f8c91e, + 0xbbd2f83d,0xb2dcf330,0xa9ceee27,0xa0c0e52a, + 0x477a3cb1,0x4e7437bc,0x55662aab,0x5c6821a6, + 0x63421085,0x6a4c1b88,0x715e069f,0x78500d92, + 0x0f0a64d9,0x06046fd4,0x1d1672c3,0x141879ce, + 0x2b3248ed,0x223c43e0,0x392e5ef7,0x302055fa, + 0x9aec01b7,0x93e20aba,0x88f017ad,0x81fe1ca0, + 0xbed42d83,0xb7da268e,0xacc83b99,0xa5c63094, + 0xd29c59df,0xdb9252d2,0xc0804fc5,0xc98e44c8, + 0xf6a475eb,0xffaa7ee6,0xe4b863f1,0xedb668fc, + 0x0a0cb167,0x0302ba6a,0x1810a77d,0x111eac70, + 0x2e349d53,0x273a965e,0x3c288b49,0x35268044, + 0x427ce90f,0x4b72e202,0x5060ff15,0x596ef418, + 0x6644c53b,0x6f4ace36,0x7458d321,0x7d56d82c, + 0xa1377a0c,0xa8397101,0xb32b6c16,0xba25671b, + 0x850f5638,0x8c015d35,0x97134022,0x9e1d4b2f, + 0xe9472264,0xe0492969,0xfb5b347e,0xf2553f73, + 0xcd7f0e50,0xc471055d,0xdf63184a,0xd66d1347, + 0x31d7cadc,0x38d9c1d1,0x23cbdcc6,0x2ac5d7cb, + 0x15efe6e8,0x1ce1ede5,0x07f3f0f2,0x0efdfbff, + 0x79a792b4,0x70a999b9,0x6bbb84ae,0x62b58fa3, + 0x5d9fbe80,0x5491b58d,0x4f83a89a,0x468da397 +]); + +var U4 = new Uint32Array([ + 0x00000000,0x0e0b0d09,0x1c161a12,0x121d171b, + 0x382c3424,0x3627392d,0x243a2e36,0x2a31233f, + 0x70586848,0x7e536541,0x6c4e725a,0x62457f53, + 0x48745c6c,0x467f5165,0x5462467e,0x5a694b77, + 0xe0b0d090,0xeebbdd99,0xfca6ca82,0xf2adc78b, + 0xd89ce4b4,0xd697e9bd,0xc48afea6,0xca81f3af, + 0x90e8b8d8,0x9ee3b5d1,0x8cfea2ca,0x82f5afc3, + 0xa8c48cfc,0xa6cf81f5,0xb4d296ee,0xbad99be7, + 0xdb7bbb3b,0xd570b632,0xc76da129,0xc966ac20, + 0xe3578f1f,0xed5c8216,0xff41950d,0xf14a9804, + 0xab23d373,0xa528de7a,0xb735c961,0xb93ec468, + 0x930fe757,0x9d04ea5e,0x8f19fd45,0x8112f04c, + 0x3bcb6bab,0x35c066a2,0x27dd71b9,0x29d67cb0, + 0x03e75f8f,0x0dec5286,0x1ff1459d,0x11fa4894, + 0x4b9303e3,0x45980eea,0x578519f1,0x598e14f8, + 0x73bf37c7,0x7db43ace,0x6fa92dd5,0x61a220dc, + 0xadf66d76,0xa3fd607f,0xb1e07764,0xbfeb7a6d, + 0x95da5952,0x9bd1545b,0x89cc4340,0x87c74e49, + 0xddae053e,0xd3a50837,0xc1b81f2c,0xcfb31225, + 0xe582311a,0xeb893c13,0xf9942b08,0xf79f2601, + 0x4d46bde6,0x434db0ef,0x5150a7f4,0x5f5baafd, + 0x756a89c2,0x7b6184cb,0x697c93d0,0x67779ed9, + 0x3d1ed5ae,0x3315d8a7,0x2108cfbc,0x2f03c2b5, + 0x0532e18a,0x0b39ec83,0x1924fb98,0x172ff691, + 0x768dd64d,0x7886db44,0x6a9bcc5f,0x6490c156, + 0x4ea1e269,0x40aaef60,0x52b7f87b,0x5cbcf572, + 0x06d5be05,0x08deb30c,0x1ac3a417,0x14c8a91e, + 0x3ef98a21,0x30f28728,0x22ef9033,0x2ce49d3a, + 0x963d06dd,0x98360bd4,0x8a2b1ccf,0x842011c6, + 0xae1132f9,0xa01a3ff0,0xb20728eb,0xbc0c25e2, + 0xe6656e95,0xe86e639c,0xfa737487,0xf478798e, + 0xde495ab1,0xd04257b8,0xc25f40a3,0xcc544daa, + 0x41f7daec,0x4ffcd7e5,0x5de1c0fe,0x53eacdf7, + 0x79dbeec8,0x77d0e3c1,0x65cdf4da,0x6bc6f9d3, + 0x31afb2a4,0x3fa4bfad,0x2db9a8b6,0x23b2a5bf, + 0x09838680,0x07888b89,0x15959c92,0x1b9e919b, + 0xa1470a7c,0xaf4c0775,0xbd51106e,0xb35a1d67, + 0x996b3e58,0x97603351,0x857d244a,0x8b762943, + 0xd11f6234,0xdf146f3d,0xcd097826,0xc302752f, + 0xe9335610,0xe7385b19,0xf5254c02,0xfb2e410b, + 0x9a8c61d7,0x94876cde,0x869a7bc5,0x889176cc, + 0xa2a055f3,0xacab58fa,0xbeb64fe1,0xb0bd42e8, + 0xead4099f,0xe4df0496,0xf6c2138d,0xf8c91e84, + 0xd2f83dbb,0xdcf330b2,0xceee27a9,0xc0e52aa0, + 0x7a3cb147,0x7437bc4e,0x662aab55,0x6821a65c, + 0x42108563,0x4c1b886a,0x5e069f71,0x500d9278, + 0x0a64d90f,0x046fd406,0x1672c31d,0x1879ce14, + 0x3248ed2b,0x3c43e022,0x2e5ef739,0x2055fa30, + 0xec01b79a,0xe20aba93,0xf017ad88,0xfe1ca081, + 0xd42d83be,0xda268eb7,0xc83b99ac,0xc63094a5, + 0x9c59dfd2,0x9252d2db,0x804fc5c0,0x8e44c8c9, + 0xa475ebf6,0xaa7ee6ff,0xb863f1e4,0xb668fced, + 0x0cb1670a,0x02ba6a03,0x10a77d18,0x1eac7011, + 0x349d532e,0x3a965e27,0x288b493c,0x26804435, + 0x7ce90f42,0x72e2024b,0x60ff1550,0x6ef41859, + 0x44c53b66,0x4ace366f,0x58d32174,0x56d82c7d, + 0x377a0ca1,0x397101a8,0x2b6c16b3,0x25671bba, + 0x0f563885,0x015d358c,0x13402297,0x1d4b2f9e, + 0x472264e9,0x492969e0,0x5b347efb,0x553f73f2, + 0x7f0e50cd,0x71055dc4,0x63184adf,0x6d1347d6, + 0xd7cadc31,0xd9c1d138,0xcbdcc623,0xc5d7cb2a, + 0xefe6e815,0xe1ede51c,0xf3f0f207,0xfdfbff0e, + 0xa792b479,0xa999b970,0xbb84ae6b,0xb58fa362, + 0x9fbe805d,0x91b58d54,0x83a89a4f,0x8da39746 +]); + + function B0(x) { return (x & 255); } @@ -620,14 +890,10 @@ function B3(x) { return ((x >> 24) & 255); } -function F1_enc(x0, x1, x2, x3) { +function F1(x0, x1, x2, x3) { return B1(T1_enc[x0 & 255]) | (B1(T1_enc[(x1 >> 8) & 255]) << 8) | (B1(T1_enc[(x2 >> 16) & 255]) << 16) | (B1(T1_enc[x3 >>> 24]) << 24); } -function F1_dec(x0, x1, x2, x3) { - return B1(T1_dec[x0 & 255]) | (B1(T1_dec[(x1 >> 8) & 255]) << 8) | (B1(T1_dec[(x2 >> 16) & 255]) << 16) | (B1(T1_dec[x3 >>> 24]) << 24); -} - function packBytes(octets) { var i, j; var len = octets.length; @@ -664,7 +930,7 @@ function unpackBytes(packed) { var maxkc = 8; var maxrk = 14; -function scheduleEncKey(key) { +function keyExpansionEnc(key) { var kc, i, j, r, t; var rounds; var keySched = new Array(maxrk + 1); @@ -750,7 +1016,31 @@ function scheduleEncKey(key) { }; } +function keyExpansionDec(ctx) { + var tmp; + var keySched = new Array(ctx.length); + var rounds = ctx.rounds; + + for(var r = 0; r < maxrk + 1; r++) { + keySched[r] = new Uint32Array(4); + keySched[r][0] = ctx.rk[r][0]; + keySched[r][1] = ctx.rk[r][1]; + keySched[r][2] = ctx.rk[r][2]; + keySched[r][3] = ctx.rk[r][3]; + } + + for(r = 1; r < rounds; r++) { + tmp=keySched[r][0]; keySched[r][0] = U1[B0(tmp)] ^ U2[B1(tmp)] ^ U3[B2(tmp)] ^ U4[B3(tmp)]; + tmp=keySched[r][1]; keySched[r][1] = U1[B0(tmp)] ^ U2[B1(tmp)] ^ U3[B2(tmp)] ^ U4[B3(tmp)]; + tmp=keySched[r][2]; keySched[r][2] = U1[B0(tmp)] ^ U2[B1(tmp)] ^ U3[B2(tmp)] ^ U4[B3(tmp)]; + tmp=keySched[r][3]; keySched[r][3] = U1[B0(tmp)] ^ U2[B1(tmp)] ^ U3[B2(tmp)] ^ U4[B3(tmp)]; + } + return { + rounds : rounds, + rk : keySched + }; +} function AESencrypt(block, ctx, t) { var r, rounds, b; @@ -778,10 +1068,10 @@ function AESencrypt(block, ctx, t) { t[2] = b[2] ^ ctx.rk[r][2]; t[3] = b[3] ^ ctx.rk[r][3]; - b[0] = F1_enc(t[0], t[1], t[2], t[3]) ^ ctx.rk[rounds][0]; - b[1] = F1_enc(t[1], t[2], t[3], t[0]) ^ ctx.rk[rounds][1]; - b[2] = F1_enc(t[2], t[3], t[0], t[1]) ^ ctx.rk[rounds][2]; - b[3] = F1_enc(t[3], t[0], t[1], t[2]) ^ ctx.rk[rounds][3]; + b[0] = F1(t[0], t[1], t[2], t[3]) ^ ctx.rk[rounds][0]; + b[1] = F1(t[1], t[2], t[3], t[0]) ^ ctx.rk[rounds][1]; + b[2] = F1(t[2], t[3], t[0], t[1]) ^ ctx.rk[rounds][2]; + b[3] = F1(t[3], t[0], t[1], t[2]) ^ ctx.rk[rounds][3]; return unpackBytes(b); } @@ -792,30 +1082,33 @@ function AESdecrypt(block, ctx, t) { b = packBytes(block); rounds = ctx.rounds; - for (r = 0; r < rounds - 1; r++) { + for (r = rounds; r > 1; r--) { t[0] = b[0] ^ ctx.rk[r][0]; - t[1] = b[3] ^ ctx.rk[r][1]; + t[1] = b[1] ^ ctx.rk[r][1]; t[2] = b[2] ^ ctx.rk[r][2]; - t[3] = b[1] ^ ctx.rk[r][3]; + t[3] = b[3] ^ ctx.rk[r][3]; - b[0] = T1_dec[t[0] & 255] ^ T2_dec[(t[1] >> 8) & 255] ^ T3_dec[(t[2] >> 16) & 255] ^ T4_dec[t[3] >>> 24]; - b[1] = T1_dec[t[1] & 255] ^ T2_dec[(t[2] >> 8) & 255] ^ T3_dec[(t[3] >> 16) & 255] ^ T4_dec[t[0] >>> 24]; - b[2] = T1_dec[t[2] & 255] ^ T2_dec[(t[3] >> 8) & 255] ^ T3_dec[(t[0] >> 16) & 255] ^ T4_dec[t[1] >>> 24]; - b[3] = T1_dec[t[3] & 255] ^ T2_dec[(t[0] >> 8) & 255] ^ T3_dec[(t[1] >> 16) & 255] ^ T4_dec[t[2] >>> 24]; + b[0] = T1_dec[B0(t[0])] ^ T2_dec[B1(t[3])] ^ T3_dec[B2(t[2])] ^ T4_dec[B3(t[1])]; + b[1] = T1_dec[B0(t[1])] ^ T2_dec[B1(t[0])] ^ T3_dec[B2(t[3])] ^ T4_dec[B3(t[2])]; + b[2] = T1_dec[B0(t[2])] ^ T2_dec[B1(t[1])] ^ T3_dec[B2(t[0])] ^ T4_dec[B3(t[3])]; + b[3] = T1_dec[B0(t[3])] ^ T2_dec[B1(t[2])] ^ T3_dec[B2(t[1])] ^ T4_dec[B3(t[0])]; } // last round is special - r = rounds - 1; + t[0] = b[0] ^ ctx.rk[1][0]; + t[1] = b[1] ^ ctx.rk[1][1]; + t[2] = b[2] ^ ctx.rk[1][2]; + t[3] = b[3] ^ ctx.rk[1][3]; - t[0] = b[0] ^ ctx.rk[r][0]; - t[1] = b[3] ^ ctx.rk[r][1]; - t[2] = b[2] ^ ctx.rk[r][2]; - t[3] = b[1] ^ ctx.rk[r][3]; + b[0] = S_inv[B0(t[0])] | (S_inv[B1(t[3])]<<8) | (S_inv[B2(t[2])]<<16) | (S_inv[B3(t[1])]<<24); + b[1] = S_inv[B0(t[1])] | (S_inv[B1(t[0])]<<8) | (S_inv[B2(t[3])]<<16) | (S_inv[B3(t[2])]<<24); + b[2] = S_inv[B0(t[2])] | (S_inv[B1(t[1])]<<8) | (S_inv[B2(t[0])]<<16) | (S_inv[B3(t[3])]<<24); + b[3] = S_inv[B0(t[3])] | (S_inv[B1(t[2])]<<8) | (S_inv[B2(t[1])]<<16) | (S_inv[B3(t[0])]<<24); - b[0] = F1_dec(t[0], t[1], t[2], t[3]) ^ ctx.rk[rounds][0]; - b[3] = F1_dec(t[1], t[2], t[3], t[0]) ^ ctx.rk[rounds][1]; - b[2] = F1_dec(t[2], t[3], t[0], t[1]) ^ ctx.rk[rounds][2]; - b[1] = F1_dec(t[3], t[0], t[1], t[2]) ^ ctx.rk[rounds][3]; + b[0] ^= ctx.rk[0][0]; + b[1] ^= ctx.rk[0][1]; + b[2] ^= ctx.rk[0][2]; + b[3] ^= ctx.rk[0][3]; return unpackBytes(b); } @@ -823,15 +1116,15 @@ function AESdecrypt(block, ctx, t) { function makeClass(length) { var c = function(key) { - this.enc_key = scheduleEncKey(key); - //this.dec_key = scheduleDecKey(this.enc_key); + this.enc_key = keyExpansionEnc(key); + this.dec_key = keyExpansionDec(this.enc_key); this.encrypt = function(block) { return AESencrypt(block, this.enc_key, new Uint32Array(this.blockSize / 4)); }; this.decrypt = function(block) { - return AESdecrypt(block, this.enc_key, new Uint32Array(this.blockSize / 4)); + return AESdecrypt(block, this.dec_key, new Uint32Array(this.blockSize / 4)); }; };