diff options
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/Kconfig | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 8179ae62cec0..7c0a4c5de075 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig | |||
@@ -174,11 +174,6 @@ config CRYPTO_TEST | |||
174 | help | 174 | help |
175 | Quick & dirty crypto test module. | 175 | Quick & dirty crypto test module. |
176 | 176 | ||
177 | config CRYPTO_ABLK_HELPER_X86 | ||
178 | tristate | ||
179 | depends on X86 | ||
180 | select CRYPTO_CRYPTD | ||
181 | |||
182 | config CRYPTO_ABLK_HELPER | 177 | config CRYPTO_ABLK_HELPER |
183 | tristate | 178 | tristate |
184 | select CRYPTO_CRYPTD | 179 | select CRYPTO_CRYPTD |
@@ -699,7 +694,7 @@ config CRYPTO_AES_NI_INTEL | |||
699 | select CRYPTO_AES_X86_64 if 64BIT | 694 | select CRYPTO_AES_X86_64 if 64BIT |
700 | select CRYPTO_AES_586 if !64BIT | 695 | select CRYPTO_AES_586 if !64BIT |
701 | select CRYPTO_CRYPTD | 696 | select CRYPTO_CRYPTD |
702 | select CRYPTO_ABLK_HELPER_X86 | 697 | select CRYPTO_ABLK_HELPER |
703 | select CRYPTO_ALGAPI | 698 | select CRYPTO_ALGAPI |
704 | select CRYPTO_GLUE_HELPER_X86 if 64BIT | 699 | select CRYPTO_GLUE_HELPER_X86 if 64BIT |
705 | select CRYPTO_LRW | 700 | select CRYPTO_LRW |
@@ -883,7 +878,7 @@ config CRYPTO_CAMELLIA_AESNI_AVX_X86_64 | |||
883 | depends on CRYPTO | 878 | depends on CRYPTO |
884 | select CRYPTO_ALGAPI | 879 | select CRYPTO_ALGAPI |
885 | select CRYPTO_CRYPTD | 880 | select CRYPTO_CRYPTD |
886 | select CRYPTO_ABLK_HELPER_X86 | 881 | select CRYPTO_ABLK_HELPER |
887 | select CRYPTO_GLUE_HELPER_X86 | 882 | select CRYPTO_GLUE_HELPER_X86 |
888 | select CRYPTO_CAMELLIA_X86_64 | 883 | select CRYPTO_CAMELLIA_X86_64 |
889 | select CRYPTO_LRW | 884 | select CRYPTO_LRW |
@@ -905,7 +900,7 @@ config CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 | |||
905 | depends on CRYPTO | 900 | depends on CRYPTO |
906 | select CRYPTO_ALGAPI | 901 | select CRYPTO_ALGAPI |
907 | select CRYPTO_CRYPTD | 902 | select CRYPTO_CRYPTD |
908 | select CRYPTO_ABLK_HELPER_X86 | 903 | select CRYPTO_ABLK_HELPER |
909 | select CRYPTO_GLUE_HELPER_X86 | 904 | select CRYPTO_GLUE_HELPER_X86 |
910 | select CRYPTO_CAMELLIA_X86_64 | 905 | select CRYPTO_CAMELLIA_X86_64 |
911 | select CRYPTO_CAMELLIA_AESNI_AVX_X86_64 | 906 | select CRYPTO_CAMELLIA_AESNI_AVX_X86_64 |
@@ -957,7 +952,7 @@ config CRYPTO_CAST5_AVX_X86_64 | |||
957 | depends on X86 && 64BIT | 952 | depends on X86 && 64BIT |
958 | select CRYPTO_ALGAPI | 953 | select CRYPTO_ALGAPI |
959 | select CRYPTO_CRYPTD | 954 | select CRYPTO_CRYPTD |
960 | select CRYPTO_ABLK_HELPER_X86 | 955 | select CRYPTO_ABLK_HELPER |
961 | select CRYPTO_CAST_COMMON | 956 | select CRYPTO_CAST_COMMON |
962 | select CRYPTO_CAST5 | 957 | select CRYPTO_CAST5 |
963 | help | 958 | help |
@@ -980,7 +975,7 @@ config CRYPTO_CAST6_AVX_X86_64 | |||
980 | depends on X86 && 64BIT | 975 | depends on X86 && 64BIT |
981 | select CRYPTO_ALGAPI | 976 | select CRYPTO_ALGAPI |
982 | select CRYPTO_CRYPTD | 977 | select CRYPTO_CRYPTD |
983 | select CRYPTO_ABLK_HELPER_X86 | 978 | select CRYPTO_ABLK_HELPER |
984 | select CRYPTO_GLUE_HELPER_X86 | 979 | select CRYPTO_GLUE_HELPER_X86 |
985 | select CRYPTO_CAST_COMMON | 980 | select CRYPTO_CAST_COMMON |
986 | select CRYPTO_CAST6 | 981 | select CRYPTO_CAST6 |
@@ -1098,7 +1093,7 @@ config CRYPTO_SERPENT_SSE2_X86_64 | |||
1098 | depends on X86 && 64BIT | 1093 | depends on X86 && 64BIT |
1099 | select CRYPTO_ALGAPI | 1094 | select CRYPTO_ALGAPI |
1100 | select CRYPTO_CRYPTD | 1095 | select CRYPTO_CRYPTD |
1101 | select CRYPTO_ABLK_HELPER_X86 | 1096 | select CRYPTO_ABLK_HELPER |
1102 | select CRYPTO_GLUE_HELPER_X86 | 1097 | select CRYPTO_GLUE_HELPER_X86 |
1103 | select CRYPTO_SERPENT | 1098 | select CRYPTO_SERPENT |
1104 | select CRYPTO_LRW | 1099 | select CRYPTO_LRW |
@@ -1120,7 +1115,7 @@ config CRYPTO_SERPENT_SSE2_586 | |||
1120 | depends on X86 && !64BIT | 1115 | depends on X86 && !64BIT |
1121 | select CRYPTO_ALGAPI | 1116 | select CRYPTO_ALGAPI |
1122 | select CRYPTO_CRYPTD | 1117 | select CRYPTO_CRYPTD |
1123 | select CRYPTO_ABLK_HELPER_X86 | 1118 | select CRYPTO_ABLK_HELPER |
1124 | select CRYPTO_GLUE_HELPER_X86 | 1119 | select CRYPTO_GLUE_HELPER_X86 |
1125 | select CRYPTO_SERPENT | 1120 | select CRYPTO_SERPENT |
1126 | select CRYPTO_LRW | 1121 | select CRYPTO_LRW |
@@ -1142,7 +1137,7 @@ config CRYPTO_SERPENT_AVX_X86_64 | |||
1142 | depends on X86 && 64BIT | 1137 | depends on X86 && 64BIT |
1143 | select CRYPTO_ALGAPI | 1138 | select CRYPTO_ALGAPI |
1144 | select CRYPTO_CRYPTD | 1139 | select CRYPTO_CRYPTD |
1145 | select CRYPTO_ABLK_HELPER_X86 | 1140 | select CRYPTO_ABLK_HELPER |
1146 | select CRYPTO_GLUE_HELPER_X86 | 1141 | select CRYPTO_GLUE_HELPER_X86 |
1147 | select CRYPTO_SERPENT | 1142 | select CRYPTO_SERPENT |
1148 | select CRYPTO_LRW | 1143 | select CRYPTO_LRW |
@@ -1164,7 +1159,7 @@ config CRYPTO_SERPENT_AVX2_X86_64 | |||
1164 | depends on X86 && 64BIT | 1159 | depends on X86 && 64BIT |
1165 | select CRYPTO_ALGAPI | 1160 | select CRYPTO_ALGAPI |
1166 | select CRYPTO_CRYPTD | 1161 | select CRYPTO_CRYPTD |
1167 | select CRYPTO_ABLK_HELPER_X86 | 1162 | select CRYPTO_ABLK_HELPER |
1168 | select CRYPTO_GLUE_HELPER_X86 | 1163 | select CRYPTO_GLUE_HELPER_X86 |
1169 | select CRYPTO_SERPENT | 1164 | select CRYPTO_SERPENT |
1170 | select CRYPTO_SERPENT_AVX_X86_64 | 1165 | select CRYPTO_SERPENT_AVX_X86_64 |
@@ -1280,7 +1275,7 @@ config CRYPTO_TWOFISH_AVX_X86_64 | |||
1280 | depends on X86 && 64BIT | 1275 | depends on X86 && 64BIT |
1281 | select CRYPTO_ALGAPI | 1276 | select CRYPTO_ALGAPI |
1282 | select CRYPTO_CRYPTD | 1277 | select CRYPTO_CRYPTD |
1283 | select CRYPTO_ABLK_HELPER_X86 | 1278 | select CRYPTO_ABLK_HELPER |
1284 | select CRYPTO_GLUE_HELPER_X86 | 1279 | select CRYPTO_GLUE_HELPER_X86 |
1285 | select CRYPTO_TWOFISH_COMMON | 1280 | select CRYPTO_TWOFISH_COMMON |
1286 | select CRYPTO_TWOFISH_X86_64 | 1281 | select CRYPTO_TWOFISH_X86_64 |