summaryrefslogtreecommitdiffstats
path: root/crypto
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'akpm-current/current'Stephen Rothwell2016-09-051-8/+8
|\
| * kthread: kthread worker API cleanupPetr Mladek2016-09-031-8/+8
* | Merge remote-tracking branch 'keys/keys-next'Stephen Rothwell2016-09-0514-45/+609
|\ \
| * \ Merge branch 'keys-asym-keyctl' into keys-nextDavid Howells2016-09-0110-37/+568
| |\ \
| | * | KEYS: Implement PKCS#8 RSA Private Key parserDavid Howells2016-09-014-0/+231
| | * | KEYS: Implement encrypt, decrypt and sign for software asymmetric keyDavid Howells2016-09-011-3/+86
| | * | KEYS: Allow the public_key struct to hold a private keyDavid Howells2016-09-011-2/+12
| | * | KEYS: Provide software public key query functionDavid Howells2016-09-011-14/+82
| | * | KEYS: Make the X.509 and PKCS7 parsers supply the sig encoding typeDavid Howells2016-09-012-12/+10
| | * | KEYS: Provide missing asymmetric key subops for new key type opsDavid Howells2016-09-013-8/+149
| * | | PKCS#7: Handle blacklisted certificatesDavid Howells2016-09-012-8/+25
| * | | X.509: Allow X.509 certs to be blacklistedDavid Howells2016-09-012-0/+16
| |/ /
* | | Merge remote-tracking branch 'crypto/master'Stephen Rothwell2016-09-056-45/+56
|\ \ \
| * | | crypto: FIPS - allow tests to be disabled in FIPS modeStephan Mueller2016-08-312-0/+13
| * | | crypto: xor - Fix warning when XOR_SELECT_TEMPLATE is unsetHerbert Xu2016-08-311-4/+5
| * | | crypto: rsa - allow keys >= 2048 bits in FIPS modeStephan Mueller2016-08-241-2/+2
| * | | crypto: drbg - fix error return codeWei Yongjun2016-08-241-5/+11
| * | | crypto: xor - skip speed test if the xor function is selected automaticallyMartin Schwidefsky2016-08-241-21/+19
| * | | crypto: drbg - do not call drbg_instantiate in healt testStephan Mueller2016-08-161-11/+4
| * | | crypto: xts - fix a little typoCorentin LABBE2016-08-161-1/+1
| * | | crypto: testmgr - fix !x==y confusionYanjiang Jin2016-08-091-5/+5
| | |/ | |/|
* / | crypto: cryptd - Use correct tfm object for AEAD trackingHerbert Xu2016-08-311-1/+2
|/ /
* | crypto: powerpc - CRYPT_CRC32C_VPMSUM should depend on ALTIVECMichael Ellerman2016-08-091-1/+1
* | crypto: sha3 - Add missing ULL suffixes for 64-bit constantsGeert Uytterhoeven2016-08-081-8/+8
|/
* Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2016-07-271-61/+0
|\
| * random: replace non-blocking pool with a Chacha20-based CRNGTheodore Ts'o2016-07-031-61/+0
* | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert...Linus Torvalds2016-07-2643-2521/+5343
|\ \
| * \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Herbert Xu2016-07-211-0/+1
| |\ \
| * | | crypto: testmgr - Print akcipher algorithm nameHerbert Xu2016-07-191-2/+4
| * | | crypto: rsa-pkcs1pad - fix rsa-pkcs1pad request structTadeusz Struk2016-07-191-2/+1
| * | | crypto: scatterwalk - Inline start/map/doneHerbert Xu2016-07-181-43/+0
| * | | crypto: scatterwalk - Remove unnecessary BUG in scatterwalk_startHerbert Xu2016-07-181-3/+0
| * | | crypto: scatterwalk - Remove unnecessary advance in scatterwalk_pagedoneHerbert Xu2016-07-181-6/+2
| * | | crypto: scatterwalk - Fix test in scatterwalk_doneHerbert Xu2016-07-181-1/+2
| * | | crypto: scatterwalk - Add no-copy support to copychunksHerbert Xu2016-07-181-4/+6
| * | | crypto: scatterwalk - Remove scatterwalk_bytes_sglenHerbert Xu2016-07-181-22/+0
| * | | crypto: skcipher - Remove top-level givcipher interfaceHerbert Xu2016-07-187-1128/+6
| * | | crypto: user - Remove crypto_lookup_skcipher callHerbert Xu2016-07-181-36/+1
| * | | crypto: cts - Convert to skcipherHerbert Xu2016-07-181-210/+285
| * | | crypto: null - Remove default null blkcipherHerbert Xu2016-07-181-43/+6
| * | | crypto: aead - Remove blkcipher null for IV generatorsHerbert Xu2016-07-181-8/+0
| * | | crypto: seqiv - Use skcipherHerbert Xu2016-07-181-5/+9
| * | | crypto: echainiv - Use skcipherHerbert Xu2016-07-181-6/+10
| * | | crypto: aead - Add skcipher null for IV generatorsHerbert Xu2016-07-181-1/+9
| * | | crypto: chacha20poly1305 - Use skcipherHerbert Xu2016-07-181-43/+46
| * | | crypto: gcm - Use skcipherHerbert Xu2016-07-181-53/+58
| * | | crypto: ccm - Use skcipherHerbert Xu2016-07-181-35/+37
| * | | crypto: ctr - Use skcipher in rfc3686Herbert Xu2016-07-181-89/+94
| * | | crypto: authencesn - Use skcipherHerbert Xu2016-07-181-50/+54
| * | | crypto: authenc - Use skcipherHerbert Xu2016-07-181-51/+56