Commit cf8834e7 authored by wangshouping's avatar wangshouping Committed by Zheng Zengkai
Browse files

kabi:crypto: reserve space for RSASSA-PSS style certificates 

euleros inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I4T4W4?from=project-issue


CVE: NA

--------

Reserve some fields beforehand for parsing RSASSA-PSS style certificates

---------

Signed-off-by: default avatarwangshouping <wangshouping@huawei.com>
Reviewed-by: default avatarXiu Jianfeng <xiujianfeng@huawei.com>
Reviewed-by: default avatarWang Weiyang <wangweiyang2@huawei.com>
Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent f532b284

include/crypto/akcipher.h

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#ifndef _CRYPTO_AKCIPHER_H

#define _CRYPTO_AKCIPHER_H

#include <linux/crypto.h>

#include <linux/kabi.h>



/**

 * 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;

include/crypto/public_key.h

+9 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/keyctl.h>

#include <linux/oid_registry.h>

#include <crypto/akcipher.h>

#include <linux/kabi.h>



/*

 * 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);

include/linux/keyctl.h

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#define __LINUX_KEYCTL_H



#include <uapi/linux/keyctl.h>

#include <linux/kabi.h>



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 */

include/linux/oid_registry.h

+2 −0
Original line number Diff line number Diff line
@@ -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

};