diff --git a/include/crypto/akcipher.h b/include/crypto/akcipher.h index 5764b46bd1ec18165b70e7b88003145e34da0dac..4ecbdd745a5feb2f7cef297de8b79cd2aa47cd7f 100644 --- a/include/crypto/akcipher.h +++ b/include/crypto/akcipher.h @@ -8,6 +8,7 @@ #ifndef _CRYPTO_AKCIPHER_H #define _CRYPTO_AKCIPHER_H #include +#include /** * struct akcipher_request - public key request @@ -101,6 +102,7 @@ struct akcipher_alg { unsigned int (*max_size)(struct crypto_akcipher *tfm); int (*init)(struct crypto_akcipher *tfm); void (*exit)(struct crypto_akcipher *tfm); + KABI_RESERVE(1) unsigned int reqsize; struct crypto_alg base; diff --git a/include/crypto/public_key.h b/include/crypto/public_key.h index f5bd80858fc5194fba37546ec9b1407738b273de..041e2c023a8e50979c1ac02b947004f0ba15e54d 100644 --- a/include/crypto/public_key.h +++ b/include/crypto/public_key.h @@ -13,6 +13,7 @@ #include #include #include +#include /* * Cryptographic data for the public-key subtype of the asymmetric key type. @@ -29,6 +30,11 @@ struct public_key { bool key_is_private; const char *id_type; const char *pkey_algo; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) + KABI_RESERVE(4) + KABI_RESERVE(5) }; extern void public_key_free(struct public_key *key); @@ -47,6 +53,9 @@ struct public_key_signature { const char *encoding; const void *data; unsigned int data_size; + KABI_RESERVE(1) + KABI_RESERVE(2) + KABI_RESERVE(3) }; extern void public_key_signature_free(struct public_key_signature *sig); diff --git a/include/linux/keyctl.h b/include/linux/keyctl.h index 5b79847207ef210e24a2b427d099f0727ee9d9f8..1228af4053a897ff480e91c78932a2fd41259a72 100644 --- a/include/linux/keyctl.h +++ b/include/linux/keyctl.h @@ -9,6 +9,7 @@ #define __LINUX_KEYCTL_H #include +#include struct kernel_pkey_query { __u32 supported_ops; /* Which ops are supported */ @@ -37,6 +38,8 @@ struct kernel_pkey_params { __u32 in2_len; /* 2nd input data size (verify) */ }; enum kernel_pkey_operation op : 8; + KABI_RESERVE(1) + KABI_RESERVE(2) }; #endif /* __LINUX_KEYCTL_H */ diff --git a/include/linux/oid_registry.h b/include/linux/oid_registry.h index f32d91895e4d19d550ad4dd9f1a44186e8f04f06..72882f35bd88c77a69ad128345ff775c425d097c 100644 --- a/include/linux/oid_registry.h +++ b/include/linux/oid_registry.h @@ -116,6 +116,8 @@ enum OID { OID_sm3, /* 1.2.156.10197.1.401 */ OID_SM2_with_SM3, /* 1.2.156.10197.1.501 */ OID_sm3WithRSAEncryption, /* 1.2.156.10197.1.504 */ + OID_mgf1, /* 1.2.840.113549.1.1.8 */ + OID_rsassaPSS, /* 1.2.840.113549.1.1.10 */ OID__NR };