diff options
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Kconfig | 19 | ||||
| -rw-r--r-- | crypto/Makefile | 1 | ||||
| -rw-r--r-- | crypto/crct10dif.c | 178 | ||||
| -rw-r--r-- | crypto/tcrypt.c | 8 | ||||
| -rw-r--r-- | crypto/testmgr.c | 10 | ||||
| -rw-r--r-- | crypto/testmgr.h | 33 |
6 files changed, 0 insertions, 249 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 69ce573f1224..aca01164f002 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig | |||
| @@ -376,25 +376,6 @@ config CRYPTO_CRC32_PCLMUL | |||
| 376 | which will enable any routine to use the CRC-32-IEEE 802.3 checksum | 376 | which will enable any routine to use the CRC-32-IEEE 802.3 checksum |
| 377 | and gain better performance as compared with the table implementation. | 377 | and gain better performance as compared with the table implementation. |
| 378 | 378 | ||
| 379 | config CRYPTO_CRCT10DIF | ||
| 380 | tristate "CRCT10DIF algorithm" | ||
| 381 | select CRYPTO_HASH | ||
| 382 | help | ||
| 383 | CRC T10 Data Integrity Field computation is being cast as | ||
| 384 | a crypto transform. This allows for faster crc t10 diff | ||
| 385 | transforms to be used if they are available. | ||
| 386 | |||
| 387 | config CRYPTO_CRCT10DIF_PCLMUL | ||
| 388 | tristate "CRCT10DIF PCLMULQDQ hardware acceleration" | ||
| 389 | depends on X86 && 64BIT && CRC_T10DIF | ||
| 390 | select CRYPTO_HASH | ||
| 391 | help | ||
| 392 | For x86_64 processors with SSE4.2 and PCLMULQDQ supported, | ||
| 393 | CRC T10 DIF PCLMULQDQ computation can be hardware | ||
| 394 | accelerated PCLMULQDQ instruction. This option will create | ||
| 395 | 'crct10dif-plcmul' module, which is faster when computing the | ||
| 396 | crct10dif checksum as compared with the generic table implementation. | ||
| 397 | |||
| 398 | config CRYPTO_GHASH | 379 | config CRYPTO_GHASH |
| 399 | tristate "GHASH digest algorithm" | 380 | tristate "GHASH digest algorithm" |
| 400 | select CRYPTO_GF128MUL | 381 | select CRYPTO_GF128MUL |
diff --git a/crypto/Makefile b/crypto/Makefile index 2d5ed08a239f..2ba0df2f908f 100644 --- a/crypto/Makefile +++ b/crypto/Makefile | |||
| @@ -83,7 +83,6 @@ obj-$(CONFIG_CRYPTO_ZLIB) += zlib.o | |||
| 83 | obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o | 83 | obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o |
| 84 | obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o | 84 | obj-$(CONFIG_CRYPTO_CRC32C) += crc32c.o |
| 85 | obj-$(CONFIG_CRYPTO_CRC32) += crc32.o | 85 | obj-$(CONFIG_CRYPTO_CRC32) += crc32.o |
| 86 | obj-$(CONFIG_CRYPTO_CRCT10DIF) += crct10dif.o | ||
| 87 | obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o authencesn.o | 86 | obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o authencesn.o |
| 88 | obj-$(CONFIG_CRYPTO_LZO) += lzo.o | 87 | obj-$(CONFIG_CRYPTO_LZO) += lzo.o |
| 89 | obj-$(CONFIG_CRYPTO_LZ4) += lz4.o | 88 | obj-$(CONFIG_CRYPTO_LZ4) += lz4.o |
diff --git a/crypto/crct10dif.c b/crypto/crct10dif.c deleted file mode 100644 index 92aca96d6b98..000000000000 --- a/crypto/crct10dif.c +++ /dev/null | |||
| @@ -1,178 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Cryptographic API. | ||
| 3 | * | ||
| 4 | * T10 Data Integrity Field CRC16 Crypto Transform | ||
| 5 | * | ||
| 6 | * Copyright (c) 2007 Oracle Corporation. All rights reserved. | ||
| 7 | * Written by Martin K. Petersen <martin.petersen@oracle.com> | ||
| 8 | * Copyright (C) 2013 Intel Corporation | ||
| 9 | * Author: Tim Chen <tim.c.chen@linux.intel.com> | ||
| 10 | * | ||
| 11 | * This program is free software; you can redistribute it and/or modify it | ||
| 12 | * under the terms of the GNU General Public License as published by the Free | ||
| 13 | * Software Foundation; either version 2 of the License, or (at your option) | ||
| 14 | * any later version. | ||
| 15 | * | ||
| 16 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| 17 | * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| 18 | * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| 19 | * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS | ||
| 20 | * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN | ||
| 21 | * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
| 22 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| 23 | * SOFTWARE. | ||
| 24 | * | ||
| 25 | */ | ||
| 26 | |||
| 27 | #include <linux/types.h> | ||
| 28 | #include <linux/module.h> | ||
| 29 | #include <linux/crc-t10dif.h> | ||
| 30 | #include <crypto/internal/hash.h> | ||
| 31 | #include <linux/init.h> | ||
| 32 | #include <linux/string.h> | ||
| 33 | #include <linux/kernel.h> | ||
| 34 | |||
| 35 | struct chksum_desc_ctx { | ||
| 36 | __u16 crc; | ||
| 37 | }; | ||
| 38 | |||
| 39 | /* Table generated using the following polynomium: | ||
| 40 | * x^16 + x^15 + x^11 + x^9 + x^8 + x^7 + x^5 + x^4 + x^2 + x + 1 | ||
| 41 | * gt: 0x8bb7 | ||
| 42 | */ | ||
| 43 | static const __u16 t10_dif_crc_table[256] = { | ||
| 44 | 0x0000, 0x8BB7, 0x9CD9, 0x176E, 0xB205, 0x39B2, 0x2EDC, 0xA56B, | ||
| 45 | 0xEFBD, 0x640A, 0x7364, 0xF8D3, 0x5DB8, 0xD60F, 0xC161, 0x4AD6, | ||
| 46 | 0x54CD, 0xDF7A, 0xC814, 0x43A3, 0xE6C8, 0x6D7F, 0x7A11, 0xF1A6, | ||
| 47 | 0xBB70, 0x30C7, 0x27A9, 0xAC1E, 0x0975, 0x82C2, 0x95AC, 0x1E1B, | ||
| 48 | 0xA99A, 0x222D, 0x3543, 0xBEF4, 0x1B9F, 0x9028, 0x8746, 0x0CF1, | ||
| 49 | 0x4627, 0xCD90, 0xDAFE, 0x5149, 0xF422, 0x7F95, 0x68FB, 0xE34C, | ||
| 50 | 0xFD57, 0x76E0, 0x618E, 0xEA39, 0x4F52, 0xC4E5, 0xD38B, 0x583C, | ||
| 51 | 0x12EA, 0x995D, 0x8E33, 0x0584, 0xA0EF, 0x2B58, 0x3C36, 0xB781, | ||
| 52 | 0xD883, 0x5334, 0x445A, 0xCFED, 0x6A86, 0xE131, 0xF65F, 0x7DE8, | ||
| 53 | 0x373E, 0xBC89, 0xABE7, 0x2050, 0x853B, 0x0E8C, 0x19E2, 0x9255, | ||
| 54 | 0x8C4E, 0x07F9, 0x1097, 0x9B20, 0x3E4B, 0xB5FC, 0xA292, 0x2925, | ||
| 55 | 0x63F3, 0xE844, 0xFF2A, 0x749D, 0xD1F6, 0x5A41, 0x4D2F, 0xC698, | ||
| 56 | 0x7119, 0xFAAE, 0xEDC0, 0x6677, 0xC31C, 0x48AB, 0x5FC5, 0xD472, | ||
| 57 | 0x9EA4, 0x1513, 0x027D, 0x89CA, 0x2CA1, 0xA716, 0xB078, 0x3BCF, | ||
| 58 | 0x25D4, 0xAE63, 0xB90D, 0x32BA, 0x97D1, 0x1C66, 0x0B08, 0x80BF, | ||
| 59 | 0xCA69, 0x41DE, 0x56B0, 0xDD07, 0x786C, 0xF3DB, 0xE4B5, 0x6F02, | ||
| 60 | 0x3AB1, 0xB106, 0xA668, 0x2DDF, 0x88B4, 0x0303, 0x146D, 0x9FDA, | ||
| 61 | 0xD50C, 0x5EBB, 0x49D5, 0xC262, 0x6709, 0xECBE, 0xFBD0, 0x7067, | ||
| 62 | 0x6E7C, 0xE5CB, 0xF2A5, 0x7912, 0xDC79, 0x57CE, 0x40A0, 0xCB17, | ||
| 63 | 0x81C1, 0x0A76, 0x1D18, 0x96AF, 0x33C4, 0xB873, 0xAF1D, 0x24AA, | ||
| 64 | 0x932B, 0x189C, 0x0FF2, 0x8445, 0x212E, 0xAA99, 0xBDF7, 0x3640, | ||
| 65 | 0x7C96, 0xF721, 0xE04F, 0x6BF8, 0xCE93, 0x4524, 0x524A, 0xD9FD, | ||
| 66 | 0xC7E6, 0x4C51, 0x5B3F, 0xD088, 0x75E3, 0xFE54, 0xE93A, 0x628D, | ||
| 67 | 0x285B, 0xA3EC, 0xB482, 0x3F35, 0x9A5E, 0x11E9, 0x0687, 0x8D30, | ||
| 68 | 0xE232, 0x6985, 0x7EEB, 0xF55C, 0x5037, 0xDB80, 0xCCEE, 0x4759, | ||
| 69 | 0x0D8F, 0x8638, 0x9156, 0x1AE1, 0xBF8A, 0x343D, 0x2353, 0xA8E4, | ||
| 70 | 0xB6FF, 0x3D48, 0x2A26, 0xA191, 0x04FA, 0x8F4D, 0x9823, 0x1394, | ||
| 71 | 0x5942, 0xD2F5, 0xC59B, 0x4E2C, 0xEB47, 0x60F0, 0x779E, 0xFC29, | ||
| 72 | 0x4BA8, 0xC01F, 0xD771, 0x5CC6, 0xF9AD, 0x721A, 0x6574, 0xEEC3, | ||
| 73 | 0xA415, 0x2FA2, 0x38CC, 0xB37B, 0x1610, 0x9DA7, 0x8AC9, 0x017E, | ||
| 74 | 0x1F65, 0x94D2, 0x83BC, 0x080B, 0xAD60, 0x26D7, 0x31B9, 0xBA0E, | ||
| 75 | 0xF0D8, 0x7B6F, 0x6C01, 0xE7B6, 0x42DD, 0xC96A, 0xDE04, 0x55B3 | ||
| 76 | }; | ||
| 77 | |||
| 78 | __u16 crc_t10dif_generic(__u16 crc, const unsigned char *buffer, size_t len) | ||
| 79 | { | ||
| 80 | unsigned int i; | ||
| 81 | |||
| 82 | for (i = 0 ; i < len ; i++) | ||
| 83 | crc = (crc << 8) ^ t10_dif_crc_table[((crc >> 8) ^ buffer[i]) & 0xff]; | ||
| 84 | |||
| 85 | return crc; | ||
| 86 | } | ||
| 87 | EXPORT_SYMBOL(crc_t10dif_generic); | ||
| 88 | |||
| 89 | /* | ||
| 90 | * Steps through buffer one byte at at time, calculates reflected | ||
| 91 | * crc using table. | ||
| 92 | */ | ||
| 93 | |||
| 94 | static int chksum_init(struct shash_desc *desc) | ||
| 95 | { | ||
| 96 | struct chksum_desc_ctx *ctx = shash_desc_ctx(desc); | ||
| 97 | |||
| 98 | ctx->crc = 0; | ||
| 99 | |||
| 100 | return 0; | ||
| 101 | } | ||
| 102 | |||
| 103 | static int chksum_update(struct shash_desc *desc, const u8 *data, | ||
| 104 | unsigned int length) | ||
| 105 | { | ||
| 106 | struct chksum_desc_ctx *ctx = shash_desc_ctx(desc); | ||
| 107 | |||
| 108 | ctx->crc = crc_t10dif_generic(ctx->crc, data, length); | ||
| 109 | return 0; | ||
| 110 | } | ||
| 111 | |||
| 112 | static int chksum_final(struct shash_desc *desc, u8 *out) | ||
| 113 | { | ||
| 114 | struct chksum_desc_ctx *ctx = shash_desc_ctx(desc); | ||
| 115 | |||
| 116 | *(__u16 *)out = ctx->crc; | ||
| 117 | return 0; | ||
| 118 | } | ||
| 119 | |||
| 120 | static int __chksum_finup(__u16 *crcp, const u8 *data, unsigned int len, | ||
| 121 | u8 *out) | ||
| 122 | { | ||
| 123 | *(__u16 *)out = crc_t10dif_generic(*crcp, data, len); | ||
| 124 | return 0; | ||
| 125 | } | ||
| 126 | |||
| 127 | static int chksum_finup(struct shash_desc *desc, const u8 *data, | ||
| 128 | unsigned int len, u8 *out) | ||
| 129 | { | ||
| 130 | struct chksum_desc_ctx *ctx = shash_desc_ctx(desc); | ||
| 131 | |||
| 132 | return __chksum_finup(&ctx->crc, data, len, out); | ||
| 133 | } | ||
| 134 | |||
| 135 | static int chksum_digest(struct shash_desc *desc, const u8 *data, | ||
| 136 | unsigned int length, u8 *out) | ||
| 137 | { | ||
| 138 | struct chksum_desc_ctx *ctx = shash_desc_ctx(desc); | ||
| 139 | |||
| 140 | return __chksum_finup(&ctx->crc, data, length, out); | ||
| 141 | } | ||
| 142 | |||
| 143 | static struct shash_alg alg = { | ||
| 144 | .digestsize = CRC_T10DIF_DIGEST_SIZE, | ||
| 145 | .init = chksum_init, | ||
| 146 | .update = chksum_update, | ||
| 147 | .final = chksum_final, | ||
| 148 | .finup = chksum_finup, | ||
| 149 | .digest = chksum_digest, | ||
| 150 | .descsize = sizeof(struct chksum_desc_ctx), | ||
| 151 | .base = { | ||
| 152 | .cra_name = "crct10dif", | ||
| 153 | .cra_driver_name = "crct10dif-generic", | ||
| 154 | .cra_priority = 100, | ||
| 155 | .cra_blocksize = CRC_T10DIF_BLOCK_SIZE, | ||
| 156 | .cra_module = THIS_MODULE, | ||
| 157 | } | ||
| 158 | }; | ||
| 159 | |||
| 160 | static int __init crct10dif_mod_init(void) | ||
| 161 | { | ||
| 162 | int ret; | ||
| 163 | |||
| 164 | ret = crypto_register_shash(&alg); | ||
| 165 | return ret; | ||
| 166 | } | ||
| 167 | |||
| 168 | static void __exit crct10dif_mod_fini(void) | ||
| 169 | { | ||
| 170 | crypto_unregister_shash(&alg); | ||
| 171 | } | ||
| 172 | |||
| 173 | module_init(crct10dif_mod_init); | ||
| 174 | module_exit(crct10dif_mod_fini); | ||
| 175 | |||
| 176 | MODULE_AUTHOR("Tim Chen <tim.c.chen@linux.intel.com>"); | ||
| 177 | MODULE_DESCRIPTION("T10 DIF CRC calculation."); | ||
| 178 | MODULE_LICENSE("GPL"); | ||
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index 25a5934f0e50..66d254ce0d11 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c | |||
| @@ -1174,10 +1174,6 @@ static int do_test(int m) | |||
| 1174 | ret += tcrypt_test("ghash"); | 1174 | ret += tcrypt_test("ghash"); |
| 1175 | break; | 1175 | break; |
| 1176 | 1176 | ||
| 1177 | case 47: | ||
| 1178 | ret += tcrypt_test("crct10dif"); | ||
| 1179 | break; | ||
| 1180 | |||
| 1181 | case 100: | 1177 | case 100: |
| 1182 | ret += tcrypt_test("hmac(md5)"); | 1178 | ret += tcrypt_test("hmac(md5)"); |
| 1183 | break; | 1179 | break; |
| @@ -1502,10 +1498,6 @@ static int do_test(int m) | |||
| 1502 | test_hash_speed("crc32c", sec, generic_hash_speed_template); | 1498 | test_hash_speed("crc32c", sec, generic_hash_speed_template); |
| 1503 | if (mode > 300 && mode < 400) break; | 1499 | if (mode > 300 && mode < 400) break; |
| 1504 | 1500 | ||
| 1505 | case 320: | ||
| 1506 | test_hash_speed("crct10dif", sec, generic_hash_speed_template); | ||
| 1507 | if (mode > 300 && mode < 400) break; | ||
| 1508 | |||
| 1509 | case 399: | 1501 | case 399: |
| 1510 | break; | 1502 | break; |
| 1511 | 1503 | ||
diff --git a/crypto/testmgr.c b/crypto/testmgr.c index 2f00607039e2..ecddf921a9db 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c | |||
| @@ -2046,16 +2046,6 @@ static const struct alg_test_desc alg_test_descs[] = { | |||
| 2046 | } | 2046 | } |
| 2047 | } | 2047 | } |
| 2048 | }, { | 2048 | }, { |
| 2049 | .alg = "crct10dif", | ||
| 2050 | .test = alg_test_hash, | ||
| 2051 | .fips_allowed = 1, | ||
| 2052 | .suite = { | ||
| 2053 | .hash = { | ||
| 2054 | .vecs = crct10dif_tv_template, | ||
| 2055 | .count = CRCT10DIF_TEST_VECTORS | ||
| 2056 | } | ||
| 2057 | } | ||
| 2058 | }, { | ||
| 2059 | .alg = "cryptd(__driver-cbc-aes-aesni)", | 2049 | .alg = "cryptd(__driver-cbc-aes-aesni)", |
| 2060 | .test = alg_test_null, | 2050 | .test = alg_test_null, |
| 2061 | .fips_allowed = 1, | 2051 | .fips_allowed = 1, |
diff --git a/crypto/testmgr.h b/crypto/testmgr.h index 7d44aa3d6b44..1e701bc075b9 100644 --- a/crypto/testmgr.h +++ b/crypto/testmgr.h | |||
| @@ -450,39 +450,6 @@ static struct hash_testvec rmd320_tv_template[] = { | |||
| 450 | } | 450 | } |
| 451 | }; | 451 | }; |
| 452 | 452 | ||
| 453 | #define CRCT10DIF_TEST_VECTORS 3 | ||
| 454 | static struct hash_testvec crct10dif_tv_template[] = { | ||
| 455 | { | ||
| 456 | .plaintext = "abc", | ||
| 457 | .psize = 3, | ||
| 458 | #ifdef __LITTLE_ENDIAN | ||
| 459 | .digest = "\x3b\x44", | ||
| 460 | #else | ||
| 461 | .digest = "\x44\x3b", | ||
| 462 | #endif | ||
| 463 | }, { | ||
| 464 | .plaintext = "1234567890123456789012345678901234567890" | ||
| 465 | "123456789012345678901234567890123456789", | ||
| 466 | .psize = 79, | ||
| 467 | #ifdef __LITTLE_ENDIAN | ||
| 468 | .digest = "\x70\x4b", | ||
| 469 | #else | ||
| 470 | .digest = "\x4b\x70", | ||
| 471 | #endif | ||
| 472 | }, { | ||
| 473 | .plaintext = | ||
| 474 | "abcddddddddddddddddddddddddddddddddddddddddddddddddddddd", | ||
| 475 | .psize = 56, | ||
| 476 | #ifdef __LITTLE_ENDIAN | ||
| 477 | .digest = "\xe3\x9c", | ||
| 478 | #else | ||
| 479 | .digest = "\x9c\xe3", | ||
| 480 | #endif | ||
| 481 | .np = 2, | ||
| 482 | .tap = { 28, 28 } | ||
| 483 | } | ||
| 484 | }; | ||
| 485 | |||
| 486 | /* | 453 | /* |
| 487 | * SHA1 test vectors from from FIPS PUB 180-1 | 454 | * SHA1 test vectors from from FIPS PUB 180-1 |
| 488 | * Long vector from CAVS 5.0 | 455 | * Long vector from CAVS 5.0 |
