-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linu…
…x-2.6 * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (37 commits) [S390] Avoid excessive inlining. [S390] Mark kernel text section read-only. [S390] Convert memory detection into C code. [S390] Calibrate delay and bogomips. [S390] Hypervisor filesystem (s390_hypfs) for z/VM [S390] Add crypto support for 3592 tape devices [S390] boot from NSS support [S390] Support for s390 Pseudo Random Number Generator [S390] ETR support. [S390] noexec protection [S390] move crypto options and some cleanup. [S390] cio: Don't spam debug feature. [S390] Cleanup of CHSC event handling. [S390] cio: declare hardware structures packed. [S390] Add set_fs(USER_DS) to start_thread(). [S390] cio: Catch operand exceptions on stsch. [S390] Fix register usage description. [S390] kretprobe_trampoline_holder() in wrong section. [S390] Fix kprobes breakpoint handling. [S390] Update maintainers file. ...
- Loading branch information
Showing
168 changed files
with
5,520 additions
and
2,171 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
config CRYPTO_SHA1_S390 | ||
tristate "SHA1 digest algorithm" | ||
depends on S390 | ||
select CRYPTO_ALGAPI | ||
help | ||
This is the s390 hardware accelerated implementation of the | ||
SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2). | ||
|
||
config CRYPTO_SHA256_S390 | ||
tristate "SHA256 digest algorithm" | ||
depends on S390 | ||
select CRYPTO_ALGAPI | ||
help | ||
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. | ||
|
||
config CRYPTO_DES_S390 | ||
tristate "DES and Triple DES cipher algorithms" | ||
depends on S390 | ||
select CRYPTO_ALGAPI | ||
select CRYPTO_BLKCIPHER | ||
help | ||
This us the s390 hardware accelerated implementation of the | ||
DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3). | ||
|
||
config CRYPTO_AES_S390 | ||
tristate "AES cipher algorithms" | ||
depends on S390 | ||
select CRYPTO_ALGAPI | ||
select CRYPTO_BLKCIPHER | ||
help | ||
This is the s390 hardware accelerated implementation of the | ||
AES cipher algorithms (FIPS-197). AES uses the Rijndael | ||
algorithm. | ||
|
||
Rijndael appears to be consistently a very good performer in | ||
both hardware and software across a wide range of computing | ||
environments regardless of its use in feedback or non-feedback | ||
modes. Its key setup time is excellent, and its key agility is | ||
good. Rijndael's very low memory requirements make it very well | ||
suited for restricted-space environments, in which it also | ||
demonstrates excellent performance. Rijndael's operations are | ||
among the easiest to defend against power and timing attacks. | ||
|
||
On s390 the System z9-109 currently only supports the key size | ||
of 128 bit. | ||
|
||
config S390_PRNG | ||
tristate "Pseudo random number generator device driver" | ||
depends on S390 | ||
default "m" | ||
help | ||
Select this option if you want to use the s390 pseudo random number | ||
generator. The PRNG is part of the cryptograhic 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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.