diff options
Diffstat (limited to 'src/lib/libcrypto/aes/aes_core.c')
| -rw-r--r-- | src/lib/libcrypto/aes/aes_core.c | 304 |
1 files changed, 101 insertions, 203 deletions
diff --git a/src/lib/libcrypto/aes/aes_core.c b/src/lib/libcrypto/aes/aes_core.c index ed566a8123..3a80e18b0a 100644 --- a/src/lib/libcrypto/aes/aes_core.c +++ b/src/lib/libcrypto/aes/aes_core.c | |||
| @@ -37,23 +37,19 @@ | |||
| 37 | 37 | ||
| 38 | #include <stdlib.h> | 38 | #include <stdlib.h> |
| 39 | #include <openssl/aes.h> | 39 | #include <openssl/aes.h> |
| 40 | #include <openssl/fips.h> | ||
| 41 | #include "aes_locl.h" | 40 | #include "aes_locl.h" |
| 42 | 41 | ||
| 43 | #ifndef OPENSSL_FIPS | ||
| 44 | |||
| 45 | /* | 42 | /* |
| 46 | Te0[x] = S [x].[02, 01, 01, 03]; | 43 | Te0[x] = S [x].[02, 01, 01, 03]; |
| 47 | Te1[x] = S [x].[03, 02, 01, 01]; | 44 | Te1[x] = S [x].[03, 02, 01, 01]; |
| 48 | Te2[x] = S [x].[01, 03, 02, 01]; | 45 | Te2[x] = S [x].[01, 03, 02, 01]; |
| 49 | Te3[x] = S [x].[01, 01, 03, 02]; | 46 | Te3[x] = S [x].[01, 01, 03, 02]; |
| 50 | Te4[x] = S [x].[01, 01, 01, 01]; | ||
| 51 | 47 | ||
| 52 | Td0[x] = Si[x].[0e, 09, 0d, 0b]; | 48 | Td0[x] = Si[x].[0e, 09, 0d, 0b]; |
| 53 | Td1[x] = Si[x].[0b, 0e, 09, 0d]; | 49 | Td1[x] = Si[x].[0b, 0e, 09, 0d]; |
| 54 | Td2[x] = Si[x].[0d, 0b, 0e, 09]; | 50 | Td2[x] = Si[x].[0d, 0b, 0e, 09]; |
| 55 | Td3[x] = Si[x].[09, 0d, 0b, 0e]; | 51 | Td3[x] = Si[x].[09, 0d, 0b, 0e]; |
| 56 | Td4[x] = Si[x].[01, 01, 01, 01]; | 52 | Td4[x] = Si[x].[01]; |
| 57 | */ | 53 | */ |
| 58 | 54 | ||
| 59 | static const u32 Te0[256] = { | 55 | static const u32 Te0[256] = { |
| @@ -255,7 +251,6 @@ static const u32 Te2[256] = { | |||
| 255 | 0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U, | 251 | 0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U, |
| 256 | }; | 252 | }; |
| 257 | static const u32 Te3[256] = { | 253 | static const u32 Te3[256] = { |
| 258 | |||
| 259 | 0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U, | 254 | 0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U, |
| 260 | 0xf2f20dffU, 0x6b6bbdd6U, 0x6f6fb1deU, 0xc5c55491U, | 255 | 0xf2f20dffU, 0x6b6bbdd6U, 0x6f6fb1deU, 0xc5c55491U, |
| 261 | 0x30305060U, 0x01010302U, 0x6767a9ceU, 0x2b2b7d56U, | 256 | 0x30305060U, 0x01010302U, 0x6767a9ceU, 0x2b2b7d56U, |
| @@ -321,72 +316,7 @@ static const u32 Te3[256] = { | |||
| 321 | 0x4141c382U, 0x9999b029U, 0x2d2d775aU, 0x0f0f111eU, | 316 | 0x4141c382U, 0x9999b029U, 0x2d2d775aU, 0x0f0f111eU, |
| 322 | 0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU, | 317 | 0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU, |
| 323 | }; | 318 | }; |
| 324 | static const u32 Te4[256] = { | 319 | |
| 325 | 0x63636363U, 0x7c7c7c7cU, 0x77777777U, 0x7b7b7b7bU, | ||
| 326 | 0xf2f2f2f2U, 0x6b6b6b6bU, 0x6f6f6f6fU, 0xc5c5c5c5U, | ||
| 327 | 0x30303030U, 0x01010101U, 0x67676767U, 0x2b2b2b2bU, | ||
| 328 | 0xfefefefeU, 0xd7d7d7d7U, 0xababababU, 0x76767676U, | ||
| 329 | 0xcacacacaU, 0x82828282U, 0xc9c9c9c9U, 0x7d7d7d7dU, | ||
| 330 | 0xfafafafaU, 0x59595959U, 0x47474747U, 0xf0f0f0f0U, | ||
| 331 | 0xadadadadU, 0xd4d4d4d4U, 0xa2a2a2a2U, 0xafafafafU, | ||
| 332 | 0x9c9c9c9cU, 0xa4a4a4a4U, 0x72727272U, 0xc0c0c0c0U, | ||
| 333 | 0xb7b7b7b7U, 0xfdfdfdfdU, 0x93939393U, 0x26262626U, | ||
| 334 | 0x36363636U, 0x3f3f3f3fU, 0xf7f7f7f7U, 0xccccccccU, | ||
| 335 | 0x34343434U, 0xa5a5a5a5U, 0xe5e5e5e5U, 0xf1f1f1f1U, | ||
| 336 | 0x71717171U, 0xd8d8d8d8U, 0x31313131U, 0x15151515U, | ||
| 337 | 0x04040404U, 0xc7c7c7c7U, 0x23232323U, 0xc3c3c3c3U, | ||
| 338 | 0x18181818U, 0x96969696U, 0x05050505U, 0x9a9a9a9aU, | ||
| 339 | 0x07070707U, 0x12121212U, 0x80808080U, 0xe2e2e2e2U, | ||
| 340 | 0xebebebebU, 0x27272727U, 0xb2b2b2b2U, 0x75757575U, | ||
| 341 | 0x09090909U, 0x83838383U, 0x2c2c2c2cU, 0x1a1a1a1aU, | ||
| 342 | 0x1b1b1b1bU, 0x6e6e6e6eU, 0x5a5a5a5aU, 0xa0a0a0a0U, | ||
| 343 | 0x52525252U, 0x3b3b3b3bU, 0xd6d6d6d6U, 0xb3b3b3b3U, | ||
| 344 | 0x29292929U, 0xe3e3e3e3U, 0x2f2f2f2fU, 0x84848484U, | ||
| 345 | 0x53535353U, 0xd1d1d1d1U, 0x00000000U, 0xededededU, | ||
| 346 | 0x20202020U, 0xfcfcfcfcU, 0xb1b1b1b1U, 0x5b5b5b5bU, | ||
| 347 | 0x6a6a6a6aU, 0xcbcbcbcbU, 0xbebebebeU, 0x39393939U, | ||
| 348 | 0x4a4a4a4aU, 0x4c4c4c4cU, 0x58585858U, 0xcfcfcfcfU, | ||
| 349 | 0xd0d0d0d0U, 0xefefefefU, 0xaaaaaaaaU, 0xfbfbfbfbU, | ||
| 350 | 0x43434343U, 0x4d4d4d4dU, 0x33333333U, 0x85858585U, | ||
| 351 | 0x45454545U, 0xf9f9f9f9U, 0x02020202U, 0x7f7f7f7fU, | ||
| 352 | 0x50505050U, 0x3c3c3c3cU, 0x9f9f9f9fU, 0xa8a8a8a8U, | ||
| 353 | 0x51515151U, 0xa3a3a3a3U, 0x40404040U, 0x8f8f8f8fU, | ||
| 354 | 0x92929292U, 0x9d9d9d9dU, 0x38383838U, 0xf5f5f5f5U, | ||
| 355 | 0xbcbcbcbcU, 0xb6b6b6b6U, 0xdadadadaU, 0x21212121U, | ||
| 356 | 0x10101010U, 0xffffffffU, 0xf3f3f3f3U, 0xd2d2d2d2U, | ||
| 357 | 0xcdcdcdcdU, 0x0c0c0c0cU, 0x13131313U, 0xececececU, | ||
| 358 | 0x5f5f5f5fU, 0x97979797U, 0x44444444U, 0x17171717U, | ||
| 359 | 0xc4c4c4c4U, 0xa7a7a7a7U, 0x7e7e7e7eU, 0x3d3d3d3dU, | ||
| 360 | 0x64646464U, 0x5d5d5d5dU, 0x19191919U, 0x73737373U, | ||
| 361 | 0x60606060U, 0x81818181U, 0x4f4f4f4fU, 0xdcdcdcdcU, | ||
| 362 | 0x22222222U, 0x2a2a2a2aU, 0x90909090U, 0x88888888U, | ||
| 363 | 0x46464646U, 0xeeeeeeeeU, 0xb8b8b8b8U, 0x14141414U, | ||
| 364 | 0xdedededeU, 0x5e5e5e5eU, 0x0b0b0b0bU, 0xdbdbdbdbU, | ||
| 365 | 0xe0e0e0e0U, 0x32323232U, 0x3a3a3a3aU, 0x0a0a0a0aU, | ||
| 366 | 0x49494949U, 0x06060606U, 0x24242424U, 0x5c5c5c5cU, | ||
| 367 | 0xc2c2c2c2U, 0xd3d3d3d3U, 0xacacacacU, 0x62626262U, | ||
| 368 | 0x91919191U, 0x95959595U, 0xe4e4e4e4U, 0x79797979U, | ||
| 369 | 0xe7e7e7e7U, 0xc8c8c8c8U, 0x37373737U, 0x6d6d6d6dU, | ||
| 370 | 0x8d8d8d8dU, 0xd5d5d5d5U, 0x4e4e4e4eU, 0xa9a9a9a9U, | ||
| 371 | 0x6c6c6c6cU, 0x56565656U, 0xf4f4f4f4U, 0xeaeaeaeaU, | ||
| 372 | 0x65656565U, 0x7a7a7a7aU, 0xaeaeaeaeU, 0x08080808U, | ||
| 373 | 0xbabababaU, 0x78787878U, 0x25252525U, 0x2e2e2e2eU, | ||
| 374 | 0x1c1c1c1cU, 0xa6a6a6a6U, 0xb4b4b4b4U, 0xc6c6c6c6U, | ||
| 375 | 0xe8e8e8e8U, 0xddddddddU, 0x74747474U, 0x1f1f1f1fU, | ||
| 376 | 0x4b4b4b4bU, 0xbdbdbdbdU, 0x8b8b8b8bU, 0x8a8a8a8aU, | ||
| 377 | 0x70707070U, 0x3e3e3e3eU, 0xb5b5b5b5U, 0x66666666U, | ||
| 378 | 0x48484848U, 0x03030303U, 0xf6f6f6f6U, 0x0e0e0e0eU, | ||
| 379 | 0x61616161U, 0x35353535U, 0x57575757U, 0xb9b9b9b9U, | ||
| 380 | 0x86868686U, 0xc1c1c1c1U, 0x1d1d1d1dU, 0x9e9e9e9eU, | ||
| 381 | 0xe1e1e1e1U, 0xf8f8f8f8U, 0x98989898U, 0x11111111U, | ||
| 382 | 0x69696969U, 0xd9d9d9d9U, 0x8e8e8e8eU, 0x94949494U, | ||
| 383 | 0x9b9b9b9bU, 0x1e1e1e1eU, 0x87878787U, 0xe9e9e9e9U, | ||
| 384 | 0xcecececeU, 0x55555555U, 0x28282828U, 0xdfdfdfdfU, | ||
| 385 | 0x8c8c8c8cU, 0xa1a1a1a1U, 0x89898989U, 0x0d0d0d0dU, | ||
| 386 | 0xbfbfbfbfU, 0xe6e6e6e6U, 0x42424242U, 0x68686868U, | ||
| 387 | 0x41414141U, 0x99999999U, 0x2d2d2d2dU, 0x0f0f0f0fU, | ||
| 388 | 0xb0b0b0b0U, 0x54545454U, 0xbbbbbbbbU, 0x16161616U, | ||
| 389 | }; | ||
| 390 | static const u32 Td0[256] = { | 320 | static const u32 Td0[256] = { |
| 391 | 0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U, | 321 | 0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U, |
| 392 | 0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U, | 322 | 0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U, |
| @@ -540,7 +470,6 @@ static const u32 Td2[256] = { | |||
| 540 | 0xf4cd65daU, 0xbed50605U, 0x621fd134U, 0xfe8ac4a6U, | 470 | 0xf4cd65daU, 0xbed50605U, 0x621fd134U, 0xfe8ac4a6U, |
| 541 | 0x539d342eU, 0x55a0a2f3U, 0xe132058aU, 0xeb75a4f6U, | 471 | 0x539d342eU, 0x55a0a2f3U, 0xe132058aU, 0xeb75a4f6U, |
| 542 | 0xec390b83U, 0xefaa4060U, 0x9f065e71U, 0x1051bd6eU, | 472 | 0xec390b83U, 0xefaa4060U, 0x9f065e71U, 0x1051bd6eU, |
| 543 | |||
| 544 | 0x8af93e21U, 0x063d96ddU, 0x05aedd3eU, 0xbd464de6U, | 473 | 0x8af93e21U, 0x063d96ddU, 0x05aedd3eU, 0xbd464de6U, |
| 545 | 0x8db59154U, 0x5d0571c4U, 0xd46f0406U, 0x15ff6050U, | 474 | 0x8db59154U, 0x5d0571c4U, 0xd46f0406U, 0x15ff6050U, |
| 546 | 0xfb241998U, 0xe997d6bdU, 0x43cc8940U, 0x9e7767d9U, | 475 | 0xfb241998U, 0xe997d6bdU, 0x43cc8940U, 0x9e7767d9U, |
| @@ -652,71 +581,39 @@ static const u32 Td3[256] = { | |||
| 652 | 0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U, | 581 | 0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U, |
| 653 | 0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U, | 582 | 0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U, |
| 654 | }; | 583 | }; |
| 655 | static const u32 Td4[256] = { | 584 | static const u8 Td4[256] = { |
| 656 | 0x52525252U, 0x09090909U, 0x6a6a6a6aU, 0xd5d5d5d5U, | 585 | 0x52U, 0x09U, 0x6aU, 0xd5U, 0x30U, 0x36U, 0xa5U, 0x38U, |
| 657 | 0x30303030U, 0x36363636U, 0xa5a5a5a5U, 0x38383838U, | 586 | 0xbfU, 0x40U, 0xa3U, 0x9eU, 0x81U, 0xf3U, 0xd7U, 0xfbU, |
| 658 | 0xbfbfbfbfU, 0x40404040U, 0xa3a3a3a3U, 0x9e9e9e9eU, | 587 | 0x7cU, 0xe3U, 0x39U, 0x82U, 0x9bU, 0x2fU, 0xffU, 0x87U, |
| 659 | 0x81818181U, 0xf3f3f3f3U, 0xd7d7d7d7U, 0xfbfbfbfbU, | 588 | 0x34U, 0x8eU, 0x43U, 0x44U, 0xc4U, 0xdeU, 0xe9U, 0xcbU, |
| 660 | 0x7c7c7c7cU, 0xe3e3e3e3U, 0x39393939U, 0x82828282U, | 589 | 0x54U, 0x7bU, 0x94U, 0x32U, 0xa6U, 0xc2U, 0x23U, 0x3dU, |
| 661 | 0x9b9b9b9bU, 0x2f2f2f2fU, 0xffffffffU, 0x87878787U, | 590 | 0xeeU, 0x4cU, 0x95U, 0x0bU, 0x42U, 0xfaU, 0xc3U, 0x4eU, |
| 662 | 0x34343434U, 0x8e8e8e8eU, 0x43434343U, 0x44444444U, | 591 | 0x08U, 0x2eU, 0xa1U, 0x66U, 0x28U, 0xd9U, 0x24U, 0xb2U, |
| 663 | 0xc4c4c4c4U, 0xdedededeU, 0xe9e9e9e9U, 0xcbcbcbcbU, | 592 | 0x76U, 0x5bU, 0xa2U, 0x49U, 0x6dU, 0x8bU, 0xd1U, 0x25U, |
| 664 | 0x54545454U, 0x7b7b7b7bU, 0x94949494U, 0x32323232U, | 593 | 0x72U, 0xf8U, 0xf6U, 0x64U, 0x86U, 0x68U, 0x98U, 0x16U, |
| 665 | 0xa6a6a6a6U, 0xc2c2c2c2U, 0x23232323U, 0x3d3d3d3dU, | 594 | 0xd4U, 0xa4U, 0x5cU, 0xccU, 0x5dU, 0x65U, 0xb6U, 0x92U, |
| 666 | 0xeeeeeeeeU, 0x4c4c4c4cU, 0x95959595U, 0x0b0b0b0bU, | 595 | 0x6cU, 0x70U, 0x48U, 0x50U, 0xfdU, 0xedU, 0xb9U, 0xdaU, |
| 667 | 0x42424242U, 0xfafafafaU, 0xc3c3c3c3U, 0x4e4e4e4eU, | 596 | 0x5eU, 0x15U, 0x46U, 0x57U, 0xa7U, 0x8dU, 0x9dU, 0x84U, |
| 668 | 0x08080808U, 0x2e2e2e2eU, 0xa1a1a1a1U, 0x66666666U, | 597 | 0x90U, 0xd8U, 0xabU, 0x00U, 0x8cU, 0xbcU, 0xd3U, 0x0aU, |
| 669 | 0x28282828U, 0xd9d9d9d9U, 0x24242424U, 0xb2b2b2b2U, | 598 | 0xf7U, 0xe4U, 0x58U, 0x05U, 0xb8U, 0xb3U, 0x45U, 0x06U, |
| 670 | 0x76767676U, 0x5b5b5b5bU, 0xa2a2a2a2U, 0x49494949U, | 599 | 0xd0U, 0x2cU, 0x1eU, 0x8fU, 0xcaU, 0x3fU, 0x0fU, 0x02U, |
| 671 | 0x6d6d6d6dU, 0x8b8b8b8bU, 0xd1d1d1d1U, 0x25252525U, | 600 | 0xc1U, 0xafU, 0xbdU, 0x03U, 0x01U, 0x13U, 0x8aU, 0x6bU, |
| 672 | 0x72727272U, 0xf8f8f8f8U, 0xf6f6f6f6U, 0x64646464U, | 601 | 0x3aU, 0x91U, 0x11U, 0x41U, 0x4fU, 0x67U, 0xdcU, 0xeaU, |
| 673 | 0x86868686U, 0x68686868U, 0x98989898U, 0x16161616U, | 602 | 0x97U, 0xf2U, 0xcfU, 0xceU, 0xf0U, 0xb4U, 0xe6U, 0x73U, |
| 674 | 0xd4d4d4d4U, 0xa4a4a4a4U, 0x5c5c5c5cU, 0xccccccccU, | 603 | 0x96U, 0xacU, 0x74U, 0x22U, 0xe7U, 0xadU, 0x35U, 0x85U, |
| 675 | 0x5d5d5d5dU, 0x65656565U, 0xb6b6b6b6U, 0x92929292U, | 604 | 0xe2U, 0xf9U, 0x37U, 0xe8U, 0x1cU, 0x75U, 0xdfU, 0x6eU, |
| 676 | 0x6c6c6c6cU, 0x70707070U, 0x48484848U, 0x50505050U, | 605 | 0x47U, 0xf1U, 0x1aU, 0x71U, 0x1dU, 0x29U, 0xc5U, 0x89U, |
| 677 | 0xfdfdfdfdU, 0xededededU, 0xb9b9b9b9U, 0xdadadadaU, | 606 | 0x6fU, 0xb7U, 0x62U, 0x0eU, 0xaaU, 0x18U, 0xbeU, 0x1bU, |
| 678 | 0x5e5e5e5eU, 0x15151515U, 0x46464646U, 0x57575757U, | 607 | 0xfcU, 0x56U, 0x3eU, 0x4bU, 0xc6U, 0xd2U, 0x79U, 0x20U, |
| 679 | 0xa7a7a7a7U, 0x8d8d8d8dU, 0x9d9d9d9dU, 0x84848484U, | 608 | 0x9aU, 0xdbU, 0xc0U, 0xfeU, 0x78U, 0xcdU, 0x5aU, 0xf4U, |
| 680 | 0x90909090U, 0xd8d8d8d8U, 0xababababU, 0x00000000U, | 609 | 0x1fU, 0xddU, 0xa8U, 0x33U, 0x88U, 0x07U, 0xc7U, 0x31U, |
| 681 | 0x8c8c8c8cU, 0xbcbcbcbcU, 0xd3d3d3d3U, 0x0a0a0a0aU, | 610 | 0xb1U, 0x12U, 0x10U, 0x59U, 0x27U, 0x80U, 0xecU, 0x5fU, |
| 682 | 0xf7f7f7f7U, 0xe4e4e4e4U, 0x58585858U, 0x05050505U, | 611 | 0x60U, 0x51U, 0x7fU, 0xa9U, 0x19U, 0xb5U, 0x4aU, 0x0dU, |
| 683 | 0xb8b8b8b8U, 0xb3b3b3b3U, 0x45454545U, 0x06060606U, | 612 | 0x2dU, 0xe5U, 0x7aU, 0x9fU, 0x93U, 0xc9U, 0x9cU, 0xefU, |
| 684 | 0xd0d0d0d0U, 0x2c2c2c2cU, 0x1e1e1e1eU, 0x8f8f8f8fU, | 613 | 0xa0U, 0xe0U, 0x3bU, 0x4dU, 0xaeU, 0x2aU, 0xf5U, 0xb0U, |
| 685 | 0xcacacacaU, 0x3f3f3f3fU, 0x0f0f0f0fU, 0x02020202U, | 614 | 0xc8U, 0xebU, 0xbbU, 0x3cU, 0x83U, 0x53U, 0x99U, 0x61U, |
| 686 | 0xc1c1c1c1U, 0xafafafafU, 0xbdbdbdbdU, 0x03030303U, | 615 | 0x17U, 0x2bU, 0x04U, 0x7eU, 0xbaU, 0x77U, 0xd6U, 0x26U, |
| 687 | 0x01010101U, 0x13131313U, 0x8a8a8a8aU, 0x6b6b6b6bU, | 616 | 0xe1U, 0x69U, 0x14U, 0x63U, 0x55U, 0x21U, 0x0cU, 0x7dU, |
| 688 | 0x3a3a3a3aU, 0x91919191U, 0x11111111U, 0x41414141U, | ||
| 689 | 0x4f4f4f4fU, 0x67676767U, 0xdcdcdcdcU, 0xeaeaeaeaU, | ||
| 690 | 0x97979797U, 0xf2f2f2f2U, 0xcfcfcfcfU, 0xcecececeU, | ||
| 691 | 0xf0f0f0f0U, 0xb4b4b4b4U, 0xe6e6e6e6U, 0x73737373U, | ||
| 692 | 0x96969696U, 0xacacacacU, 0x74747474U, 0x22222222U, | ||
| 693 | 0xe7e7e7e7U, 0xadadadadU, 0x35353535U, 0x85858585U, | ||
| 694 | 0xe2e2e2e2U, 0xf9f9f9f9U, 0x37373737U, 0xe8e8e8e8U, | ||
| 695 | 0x1c1c1c1cU, 0x75757575U, 0xdfdfdfdfU, 0x6e6e6e6eU, | ||
| 696 | 0x47474747U, 0xf1f1f1f1U, 0x1a1a1a1aU, 0x71717171U, | ||
| 697 | 0x1d1d1d1dU, 0x29292929U, 0xc5c5c5c5U, 0x89898989U, | ||
| 698 | 0x6f6f6f6fU, 0xb7b7b7b7U, 0x62626262U, 0x0e0e0e0eU, | ||
| 699 | 0xaaaaaaaaU, 0x18181818U, 0xbebebebeU, 0x1b1b1b1bU, | ||
| 700 | 0xfcfcfcfcU, 0x56565656U, 0x3e3e3e3eU, 0x4b4b4b4bU, | ||
| 701 | 0xc6c6c6c6U, 0xd2d2d2d2U, 0x79797979U, 0x20202020U, | ||
| 702 | 0x9a9a9a9aU, 0xdbdbdbdbU, 0xc0c0c0c0U, 0xfefefefeU, | ||
| 703 | 0x78787878U, 0xcdcdcdcdU, 0x5a5a5a5aU, 0xf4f4f4f4U, | ||
| 704 | 0x1f1f1f1fU, 0xddddddddU, 0xa8a8a8a8U, 0x33333333U, | ||
| 705 | 0x88888888U, 0x07070707U, 0xc7c7c7c7U, 0x31313131U, | ||
| 706 | 0xb1b1b1b1U, 0x12121212U, 0x10101010U, 0x59595959U, | ||
| 707 | 0x27272727U, 0x80808080U, 0xececececU, 0x5f5f5f5fU, | ||
| 708 | 0x60606060U, 0x51515151U, 0x7f7f7f7fU, 0xa9a9a9a9U, | ||
| 709 | 0x19191919U, 0xb5b5b5b5U, 0x4a4a4a4aU, 0x0d0d0d0dU, | ||
| 710 | 0x2d2d2d2dU, 0xe5e5e5e5U, 0x7a7a7a7aU, 0x9f9f9f9fU, | ||
| 711 | 0x93939393U, 0xc9c9c9c9U, 0x9c9c9c9cU, 0xefefefefU, | ||
| 712 | 0xa0a0a0a0U, 0xe0e0e0e0U, 0x3b3b3b3bU, 0x4d4d4d4dU, | ||
| 713 | 0xaeaeaeaeU, 0x2a2a2a2aU, 0xf5f5f5f5U, 0xb0b0b0b0U, | ||
| 714 | 0xc8c8c8c8U, 0xebebebebU, 0xbbbbbbbbU, 0x3c3c3c3cU, | ||
| 715 | 0x83838383U, 0x53535353U, 0x99999999U, 0x61616161U, | ||
| 716 | 0x17171717U, 0x2b2b2b2bU, 0x04040404U, 0x7e7e7e7eU, | ||
| 717 | 0xbabababaU, 0x77777777U, 0xd6d6d6d6U, 0x26262626U, | ||
| 718 | 0xe1e1e1e1U, 0x69696969U, 0x14141414U, 0x63636363U, | ||
| 719 | 0x55555555U, 0x21212121U, 0x0c0c0c0cU, 0x7d7d7d7dU, | ||
| 720 | }; | 617 | }; |
| 721 | static const u32 rcon[] = { | 618 | static const u32 rcon[] = { |
| 722 | 0x01000000, 0x02000000, 0x04000000, 0x08000000, | 619 | 0x01000000, 0x02000000, 0x04000000, 0x08000000, |
| @@ -756,10 +653,10 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits, | |||
| 756 | while (1) { | 653 | while (1) { |
| 757 | temp = rk[3]; | 654 | temp = rk[3]; |
| 758 | rk[4] = rk[0] ^ | 655 | rk[4] = rk[0] ^ |
| 759 | (Te4[(temp >> 16) & 0xff] & 0xff000000) ^ | 656 | (Te2[(temp >> 16) & 0xff] & 0xff000000) ^ |
| 760 | (Te4[(temp >> 8) & 0xff] & 0x00ff0000) ^ | 657 | (Te3[(temp >> 8) & 0xff] & 0x00ff0000) ^ |
| 761 | (Te4[(temp ) & 0xff] & 0x0000ff00) ^ | 658 | (Te0[(temp ) & 0xff] & 0x0000ff00) ^ |
| 762 | (Te4[(temp >> 24) ] & 0x000000ff) ^ | 659 | (Te1[(temp >> 24) ] & 0x000000ff) ^ |
| 763 | rcon[i]; | 660 | rcon[i]; |
| 764 | rk[5] = rk[1] ^ rk[4]; | 661 | rk[5] = rk[1] ^ rk[4]; |
| 765 | rk[6] = rk[2] ^ rk[5]; | 662 | rk[6] = rk[2] ^ rk[5]; |
| @@ -776,10 +673,10 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits, | |||
| 776 | while (1) { | 673 | while (1) { |
| 777 | temp = rk[ 5]; | 674 | temp = rk[ 5]; |
| 778 | rk[ 6] = rk[ 0] ^ | 675 | rk[ 6] = rk[ 0] ^ |
| 779 | (Te4[(temp >> 16) & 0xff] & 0xff000000) ^ | 676 | (Te2[(temp >> 16) & 0xff] & 0xff000000) ^ |
| 780 | (Te4[(temp >> 8) & 0xff] & 0x00ff0000) ^ | 677 | (Te3[(temp >> 8) & 0xff] & 0x00ff0000) ^ |
| 781 | (Te4[(temp ) & 0xff] & 0x0000ff00) ^ | 678 | (Te0[(temp ) & 0xff] & 0x0000ff00) ^ |
| 782 | (Te4[(temp >> 24) ] & 0x000000ff) ^ | 679 | (Te1[(temp >> 24) ] & 0x000000ff) ^ |
| 783 | rcon[i]; | 680 | rcon[i]; |
| 784 | rk[ 7] = rk[ 1] ^ rk[ 6]; | 681 | rk[ 7] = rk[ 1] ^ rk[ 6]; |
| 785 | rk[ 8] = rk[ 2] ^ rk[ 7]; | 682 | rk[ 8] = rk[ 2] ^ rk[ 7]; |
| @@ -798,10 +695,10 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits, | |||
| 798 | while (1) { | 695 | while (1) { |
| 799 | temp = rk[ 7]; | 696 | temp = rk[ 7]; |
| 800 | rk[ 8] = rk[ 0] ^ | 697 | rk[ 8] = rk[ 0] ^ |
| 801 | (Te4[(temp >> 16) & 0xff] & 0xff000000) ^ | 698 | (Te2[(temp >> 16) & 0xff] & 0xff000000) ^ |
| 802 | (Te4[(temp >> 8) & 0xff] & 0x00ff0000) ^ | 699 | (Te3[(temp >> 8) & 0xff] & 0x00ff0000) ^ |
| 803 | (Te4[(temp ) & 0xff] & 0x0000ff00) ^ | 700 | (Te0[(temp ) & 0xff] & 0x0000ff00) ^ |
| 804 | (Te4[(temp >> 24) ] & 0x000000ff) ^ | 701 | (Te1[(temp >> 24) ] & 0x000000ff) ^ |
| 805 | rcon[i]; | 702 | rcon[i]; |
| 806 | rk[ 9] = rk[ 1] ^ rk[ 8]; | 703 | rk[ 9] = rk[ 1] ^ rk[ 8]; |
| 807 | rk[10] = rk[ 2] ^ rk[ 9]; | 704 | rk[10] = rk[ 2] ^ rk[ 9]; |
| @@ -811,10 +708,10 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits, | |||
| 811 | } | 708 | } |
| 812 | temp = rk[11]; | 709 | temp = rk[11]; |
| 813 | rk[12] = rk[ 4] ^ | 710 | rk[12] = rk[ 4] ^ |
| 814 | (Te4[(temp >> 24) ] & 0xff000000) ^ | 711 | (Te2[(temp >> 24) ] & 0xff000000) ^ |
| 815 | (Te4[(temp >> 16) & 0xff] & 0x00ff0000) ^ | 712 | (Te3[(temp >> 16) & 0xff] & 0x00ff0000) ^ |
| 816 | (Te4[(temp >> 8) & 0xff] & 0x0000ff00) ^ | 713 | (Te0[(temp >> 8) & 0xff] & 0x0000ff00) ^ |
| 817 | (Te4[(temp ) & 0xff] & 0x000000ff); | 714 | (Te1[(temp ) & 0xff] & 0x000000ff); |
| 818 | rk[13] = rk[ 5] ^ rk[12]; | 715 | rk[13] = rk[ 5] ^ rk[12]; |
| 819 | rk[14] = rk[ 6] ^ rk[13]; | 716 | rk[14] = rk[ 6] ^ rk[13]; |
| 820 | rk[15] = rk[ 7] ^ rk[14]; | 717 | rk[15] = rk[ 7] ^ rk[14]; |
| @@ -853,29 +750,30 @@ int AES_set_decrypt_key(const unsigned char *userKey, const int bits, | |||
| 853 | for (i = 1; i < (key->rounds); i++) { | 750 | for (i = 1; i < (key->rounds); i++) { |
| 854 | rk += 4; | 751 | rk += 4; |
| 855 | rk[0] = | 752 | rk[0] = |
| 856 | Td0[Te4[(rk[0] >> 24) ] & 0xff] ^ | 753 | Td0[Te1[(rk[0] >> 24) ] & 0xff] ^ |
| 857 | Td1[Te4[(rk[0] >> 16) & 0xff] & 0xff] ^ | 754 | Td1[Te1[(rk[0] >> 16) & 0xff] & 0xff] ^ |
| 858 | Td2[Te4[(rk[0] >> 8) & 0xff] & 0xff] ^ | 755 | Td2[Te1[(rk[0] >> 8) & 0xff] & 0xff] ^ |
| 859 | Td3[Te4[(rk[0] ) & 0xff] & 0xff]; | 756 | Td3[Te1[(rk[0] ) & 0xff] & 0xff]; |
| 860 | rk[1] = | 757 | rk[1] = |
| 861 | Td0[Te4[(rk[1] >> 24) ] & 0xff] ^ | 758 | Td0[Te1[(rk[1] >> 24) ] & 0xff] ^ |
| 862 | Td1[Te4[(rk[1] >> 16) & 0xff] & 0xff] ^ | 759 | Td1[Te1[(rk[1] >> 16) & 0xff] & 0xff] ^ |
| 863 | Td2[Te4[(rk[1] >> 8) & 0xff] & 0xff] ^ | 760 | Td2[Te1[(rk[1] >> 8) & 0xff] & 0xff] ^ |
| 864 | Td3[Te4[(rk[1] ) & 0xff] & 0xff]; | 761 | Td3[Te1[(rk[1] ) & 0xff] & 0xff]; |
| 865 | rk[2] = | 762 | rk[2] = |
| 866 | Td0[Te4[(rk[2] >> 24) ] & 0xff] ^ | 763 | Td0[Te1[(rk[2] >> 24) ] & 0xff] ^ |
| 867 | Td1[Te4[(rk[2] >> 16) & 0xff] & 0xff] ^ | 764 | Td1[Te1[(rk[2] >> 16) & 0xff] & 0xff] ^ |
| 868 | Td2[Te4[(rk[2] >> 8) & 0xff] & 0xff] ^ | 765 | Td2[Te1[(rk[2] >> 8) & 0xff] & 0xff] ^ |
| 869 | Td3[Te4[(rk[2] ) & 0xff] & 0xff]; | 766 | Td3[Te1[(rk[2] ) & 0xff] & 0xff]; |
| 870 | rk[3] = | 767 | rk[3] = |
| 871 | Td0[Te4[(rk[3] >> 24) ] & 0xff] ^ | 768 | Td0[Te1[(rk[3] >> 24) ] & 0xff] ^ |
| 872 | Td1[Te4[(rk[3] >> 16) & 0xff] & 0xff] ^ | 769 | Td1[Te1[(rk[3] >> 16) & 0xff] & 0xff] ^ |
| 873 | Td2[Te4[(rk[3] >> 8) & 0xff] & 0xff] ^ | 770 | Td2[Te1[(rk[3] >> 8) & 0xff] & 0xff] ^ |
| 874 | Td3[Te4[(rk[3] ) & 0xff] & 0xff]; | 771 | Td3[Te1[(rk[3] ) & 0xff] & 0xff]; |
| 875 | } | 772 | } |
| 876 | return 0; | 773 | return 0; |
| 877 | } | 774 | } |
| 878 | 775 | ||
| 776 | #ifndef AES_ASM | ||
| 879 | /* | 777 | /* |
| 880 | * Encrypt a single block | 778 | * Encrypt a single block |
| 881 | * in and out can overlap | 779 | * in and out can overlap |
| @@ -1038,31 +936,31 @@ void AES_encrypt(const unsigned char *in, unsigned char *out, | |||
| 1038 | * map cipher state to byte array block: | 936 | * map cipher state to byte array block: |
| 1039 | */ | 937 | */ |
| 1040 | s0 = | 938 | s0 = |
| 1041 | (Te4[(t0 >> 24) ] & 0xff000000) ^ | 939 | (Te2[(t0 >> 24) ] & 0xff000000) ^ |
| 1042 | (Te4[(t1 >> 16) & 0xff] & 0x00ff0000) ^ | 940 | (Te3[(t1 >> 16) & 0xff] & 0x00ff0000) ^ |
| 1043 | (Te4[(t2 >> 8) & 0xff] & 0x0000ff00) ^ | 941 | (Te0[(t2 >> 8) & 0xff] & 0x0000ff00) ^ |
| 1044 | (Te4[(t3 ) & 0xff] & 0x000000ff) ^ | 942 | (Te1[(t3 ) & 0xff] & 0x000000ff) ^ |
| 1045 | rk[0]; | 943 | rk[0]; |
| 1046 | PUTU32(out , s0); | 944 | PUTU32(out , s0); |
| 1047 | s1 = | 945 | s1 = |
| 1048 | (Te4[(t1 >> 24) ] & 0xff000000) ^ | 946 | (Te2[(t1 >> 24) ] & 0xff000000) ^ |
| 1049 | (Te4[(t2 >> 16) & 0xff] & 0x00ff0000) ^ | 947 | (Te3[(t2 >> 16) & 0xff] & 0x00ff0000) ^ |
| 1050 | (Te4[(t3 >> 8) & 0xff] & 0x0000ff00) ^ | 948 | (Te0[(t3 >> 8) & 0xff] & 0x0000ff00) ^ |
| 1051 | (Te4[(t0 ) & 0xff] & 0x000000ff) ^ | 949 | (Te1[(t0 ) & 0xff] & 0x000000ff) ^ |
| 1052 | rk[1]; | 950 | rk[1]; |
| 1053 | PUTU32(out + 4, s1); | 951 | PUTU32(out + 4, s1); |
| 1054 | s2 = | 952 | s2 = |
| 1055 | (Te4[(t2 >> 24) ] & 0xff000000) ^ | 953 | (Te2[(t2 >> 24) ] & 0xff000000) ^ |
| 1056 | (Te4[(t3 >> 16) & 0xff] & 0x00ff0000) ^ | 954 | (Te3[(t3 >> 16) & 0xff] & 0x00ff0000) ^ |
| 1057 | (Te4[(t0 >> 8) & 0xff] & 0x0000ff00) ^ | 955 | (Te0[(t0 >> 8) & 0xff] & 0x0000ff00) ^ |
| 1058 | (Te4[(t1 ) & 0xff] & 0x000000ff) ^ | 956 | (Te1[(t1 ) & 0xff] & 0x000000ff) ^ |
| 1059 | rk[2]; | 957 | rk[2]; |
| 1060 | PUTU32(out + 8, s2); | 958 | PUTU32(out + 8, s2); |
| 1061 | s3 = | 959 | s3 = |
| 1062 | (Te4[(t3 >> 24) ] & 0xff000000) ^ | 960 | (Te2[(t3 >> 24) ] & 0xff000000) ^ |
| 1063 | (Te4[(t0 >> 16) & 0xff] & 0x00ff0000) ^ | 961 | (Te3[(t0 >> 16) & 0xff] & 0x00ff0000) ^ |
| 1064 | (Te4[(t1 >> 8) & 0xff] & 0x0000ff00) ^ | 962 | (Te0[(t1 >> 8) & 0xff] & 0x0000ff00) ^ |
| 1065 | (Te4[(t2 ) & 0xff] & 0x000000ff) ^ | 963 | (Te1[(t2 ) & 0xff] & 0x000000ff) ^ |
| 1066 | rk[3]; | 964 | rk[3]; |
| 1067 | PUTU32(out + 12, s3); | 965 | PUTU32(out + 12, s3); |
| 1068 | } | 966 | } |
| @@ -1229,33 +1127,33 @@ void AES_decrypt(const unsigned char *in, unsigned char *out, | |||
| 1229 | * map cipher state to byte array block: | 1127 | * map cipher state to byte array block: |
| 1230 | */ | 1128 | */ |
| 1231 | s0 = | 1129 | s0 = |
| 1232 | (Td4[(t0 >> 24) ] & 0xff000000) ^ | 1130 | (Td4[(t0 >> 24) ] << 24) ^ |
| 1233 | (Td4[(t3 >> 16) & 0xff] & 0x00ff0000) ^ | 1131 | (Td4[(t3 >> 16) & 0xff] << 16) ^ |
| 1234 | (Td4[(t2 >> 8) & 0xff] & 0x0000ff00) ^ | 1132 | (Td4[(t2 >> 8) & 0xff] << 8) ^ |
| 1235 | (Td4[(t1 ) & 0xff] & 0x000000ff) ^ | 1133 | (Td4[(t1 ) & 0xff]) ^ |
| 1236 | rk[0]; | 1134 | rk[0]; |
| 1237 | PUTU32(out , s0); | 1135 | PUTU32(out , s0); |
| 1238 | s1 = | 1136 | s1 = |
| 1239 | (Td4[(t1 >> 24) ] & 0xff000000) ^ | 1137 | (Td4[(t1 >> 24) ] << 24) ^ |
| 1240 | (Td4[(t0 >> 16) & 0xff] & 0x00ff0000) ^ | 1138 | (Td4[(t0 >> 16) & 0xff] << 16) ^ |
| 1241 | (Td4[(t3 >> 8) & 0xff] & 0x0000ff00) ^ | 1139 | (Td4[(t3 >> 8) & 0xff] << 8) ^ |
| 1242 | (Td4[(t2 ) & 0xff] & 0x000000ff) ^ | 1140 | (Td4[(t2 ) & 0xff]) ^ |
| 1243 | rk[1]; | 1141 | rk[1]; |
| 1244 | PUTU32(out + 4, s1); | 1142 | PUTU32(out + 4, s1); |
| 1245 | s2 = | 1143 | s2 = |
| 1246 | (Td4[(t2 >> 24) ] & 0xff000000) ^ | 1144 | (Td4[(t2 >> 24) ] << 24) ^ |
| 1247 | (Td4[(t1 >> 16) & 0xff] & 0x00ff0000) ^ | 1145 | (Td4[(t1 >> 16) & 0xff] << 16) ^ |
| 1248 | (Td4[(t0 >> 8) & 0xff] & 0x0000ff00) ^ | 1146 | (Td4[(t0 >> 8) & 0xff] << 8) ^ |
| 1249 | (Td4[(t3 ) & 0xff] & 0x000000ff) ^ | 1147 | (Td4[(t3 ) & 0xff]) ^ |
| 1250 | rk[2]; | 1148 | rk[2]; |
| 1251 | PUTU32(out + 8, s2); | 1149 | PUTU32(out + 8, s2); |
| 1252 | s3 = | 1150 | s3 = |
| 1253 | (Td4[(t3 >> 24) ] & 0xff000000) ^ | 1151 | (Td4[(t3 >> 24) ] << 24) ^ |
| 1254 | (Td4[(t2 >> 16) & 0xff] & 0x00ff0000) ^ | 1152 | (Td4[(t2 >> 16) & 0xff] << 16) ^ |
| 1255 | (Td4[(t1 >> 8) & 0xff] & 0x0000ff00) ^ | 1153 | (Td4[(t1 >> 8) & 0xff] << 8) ^ |
| 1256 | (Td4[(t0 ) & 0xff] & 0x000000ff) ^ | 1154 | (Td4[(t0 ) & 0xff]) ^ |
| 1257 | rk[3]; | 1155 | rk[3]; |
| 1258 | PUTU32(out + 12, s3); | 1156 | PUTU32(out + 12, s3); |
| 1259 | } | 1157 | } |
| 1260 | 1158 | ||
| 1261 | #endif /* ndef OPENSSL_FIPS */ | 1159 | #endif /* AES_ASM */ |