Commit 6471c9f4 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add checking to padding ctrl.

parent 4a3dc3c0

crypto/rsa/rsa.h

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ struct rsa_st 
                                                */



#define EVP_PKEY_CTX_set_rsa_padding(ctx, pad) \

	EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_CTRL_RSA_PADDING, \

	EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, -1, EVP_PKEY_CTRL_RSA_PADDING, \

				pad, NULL)



#define EVP_PKEY_CTRL_RSA_PADDING	1

crypto/rsa/rsa_pmeth.c

+4 −2
Original line number Diff line number Diff line
@@ -161,10 +161,12 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) 
		/* TODO: add PSS support */

		if ((p1 >= RSA_PKCS1_PADDING) && (p1 <= RSA_X931_PADDING))

			{

			if (ctx->operation == EVP_PKEY_OP_KEYGEN)

				return -2;

			rctx->pad_mode = p1;

			return 1;

			}

		return 0;

		return -2;



		default:

		return -2;
@@ -192,7 +194,7 @@ static int pkey_rsa_ctrl_str(EVP_PKEY_CTX *ctx, 
			pm = RSA_X931_PADDING;

		else

			return -2;

		return pkey_rsa_ctrl(ctx, EVP_PKEY_CTRL_RSA_PADDING, pm, NULL);

		return EVP_PKEY_CTX_set_rsa_padding(ctx, pm);

		}

	return -2;

	}