Commit 54d853eb authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add support for setting keybits and public exponent value for pkey RSA keygen.

parent f5cda4cb

crypto/bn/bn.h

+1 −0
Original line number Diff line number Diff line
@@ -447,6 +447,7 @@ char * BN_bn2hex(const BIGNUM *a); 
char *	BN_bn2dec(const BIGNUM *a);

int 	BN_hex2bn(BIGNUM **a, const char *str);

int 	BN_dec2bn(BIGNUM **a, const char *str);

int	BN_asc2bn(BIGNUM **a, const char *str);

int	BN_gcd(BIGNUM *r,const BIGNUM *a,const BIGNUM *b,BN_CTX *ctx);

int	BN_kronecker(const BIGNUM *a,const BIGNUM *b,BN_CTX *ctx); /* returns -2 for error */

BIGNUM *BN_mod_inverse(BIGNUM *ret,

crypto/bn/bn_print.c

+21 −0
Original line number Diff line number Diff line
@@ -294,6 +294,27 @@ err: 
	return(0);

	}



int BN_asc2bn(BIGNUM **bn, const char *a)

	{

	const char *p = a;

	if (*p == '-')

		p++;



	if (p[0] == '0' && (p[1] == 'X' || p[1] == 'x'))

		{		

		if (!BN_hex2bn(bn, p + 2))

			return 0;

		}

	else

		{

		if (!BN_dec2bn(bn, p))

			return 0;

		}

	if (*a == '-')

		(*bn)->neg = 1;

	return 1;

	}



#ifndef OPENSSL_NO_BIO

#ifndef OPENSSL_NO_FP_API

int BN_print_fp(FILE *fp, const BIGNUM *a)

crypto/rsa/rsa.h

+11 −0
Original line number Diff line number Diff line
@@ -203,9 +203,20 @@ struct rsa_st 
				EVP_PKEY_CTRL_RSA_PSS_SALTLEN, \

				len, NULL)



#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)



#define EVP_PKEY_CTX_set_rsa_keygen_pubexp(ctx, pubexp) \

	EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_OP_KEYGEN, \

				EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP, 0, pubexp)



#define EVP_PKEY_CTRL_RSA_PADDING	(EVP_PKEY_ALG_CTRL + 1)

#define EVP_PKEY_CTRL_RSA_PSS_SALTLEN	(EVP_PKEY_ALG_CTRL + 2)



#define EVP_PKEY_CTRL_RSA_KEYGEN_BITS	(EVP_PKEY_ALG_CTRL + 3)

#define EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP	(EVP_PKEY_ALG_CTRL + 4)



#define RSA_PKCS1_PADDING	1

#define RSA_SSLV23_PADDING	2

#define RSA_NO_PADDING		3

crypto/rsa/rsa_pmeth.c

+33 −0
Original line number Diff line number Diff line
@@ -386,6 +386,18 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) 
		rctx->saltlen = p1;

		return 1;



		case EVP_PKEY_CTRL_RSA_KEYGEN_BITS:

		if (p1 < 256)

			return -2;

		rctx->nbits = p1;

		return 1;



		case EVP_PKEY_CTRL_RSA_KEYGEN_PUBEXP:

		if (!p2)

			return -2;

		rctx->pub_exp = p2;

		return 1;



		case EVP_PKEY_CTRL_MD:

		if (!check_padding_md(p2, rctx->pad_mode))

			return 0;
@@ -422,12 +434,33 @@ static int pkey_rsa_ctrl_str(EVP_PKEY_CTX *ctx, 
			return -2;

		return EVP_PKEY_CTX_set_rsa_padding(ctx, pm);

		}



	if (!strcmp(type, "rsa_pss_saltlen"))

		{

		int saltlen;

		saltlen = atoi(value);

		return EVP_PKEY_CTX_set_rsa_pss_saltlen(ctx, saltlen);

		}



	if (!strcmp(type, "rsa_keygen_bits"))

		{

		int nbits;

		nbits = atoi(value);

		return EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, nbits);

		}



	if (!strcmp(type, "rsa_keygen_pubexp"))

		{

		int ret;

		BIGNUM *pubexp = NULL;

		if (!BN_asc2bn(&pubexp, value))

			return 0;

		ret = EVP_PKEY_CTX_set_rsa_keygen_pubexp(ctx, pubexp);

		if (ret <= 0)

			BN_free(pubexp);

		return ret;

		}



	return -2;

	}