Pull crypto update from Herbert Xu: "API: - Add support for AEAD in simd - Add fuzz testing to testmgr - Add panic_on_fail module parameter to testmgr - Use per-CPU struct instead multiple variables in scompress - Change verify API for akcipher Algorithms: - Convert x86 AEAD algorithms over to simd - Forbid 2-key 3DES in FIPS mode - Add EC-RDSA (GOST 34.10) algorithm Drivers: - Set output IV with ctr-aes in crypto4xx - Set output IV in rockchip - Fix potential length overflow with hashing in sun4i-ss - Fix computation error with ctr in vmx - Add SM4 protected keys support in ccree - Remove long-broken mxc-scc driver - Add rfc4106(gcm(aes)) cipher support in cavium/nitrox" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (179 commits) crypto: ccree - use a proper le32 type for le32 val crypto: ccree - remove set but not used variable 'du_size' crypto: ccree - Make cc_sec_disable static crypto: ccree - fix spelling mistake "protedcted" -> "protected" crypto: caam/qi2 - generate hash keys in-place crypto: caam/qi2 - fix DMA mapping of stack memory crypto: caam/qi2 - fix zero-length buffer DMA mapping crypto: stm32/cryp - update to return iv_out crypto: stm32/cryp - remove request mutex protection crypto: stm32/cryp - add weak key check for DES crypto: atmel - remove set but not used variable 'alg_name' crypto: picoxcell - Use dev_get_drvdata() crypto: crypto4xx - get rid of redundant using_sd variable crypto: crypto4xx - use sync skcipher for fallback crypto: crypto4xx - fix cfb and ofb "overran dst buffer" issues crypto: crypto4xx - fix ctr-aes missing output IV crypto: ecrdsa - select ASN1 and OID_REGISTRY for EC-RDSA crypto: ux500 - use ccflags-y instead of CFLAGS_<basename>.o crypto: ccree - handle tee fips error during power management resume crypto: ccree - add function to handle cryptocell tee fips error ...
Showing the changes to include/linux (3 of 322 files). Show all
Unified · Split
| @@ -1606,7 +1606,6 @@ static inline u32 jbd2_chksum(journal_t *journal, u32 crc, · 1605 unmodified lines | ||
| 1606 | 1606 | JBD_MAX_CHECKSUM_SIZE); |
| 1607 | 1607 | |
| 1608 | 1608 | desc.shash.tfm = journal->j_chksum_driver; |
| 1609 | − desc.shash.flags = 0; | |
| 1610 | 1609 | *(u32 *)desc.ctx = crc; |
| 1611 | 1610 | |
| 1612 | 1611 | err = crypto_shash_update(&desc.shash, address, length); |
| @@ -93,6 +93,24 @@ enum OID { · 92 unmodified lines | ||
| 93 | 93 | OID_authorityKeyIdentifier, /* 2.5.29.35 */ |
| 94 | 94 | OID_extKeyUsage, /* 2.5.29.37 */ |
| 95 | 95 | |
| 96 | + /* EC-RDSA */ | |
| 97 | + OID_gostCPSignA, /* 1.2.643.2.2.35.1 */ | |
| 98 | + OID_gostCPSignB, /* 1.2.643.2.2.35.2 */ | |
| 99 | + OID_gostCPSignC, /* 1.2.643.2.2.35.3 */ | |
| 100 | + OID_gost2012PKey256, /* 1.2.643.7.1.1.1.1 */ | |
| 101 | + OID_gost2012PKey512, /* 1.2.643.7.1.1.1.2 */ | |
| 102 | + OID_gost2012Digest256, /* 1.2.643.7.1.1.2.2 */ | |
| 103 | + OID_gost2012Digest512, /* 1.2.643.7.1.1.2.3 */ | |
| 104 | + OID_gost2012Signature256, /* 1.2.643.7.1.1.3.2 */ | |
| 105 | + OID_gost2012Signature512, /* 1.2.643.7.1.1.3.3 */ | |
| 106 | + OID_gostTC26Sign256A, /* 1.2.643.7.1.2.1.1.1 */ | |
| 107 | + OID_gostTC26Sign256B, /* 1.2.643.7.1.2.1.1.2 */ | |
| 108 | + OID_gostTC26Sign256C, /* 1.2.643.7.1.2.1.1.3 */ | |
| 109 | + OID_gostTC26Sign256D, /* 1.2.643.7.1.2.1.1.4 */ | |
| 110 | + OID_gostTC26Sign512A, /* 1.2.643.7.1.2.1.2.1 */ | |
| 111 | + OID_gostTC26Sign512B, /* 1.2.643.7.1.2.1.2.2 */ | |
| 112 | + OID_gostTC26Sign512C, /* 1.2.643.7.1.2.1.2.3 */ | |
| 113 | + | |
| 96 | 114 | OID__NR |
| 97 | 115 | }; |
| 98 | 116 | |
| @@ -5,8 +5,7 @@ · 4 unmodified lines | ||
| 5 | 5 | * |
| 6 | 6 | * Author: Brijesh Singh <brijesh.singh@amd.com> |
| 7 | 7 | * |
| 8 | − * SEV spec 0.14 is available at: | |
| 9 | − * http://support.amd.com/TechDocs/55766_SEV-KM API_Specification.pdf | |
| 8 | + * SEV API spec is available at https://developer.amd.com/sev | |
| 10 | 9 | * |
| 11 | 10 | * This program is free software; you can redistribute it and/or modify |
| 12 | 11 | * it under the terms of the GNU General Public License version 2 as |