diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 15:55:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 15:55:13 -0800 |
| commit | a6b28d305b003ea9c7fb4de78e89f6a5a3a7e5e4 (patch) | |
| tree | e6af57a7c0566625d20683329eb1efbdc1e15beb /crypto/proc.c | |
| parent | 2908966ac93719a4f0b9c89eba8e55d1c8b9d2c9 (diff) | |
| parent | bfb9230bfc1effc16af5563c357ca6a5f22e1bfe (diff) | |
| download | linux-crypto-a6b28d305b003ea9c7fb4de78e89f6a5a3a7e5e4.tar.gz linux-crypto-a6b28d305b003ea9c7fb4de78e89f6a5a3a7e5e4.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
hwrng: core - Prevent too-small buffer sizes
hwrng: virtio-rng - Convert to new API
hwrng: core - Replace u32 in driver API with byte array
crypto: ansi_cprng - Move FIPS functions under CONFIG_CRYPTO_FIPS
crypto: testmgr - Add ghash algorithm test before provide to users
crypto: ghash-clmulni-intel - Put proper .data section in place
crypto: ghash-clmulni-intel - Use gas macro for PCLMULQDQ-NI and PSHUFB
crypto: aesni-intel - Use gas macro for AES-NI instructions
x86: Generate .byte code for some new instructions via gas macro
crypto: ghash-intel - Fix irq_fpu_usable usage
crypto: ghash-intel - Add PSHUFB macros
crypto: ghash-intel - Hard-code pshufb
crypto: ghash-intel - Fix building failure on x86_32
crypto: testmgr - Fix warning
crypto: ansi_cprng - Fix test in get_prng_bytes
crypto: hash - Remove cra_u.{digest,hash}
crypto: api - Remove digest case from procfs show handler
crypto: hash - Remove legacy hash/digest code
crypto: ansi_cprng - Add FIPS wrapper
crypto: ghash - Add PCLMULQDQ accelerated implementation
Diffstat (limited to 'crypto/proc.c')
| -rw-r--r-- | crypto/proc.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/crypto/proc.c b/crypto/proc.c index 1c38733c..58fef67d 100644 --- a/crypto/proc.c +++ b/crypto/proc.c @@ -109,13 +109,6 @@ static int c_show(struct seq_file *m, void *p) seq_printf(m, "max keysize : %u\n", alg->cra_cipher.cia_max_keysize); break; - - case CRYPTO_ALG_TYPE_DIGEST: - seq_printf(m, "type : digest\n"); - seq_printf(m, "blocksize : %u\n", alg->cra_blocksize); - seq_printf(m, "digestsize : %u\n", - alg->cra_digest.dia_digestsize); - break; case CRYPTO_ALG_TYPE_COMPRESS: seq_printf(m, "type : compression\n"); break; |