Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 247785
b: refs/heads/master
c: d393d9b
h: refs/heads/master
i:
  247783: 60ece73
v: v3
  • Loading branch information
Jan Glauber authored and Herbert Xu committed May 4, 2011
1 parent c23725b commit cc4e150
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: df1309ce955a490eac6697a41159b43e24d35995
refs/heads/master: d393d9b8ca7f3296b50cb6fd0dc550ed6f72cdbc
16 changes: 8 additions & 8 deletions trunk/drivers/crypto/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ config CRYPTO_SHA1_S390
This is the s390 hardware accelerated implementation of the
SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).

It is available as of z990.

config CRYPTO_SHA256_S390
tristate "SHA256 digest algorithm"
depends on S390
Expand All @@ -99,8 +101,7 @@ config CRYPTO_SHA256_S390
This is the s390 hardware accelerated implementation of the
SHA256 secure hash standard (DFIPS 180-2).

This version of SHA implements a 256 bit hash with 128 bits of
security against collision attacks.
It is available as of z9.

config CRYPTO_SHA512_S390
tristate "SHA384 and SHA512 digest algorithm"
Expand All @@ -110,10 +111,7 @@ config CRYPTO_SHA512_S390
This is the s390 hardware accelerated implementation of the
SHA512 secure hash standard.

This version of SHA implements a 512 bit hash with 256 bits of
security against collision attacks. The code also includes SHA-384,
a 384 bit hash with 192 bits of security against collision attacks.

It is available as of z10.

config CRYPTO_DES_S390
tristate "DES and Triple DES cipher algorithms"
Expand Down Expand Up @@ -148,8 +146,10 @@ config S390_PRNG
Select this option if you want to use the s390 pseudo random number
generator. The PRNG is part of the cryptographic processor functions
and uses triple-DES to generate secure random numbers like the
ANSI X9.17 standard. The PRNG is usable via the char device
/dev/prandom.
ANSI X9.17 standard. User-space programs access the
pseudo-random-number device through the char device /dev/prandom.

It is available as of z9.

config CRYPTO_GHASH_S390
tristate "GHASH digest algorithm"
Expand Down

0 comments on commit cc4e150

Please sign in to comment.