History

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

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 ...

Linus Torvalds committed 7 years ago

Commit 81ff5d22 parents 7aefd94 e59f755322 files · +5973 −4248Browse files

Showing the changes to include/uapi/linux (1 of 322 files). Show all

Unified · Split

include/uapi/linux/psp-sev.h+14−4
@@ -6,8 +6,7 @@ · 5 unmodified lines
66 *
77 * Author: Brijesh Singh <brijesh.singh@amd.com>
88 *
9− * SEV spec 0.14 is available at:
10− * http://support.amd.com/TechDocs/55766_SEV-KM%20API_Specification.pdf
9+ * SEV API specification is available at: https://developer.amd.com/sev/
1110 *
1211 * This program is free software; you can redistribute it and/or modify
1312 * it under the terms of the GNU General Public License version 2 as
@@ -30,7 +29,8 @@ enum { · 16 unmodified lines
3029 SEV_PDH_GEN,
3130 SEV_PDH_CERT_EXPORT,
3231 SEV_PEK_CERT_IMPORT,
33− SEV_GET_ID,
32+ SEV_GET_ID, /* This command is deprecated, use SEV_GET_ID2 */
33+ SEV_GET_ID2,
3434
3535 SEV_MAX,
3636 };
@@ -125,7 +125,7 @@ struct sev_user_data_pdh_cert_export { · 88 unmodified lines
125125 } __packed;
126126
127127 /**
128− * struct sev_user_data_get_id - GET_ID command parameters
128+ * struct sev_user_data_get_id - GET_ID command parameters (deprecated)
129129 *
130130 * @socket1: Buffer to pass unique ID of first socket
131131 * @socket2: Buffer to pass unique ID of second socket
@@ -135,6 +135,16 @@ struct sev_user_data_get_id { · 3 unmodified lines
135135 __u8 socket2[64]; /* Out */
136136 } __packed;
137137
138+/**
139+ * struct sev_user_data_get_id2 - GET_ID command parameters
140+ * @address: Buffer to store unique ID
141+ * @length: length of the unique ID
142+ */
143+struct sev_user_data_get_id2 {
144+ __u64 address; /* In */
145+ __u32 length; /* In/Out */
146+} __packed;
147+
138148 /**
139149 * struct sev_issue_cmd - SEV ioctl parameters
140150 *