diff options
author | Jussi Kivilinna <jussi.kivilinna@iki.fi> | 2013-05-21 10:10:44 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-05-28 03:43:05 -0400 |
commit | 340991e30ccef7b983cf2814ecea610504f5d059 (patch) | |
tree | f98c4bfe53b59c18b4368133fe9f409e8022f45f /arch/x86 | |
parent | d329581493802cede83ca672093588f399d02a65 (diff) |
crypto: sha512_ssse3 - add sha384 support
Add sha384 implementation to sha512_ssse3 module.
This also fixes sha512_ssse3 module autoloading issue when 'sha384' is used
before 'sha512'. Previously in such case, just sha512_generic was loaded and
not sha512_ssse3 (since it did not provide sha384). Now if 'sha512' was used
after 'sha384' usage, sha512_ssse3 would remain unloaded. For example, this
happens with tcrypt testing module since it tests 'sha384' before 'sha512'.
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/crypto/sha512_ssse3_glue.c | 58 |
1 files changed, 53 insertions, 5 deletions
diff --git a/arch/x86/crypto/sha512_ssse3_glue.c b/arch/x86/crypto/sha512_ssse3_glue.c index 6cbd8df348d2..f30cd10293f0 100644 --- a/arch/x86/crypto/sha512_ssse3_glue.c +++ b/arch/x86/crypto/sha512_ssse3_glue.c | |||
@@ -194,7 +194,37 @@ static int sha512_ssse3_import(struct shash_desc *desc, const void *in) | |||
194 | return 0; | 194 | return 0; |
195 | } | 195 | } |
196 | 196 | ||
197 | static struct shash_alg alg = { | 197 | static int sha384_ssse3_init(struct shash_desc *desc) |
198 | { | ||
199 | struct sha512_state *sctx = shash_desc_ctx(desc); | ||
200 | |||
201 | sctx->state[0] = SHA384_H0; | ||
202 | sctx->state[1] = SHA384_H1; | ||
203 | sctx->state[2] = SHA384_H2; | ||
204 | sctx->state[3] = SHA384_H3; | ||
205 | sctx->state[4] = SHA384_H4; | ||
206 | sctx->state[5] = SHA384_H5; | ||
207 | sctx->state[6] = SHA384_H6; | ||
208 | sctx->state[7] = SHA384_H7; | ||
209 | |||
210 | sctx->count[0] = sctx->count[1] = 0; | ||
211 | |||
212 | return 0; | ||
213 | } | ||
214 | |||
215 | static int sha384_ssse3_final(struct shash_desc *desc, u8 *hash) | ||
216 | { | ||
217 | u8 D[SHA512_DIGEST_SIZE]; | ||
218 | |||
219 | sha512_ssse3_final(desc, D); | ||
220 | |||
221 | memcpy(hash, D, SHA384_DIGEST_SIZE); | ||
222 | memset(D, 0, SHA512_DIGEST_SIZE); | ||
223 | |||
224 | return 0; | ||
225 | } | ||
226 | |||
227 | static struct shash_alg algs[] = { { | ||
198 | .digestsize = SHA512_DIGEST_SIZE, | 228 | .digestsize = SHA512_DIGEST_SIZE, |
199 | .init = sha512_ssse3_init, | 229 | .init = sha512_ssse3_init, |
200 | .update = sha512_ssse3_update, | 230 | .update = sha512_ssse3_update, |
@@ -211,7 +241,24 @@ static struct shash_alg alg = { | |||
211 | .cra_blocksize = SHA512_BLOCK_SIZE, | 241 | .cra_blocksize = SHA512_BLOCK_SIZE, |
212 | .cra_module = THIS_MODULE, | 242 | .cra_module = THIS_MODULE, |
213 | } | 243 | } |
214 | }; | 244 | }, { |
245 | .digestsize = SHA384_DIGEST_SIZE, | ||
246 | .init = sha384_ssse3_init, | ||
247 | .update = sha512_ssse3_update, | ||
248 | .final = sha384_ssse3_final, | ||
249 | .export = sha512_ssse3_export, | ||
250 | .import = sha512_ssse3_import, | ||
251 | .descsize = sizeof(struct sha512_state), | ||
252 | .statesize = sizeof(struct sha512_state), | ||
253 | .base = { | ||
254 | .cra_name = "sha384", | ||
255 | .cra_driver_name = "sha384-ssse3", | ||
256 | .cra_priority = 150, | ||
257 | .cra_flags = CRYPTO_ALG_TYPE_SHASH, | ||
258 | .cra_blocksize = SHA384_BLOCK_SIZE, | ||
259 | .cra_module = THIS_MODULE, | ||
260 | } | ||
261 | } }; | ||
215 | 262 | ||
216 | #ifdef CONFIG_AS_AVX | 263 | #ifdef CONFIG_AS_AVX |
217 | static bool __init avx_usable(void) | 264 | static bool __init avx_usable(void) |
@@ -234,7 +281,7 @@ static bool __init avx_usable(void) | |||
234 | 281 | ||
235 | static int __init sha512_ssse3_mod_init(void) | 282 | static int __init sha512_ssse3_mod_init(void) |
236 | { | 283 | { |
237 | /* test for SSE3 first */ | 284 | /* test for SSSE3 first */ |
238 | if (cpu_has_ssse3) | 285 | if (cpu_has_ssse3) |
239 | sha512_transform_asm = sha512_transform_ssse3; | 286 | sha512_transform_asm = sha512_transform_ssse3; |
240 | 287 | ||
@@ -261,7 +308,7 @@ static int __init sha512_ssse3_mod_init(void) | |||
261 | else | 308 | else |
262 | #endif | 309 | #endif |
263 | pr_info("Using SSSE3 optimized SHA-512 implementation\n"); | 310 | pr_info("Using SSSE3 optimized SHA-512 implementation\n"); |
264 | return crypto_register_shash(&alg); | 311 | return crypto_register_shashes(algs, ARRAY_SIZE(algs)); |
265 | } | 312 | } |
266 | pr_info("Neither AVX nor SSSE3 is available/usable.\n"); | 313 | pr_info("Neither AVX nor SSSE3 is available/usable.\n"); |
267 | 314 | ||
@@ -270,7 +317,7 @@ static int __init sha512_ssse3_mod_init(void) | |||
270 | 317 | ||
271 | static void __exit sha512_ssse3_mod_fini(void) | 318 | static void __exit sha512_ssse3_mod_fini(void) |
272 | { | 319 | { |
273 | crypto_unregister_shash(&alg); | 320 | crypto_unregister_shashes(algs, ARRAY_SIZE(algs)); |
274 | } | 321 | } |
275 | 322 | ||
276 | module_init(sha512_ssse3_mod_init); | 323 | module_init(sha512_ssse3_mod_init); |
@@ -280,3 +327,4 @@ MODULE_LICENSE("GPL"); | |||
280 | MODULE_DESCRIPTION("SHA512 Secure Hash Algorithm, Supplemental SSE3 accelerated"); | 327 | MODULE_DESCRIPTION("SHA512 Secure Hash Algorithm, Supplemental SSE3 accelerated"); |
281 | 328 | ||
282 | MODULE_ALIAS("sha512"); | 329 | MODULE_ALIAS("sha512"); |
330 | MODULE_ALIAS("sha384"); | ||