Commit 1c8d9299 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

ctrl operations to retrieve RSA algorithm settings

parent bf8883b3

crypto/rsa/rsa.h

+20 −1
Original line number Diff line number Diff line
@@ -222,12 +222,22 @@ struct rsa_st 
	EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, -1, EVP_PKEY_CTRL_RSA_PADDING, \

				pad, NULL)



#define EVP_PKEY_CTX_get_rsa_padding(ctx, ppad) \

	EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, -1, \

				EVP_PKEY_CTRL_GET_RSA_PADDING, 0, ppad)



#define EVP_PKEY_CTX_set_rsa_pss_saltlen(ctx, len) \

	EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, \

				(EVP_PKEY_OP_SIGN|EVP_PKEY_OP_VERIFY), \

				EVP_PKEY_CTRL_RSA_PSS_SALTLEN, \

				len, NULL)



#define EVP_PKEY_CTX_get_rsa_pss_saltlen(ctx, plen) \

	EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, \

				(EVP_PKEY_OP_SIGN|EVP_PKEY_OP_VERIFY), \

				EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN, \

				0, plen)



#define EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, bits) \

	EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_KEYGEN, \

				EVP_PKEY_CTRL_RSA_KEYGEN_BITS, bits, NULL)
@@ -237,9 +247,13 @@ struct rsa_st 
				EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP, 0, pubexp)



#define	 EVP_PKEY_CTX_set_rsa_mgf1_md(ctx, md)	\

		EVP_PKEY_CTX_ctrl(ctx, -1, EVP_PKEY_OP_TYPE_SIG,  \

		EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_SIG,  \

				EVP_PKEY_CTRL_RSA_MGF1_MD, 0, (void *)md)



#define	 EVP_PKEY_CTX_get_rsa_mgf1_md(ctx, pmd)	\

		EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_TYPE_SIG,  \

				EVP_PKEY_CTRL_GET_RSA_MGF1_MD, 0, (void *)pmd)



#define EVP_PKEY_CTRL_RSA_PADDING	(EVP_PKEY_ALG_CTRL + 1)

#define EVP_PKEY_CTRL_RSA_PSS_SALTLEN	(EVP_PKEY_ALG_CTRL + 2)
@@ -247,6 +261,10 @@ struct rsa_st 
#define EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP	(EVP_PKEY_ALG_CTRL + 4)

#define EVP_PKEY_CTRL_RSA_MGF1_MD	(EVP_PKEY_ALG_CTRL + 5)



#define EVP_PKEY_CTRL_GET_RSA_PADDING		(EVP_PKEY_ALG_CTRL + 6)

#define EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN	(EVP_PKEY_ALG_CTRL + 7)

#define EVP_PKEY_CTRL_GET_RSA_MGF1_MD		(EVP_PKEY_ALG_CTRL + 8)



#define RSA_PKCS1_PADDING	1

#define RSA_SSLV23_PADDING	2

#define RSA_NO_PADDING		3
@@ -486,6 +504,7 @@ void ERR_load_RSA_strings(void); 
#define RSA_R_INVALID_HEADER				 137

#define RSA_R_INVALID_KEYBITS				 145

#define RSA_R_INVALID_MESSAGE_LENGTH			 131

#define RSA_R_INVALID_MGF1_MD				 156

#define RSA_R_INVALID_PADDING				 138

#define RSA_R_INVALID_PADDING_MODE			 141

#define RSA_R_INVALID_PSS_PARAMETERS			 149

crypto/rsa/rsa_err.c

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ static ERR_STRING_DATA RSA_str_reasons[]= 
{ERR_REASON(RSA_R_INVALID_HEADER)        ,"invalid header"},

{ERR_REASON(RSA_R_INVALID_KEYBITS)       ,"invalid keybits"},

{ERR_REASON(RSA_R_INVALID_MESSAGE_LENGTH),"invalid message length"},

{ERR_REASON(RSA_R_INVALID_MGF1_MD)       ,"invalid mgf1 md"},

{ERR_REASON(RSA_R_INVALID_PADDING)       ,"invalid padding"},

{ERR_REASON(RSA_R_INVALID_PADDING_MODE)  ,"invalid padding mode"},

{ERR_REASON(RSA_R_INVALID_PSS_PARAMETERS),"invalid pss parameters"},

crypto/rsa/rsa_pmeth.c

+28 −4
Original line number Diff line number Diff line
@@ -407,15 +407,25 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) 
				RSA_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE);

		return -2;



		case EVP_PKEY_CTRL_GET_RSA_PADDING:

		*(int *)p2 = rctx->pad_mode;

		return 1;



		case EVP_PKEY_CTRL_RSA_PSS_SALTLEN:

		if (p1 < -2)

			return -2;

		case EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN:

		if (rctx->pad_mode != RSA_PKCS1_PSS_PADDING)

			{

			RSAerr(RSA_F_PKEY_RSA_CTRL, RSA_R_INVALID_PSS_SALTLEN);

			return -2;

			}

		if (type == EVP_PKEY_CTRL_GET_RSA_PSS_SALTLEN)

			*(int *)p2 = rctx->saltlen;

		else

			{

			if (p1 < -2)

				return -2;

			rctx->saltlen = p1;

			}

		return 1;



		case EVP_PKEY_CTRL_RSA_KEYGEN_BITS:
@@ -440,6 +450,20 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) 
		return 1;



		case EVP_PKEY_CTRL_RSA_MGF1_MD:

		case EVP_PKEY_CTRL_GET_RSA_MGF1_MD:

		if (rctx->pad_mode != RSA_PKCS1_PSS_PADDING)

			{

			RSAerr(RSA_F_PKEY_RSA_CTRL, RSA_R_INVALID_MGF1_MD);

			return -2;

			}

		if (type == EVP_PKEY_CTRL_GET_RSA_MGF1_MD)

			{

			if (rctx->mgf1md)

				*(const EVP_MD **)p2 = rctx->mgf1md;

			else

				*(const EVP_MD **)p2 = rctx->md;

			}

		else

			rctx->mgf1md = p2;

		return 1;