diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-30 19:36:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-30 19:36:55 +0200 |
| commit | bc49e2f53089b10b60b453dfb2ecb9ee39623106 (patch) | |
| tree | 5fb67bd7eac95e24565b9a5a1bb748b8befbad64 /crypto/api.c | |
| parent | 4da3cf2ff4a51349887201dd1efa1dfbc3a99703 (diff) | |
| parent | 51f76a28b2cb2a720aaaf1e7c1139bf807595395 (diff) | |
| download | linux-crypto-bc49e2f53089b10b60b453dfb2ecb9ee39623106.tar.gz linux-crypto-bc49e2f53089b10b60b453dfb2ecb9ee39623106.zip | |
Merge branch 'x86/core' into x86/xsave
Diffstat (limited to 'crypto/api.c')
| -rw-r--r-- | crypto/api.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/crypto/api.c b/crypto/api.c index 0a0f41ef..d06e3327 100644 --- a/crypto/api.c +++ b/crypto/api.c @@ -235,8 +235,12 @@ static int crypto_init_ops(struct crypto_tfm *tfm, u32 type, u32 mask) return crypto_init_cipher_ops(tfm); case CRYPTO_ALG_TYPE_DIGEST: - return crypto_init_digest_ops(tfm); - + if ((mask & CRYPTO_ALG_TYPE_HASH_MASK) != + CRYPTO_ALG_TYPE_HASH_MASK) + return crypto_init_digest_ops_async(tfm); + else + return crypto_init_digest_ops(tfm); + case CRYPTO_ALG_TYPE_COMPRESS: return crypto_init_compress_ops(tfm); |