aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2008-11-07 19:56:57 -0500
committerHerbert Xu <herbert@gondor.apana.org.au>2008-12-24 19:02:06 -0500
commit3751f402e099893c34089ed303dca6f5f92dbfd1 (patch)
treeb052aa508f5c82478fb90a1525bfd854644406df
parentb812eb0076235743872b5c9d18714d2324cc668d (diff)
crypto: hash - Make setkey optional
Since most cryptographic hash algorithms have no keys, this patch makes the setkey function optional for ahash and shash. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--crypto/ahash.c8
-rw-r--r--crypto/shash.c3
2 files changed, 10 insertions, 1 deletions
diff --git a/crypto/ahash.c b/crypto/ahash.c
index 9f98956b17fc..ba5292d69ebd 100644
--- a/crypto/ahash.c
+++ b/crypto/ahash.c
@@ -162,6 +162,12 @@ static int ahash_setkey(struct crypto_ahash *tfm, const u8 *key,
162 return ahash->setkey(tfm, key, keylen); 162 return ahash->setkey(tfm, key, keylen);
163} 163}
164 164
165static int ahash_nosetkey(struct crypto_ahash *tfm, const u8 *key,
166 unsigned int keylen)
167{
168 return -ENOSYS;
169}
170
165int crypto_ahash_import(struct ahash_request *req, const u8 *in) 171int crypto_ahash_import(struct ahash_request *req, const u8 *in)
166{ 172{
167 struct crypto_ahash *tfm = crypto_ahash_reqtfm(req); 173 struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
@@ -194,7 +200,7 @@ static int crypto_init_ahash_ops(struct crypto_tfm *tfm, u32 type, u32 mask)
194 crt->update = alg->update; 200 crt->update = alg->update;
195 crt->final = alg->final; 201 crt->final = alg->final;
196 crt->digest = alg->digest; 202 crt->digest = alg->digest;
197 crt->setkey = ahash_setkey; 203 crt->setkey = alg->setkey ? ahash_setkey : ahash_nosetkey;
198 crt->digestsize = alg->digestsize; 204 crt->digestsize = alg->digestsize;
199 205
200 return 0; 206 return 0;
diff --git a/crypto/shash.c b/crypto/shash.c
index 50d69a4e4b61..c9df367332ff 100644
--- a/crypto/shash.c
+++ b/crypto/shash.c
@@ -55,6 +55,9 @@ int crypto_shash_setkey(struct crypto_shash *tfm, const u8 *key,
55 struct shash_alg *shash = crypto_shash_alg(tfm); 55 struct shash_alg *shash = crypto_shash_alg(tfm);
56 unsigned long alignmask = crypto_shash_alignmask(tfm); 56 unsigned long alignmask = crypto_shash_alignmask(tfm);
57 57
58 if (!shash->setkey)
59 return -ENOSYS;
60
58 if ((unsigned long)key & alignmask) 61 if ((unsigned long)key & alignmask)
59 return shash_setkey_unaligned(tfm, key, keylen); 62 return shash_setkey_unaligned(tfm, key, keylen);
60 63