Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

crypto: s390 - support hardware accelerated SHA-224

On recent s390 machines hardware acceleration is available for SHA-256.
SHA-224 is based on SHA-256 so it can also be accelerated by hardware.
Do this by adding the proper algorithm description and initialization.

Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Jan Glauber and committed by
Herbert Xu
e3b4f515 269230e7

+55 -11
+55 -11
arch/s390/crypto/sha256_s390.c
··· 1 1 /* 2 2 * Cryptographic API. 3 3 * 4 - * s390 implementation of the SHA256 Secure Hash Algorithm. 4 + * s390 implementation of the SHA256 and SHA224 Secure Hash Algorithm. 5 5 * 6 6 * s390 Version: 7 - * Copyright IBM Corp. 2005,2007 7 + * Copyright IBM Corp. 2005,2011 8 8 * Author(s): Jan Glauber (jang@de.ibm.com) 9 - * 10 - * Derived from "crypto/sha256_generic.c" 11 - * and "arch/s390/crypto/sha1_s390.c" 12 9 * 13 10 * This program is free software; you can redistribute it and/or modify it 14 11 * under the terms of the GNU General Public License as published by the Free ··· 62 65 return 0; 63 66 } 64 67 65 - static struct shash_alg alg = { 68 + static struct shash_alg sha256_alg = { 66 69 .digestsize = SHA256_DIGEST_SIZE, 67 70 .init = sha256_init, 68 71 .update = s390_sha_update, ··· 81 84 } 82 85 }; 83 86 84 - static int sha256_s390_init(void) 87 + static int sha224_init(struct shash_desc *desc) 85 88 { 89 + struct s390_sha_ctx *sctx = shash_desc_ctx(desc); 90 + 91 + sctx->state[0] = SHA224_H0; 92 + sctx->state[1] = SHA224_H1; 93 + sctx->state[2] = SHA224_H2; 94 + sctx->state[3] = SHA224_H3; 95 + sctx->state[4] = SHA224_H4; 96 + sctx->state[5] = SHA224_H5; 97 + sctx->state[6] = SHA224_H6; 98 + sctx->state[7] = SHA224_H7; 99 + sctx->count = 0; 100 + sctx->func = KIMD_SHA_256; 101 + 102 + return 0; 103 + } 104 + 105 + static struct shash_alg sha224_alg = { 106 + .digestsize = SHA224_DIGEST_SIZE, 107 + .init = sha224_init, 108 + .update = s390_sha_update, 109 + .final = s390_sha_final, 110 + .export = sha256_export, 111 + .import = sha256_import, 112 + .descsize = sizeof(struct s390_sha_ctx), 113 + .statesize = sizeof(struct sha256_state), 114 + .base = { 115 + .cra_name = "sha224", 116 + .cra_driver_name= "sha224-s390", 117 + .cra_priority = CRYPT_S390_PRIORITY, 118 + .cra_flags = CRYPTO_ALG_TYPE_SHASH, 119 + .cra_blocksize = SHA224_BLOCK_SIZE, 120 + .cra_module = THIS_MODULE, 121 + } 122 + }; 123 + 124 + static int __init sha256_s390_init(void) 125 + { 126 + int ret; 127 + 86 128 if (!crypt_s390_func_available(KIMD_SHA_256, CRYPT_S390_MSA)) 87 129 return -EOPNOTSUPP; 88 - 89 - return crypto_register_shash(&alg); 130 + ret = crypto_register_shash(&sha256_alg); 131 + if (ret < 0) 132 + goto out; 133 + ret = crypto_register_shash(&sha224_alg); 134 + if (ret < 0) 135 + crypto_unregister_shash(&sha256_alg); 136 + out: 137 + return ret; 90 138 } 91 139 92 140 static void __exit sha256_s390_fini(void) 93 141 { 94 - crypto_unregister_shash(&alg); 142 + crypto_unregister_shash(&sha224_alg); 143 + crypto_unregister_shash(&sha256_alg); 95 144 } 96 145 97 146 module_init(sha256_s390_init); 98 147 module_exit(sha256_s390_fini); 99 148 100 149 MODULE_ALIAS("sha256"); 150 + MODULE_ALIAS("sha224"); 101 151 MODULE_LICENSE("GPL"); 102 - MODULE_DESCRIPTION("SHA256 Secure Hash Algorithm"); 152 + MODULE_DESCRIPTION("SHA256 and SHA224 Secure Hash Algorithm");