Add key derivation support.

[openssl.git] / crypto / rsa / rsa_pmeth.c

diff --git a/crypto/rsa/rsa_pmeth.c b/crypto/rsa/rsa_pmeth.c
index f8ce45ca2efcbb73f9f3eb679cc695f159b377fc..5f357b98c6f11d2d3295cfdfc4a658651a76d49a 100644 (file)
--- a/crypto/rsa/rsa_pmeth.c
+++ b/crypto/rsa/rsa_pmeth.c
@@ -75,6 +75,8 @@ typedef struct
        /* Key gen parameters */
        int nbits;
        BIGNUM *pub_exp;
+       /* Keygen callback info */
+       int gentmp[2];
        /* RSA padding mode */
        int pad_mode;
        /* message digest */
@@ -100,6 +102,8 @@ static int pkey_rsa_init(EVP_PKEY_CTX *ctx)
        rctx->saltlen = -2;
 
        ctx->data = rctx;
+       ctx->keygen_info = rctx->gentmp;
+       ctx->keygen_info_count = 2;
        
        return 1;
        }
@@ -123,8 +127,8 @@ static void pkey_rsa_cleanup(EVP_PKEY_CTX *ctx)
                        BN_free(rctx->pub_exp);
                if (rctx->tbuf)
                        OPENSSL_free(rctx->tbuf);
+               OPENSSL_free(rctx);
                }
-       OPENSSL_free(rctx);
        }
 
 static int pkey_rsa_sign(EVP_PKEY_CTX *ctx, unsigned char *sig, int *siglen,
@@ -326,7 +330,7 @@ static int check_padding_md(const EVP_MD *md, int padding)
 
        if (padding == RSA_NO_PADDING)
                {
-               RSAerr(RSA_F_CHECK_PADDING_NID, RSA_R_INVALID_PADDING_MODE);
+               RSAerr(RSA_F_CHECK_PADDING_MD, RSA_R_INVALID_PADDING_MODE);
                return 0;
                }
 
@@ -334,7 +338,7 @@ static int check_padding_md(const EVP_MD *md, int padding)
                {
                if (RSA_X931_hash_id(EVP_MD_type(md)) == -1)
                        {
-                       RSAerr(RSA_F_CHECK_PADDING_NID,
+                       RSAerr(RSA_F_CHECK_PADDING_MD,
                                                RSA_R_INVALID_X931_DIGEST);
                        return 0;
                        }
@@ -353,13 +357,11 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
                case EVP_PKEY_CTRL_RSA_PADDING:
                if ((p1 >= RSA_PKCS1_PADDING) && (p1 <= RSA_PKCS1_PSS_PADDING))
                        {
-                       if (ctx->operation & EVP_PKEY_OP_TYPE_GEN)
-                               return -2;
                        if (!check_padding_md(rctx->md, p1))
                                return 0;
                        if (p1 == RSA_PKCS1_PSS_PADDING) 
                                {
-                               if (!(ctx->operation & EVP_PKEY_OP_TYPE_SIG))
+                               if (ctx->operation == EVP_PKEY_OP_VERIFYRECOVER)
                                        return -2;
                                if (!rctx->md)
                                        rctx->md = EVP_sha1();
@@ -376,6 +378,26 @@ static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
                        }
                return -2;
 
+               case EVP_PKEY_CTRL_RSA_PSS_SALTLEN:
+               if (p1 < -2)
+                       return -2;
+               if (rctx->pad_mode != RSA_PKCS1_PSS_PADDING)
+                       return -2;
+               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;
@@ -412,9 +434,66 @@ 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;
        }
 
+static int pkey_rsa_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
+       {
+       RSA *rsa = NULL;
+       RSA_PKEY_CTX *rctx = ctx->data;
+       BN_GENCB *pcb, cb;
+       int ret;
+       if (!rctx->pub_exp)
+               {
+               rctx->pub_exp = BN_new();
+               if (!rctx->pub_exp || !BN_set_word(rctx->pub_exp, RSA_F4))
+                       return 0;
+               }
+       rsa = RSA_new();
+       if (!rsa)
+               return 0;
+       if (ctx->pkey_gencb)
+               {
+               pcb = &cb;
+               evp_pkey_set_cb_translate(pcb, ctx);
+               }
+       else
+               pcb = NULL;
+       ret = RSA_generate_key_ex(rsa, rctx->nbits, rctx->pub_exp, pcb);
+       if (ret > 0)
+               EVP_PKEY_assign_RSA(pkey, rsa);
+       else
+               RSA_free(rsa);
+       return ret;
+       }
+
 const EVP_PKEY_METHOD rsa_pkey_meth = 
        {
        EVP_PKEY_RSA,
@@ -424,7 +503,8 @@ const EVP_PKEY_METHOD rsa_pkey_meth =
 
        0,0,
 
-       0,0,
+       0,
+       pkey_rsa_keygen,
 
        0,
        pkey_rsa_sign,
@@ -444,6 +524,8 @@ const EVP_PKEY_METHOD rsa_pkey_meth =
        0,
        pkey_rsa_decrypt,
 
+       0,0,
+
        pkey_rsa_ctrl,
        pkey_rsa_ctrl_str