Add RSA ctrl for padding mode, add ctrl support in pkeyutl.

diff --git a/apps/apps.c b/apps/apps.c
index 1b7ca6961f545f7a1a5c7924de3b8ff5b5c440f7..365287f488abcd898bf017d176db99afec794960 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -2304,11 +2304,11 @@ int bio_to_mem(unsigned char **out, int maxlen, BIO *in)
        return ret;
        }
 
-int pkey_ctrl_string(BIO *err, EVP_PKEY_CTX *ctx, char *value)
+int pkey_ctrl_string(EVP_PKEY_CTX *ctx, char *value)
        {
+       int rv;
        char *stmp, *vtmp = NULL;
        stmp = BUF_strdup(value);
-       int rv;
        if (!stmp)
                return -1;
        vtmp = strchr(stmp, ':');

diff --git a/apps/apps.h b/apps/apps.h
index d15127e7aa802c00d61c36422c625484172b3007..00522341ffb7a456305aad30eb2b2de15d1ef5bf 100644 (file)
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -286,6 +286,7 @@ int args_verify(char ***pargs, int *pargc,
                        int *badarg, BIO *err, X509_VERIFY_PARAM **pm);
 void policies_print(BIO *out, X509_STORE_CTX *ctx);
 int bio_to_mem(unsigned char **out, int maxlen, BIO *in);
+int pkey_ctrl_string(EVP_PKEY_CTX *ctx, char *value);
 
 #define FORMAT_UNDEF    0
 #define FORMAT_ASN1     1

diff --git a/apps/pkeyutl.c b/apps/pkeyutl.c
index bac935c6d7278e0e38f6d3f2024f8b3043acc65e..82b59a805c596f76f0bf97af56ca7b40c71375e8 100644 (file)
--- a/apps/pkeyutl.c
+++ b/apps/pkeyutl.c
@@ -154,8 +154,10 @@ int MAIN(int argc, char **argv)
 #ifndef OPENSSL_NO_ENGINE
                else if(!strcmp(*argv, "-engine"))
                        {
-                       if (--argc < 1) badarg = 1;
-                       engine = *(++argv);
+                       if (--argc < 1)
+                               badarg = 1;
+                       else
+                               engine = *(++argv);
                        }
 #endif
                else if(!strcmp(*argv, "-pubin"))
@@ -178,6 +180,23 @@ int MAIN(int argc, char **argv)
                        pkey_op = EVP_PKEY_OP_ENCRYPT;
                else if(!strcmp(*argv, "-decrypt"))
                        pkey_op = EVP_PKEY_OP_DECRYPT;
+               else if (strcmp(*argv,"-param") == 0)
+                       {
+                       if (--argc < 1)
+                               badarg = 1;
+                       if (!ctx)
+                               {
+                               BIO_puts(bio_err,
+                                       "-param command before -inkey\n");
+                               badarg = 1;
+                               }
+                       else if (pkey_ctrl_string(ctx, *(++argv)) <= 0)
+                               {
+                               BIO_puts(bio_err, "parameter setting error\n");
+                               ERR_print_errors(bio_err);
+                               goto end;
+                               }
+                       }
                else badarg = 1;
                if(badarg)
                        {

diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index 06535510caf701bfa64aedd6f27bb00146bf3c9a..07bcb50ad0f8edb2d0e436d7de908bb3e9bf18c5 100644 (file)
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -917,8 +917,11 @@ void EVP_PKEY_asn1_set_ctrl(EVP_PKEY_ASN1_METHOD *ameth,
 const EVP_PKEY_METHOD *EVP_PKEY_meth_find(int type, ENGINE *e);
 EVP_PKEY_CTX *EVP_PKEY_CTX_new(EVP_PKEY *pkey);
 void EVP_PKEY_CTX_free(EVP_PKEY_CTX *ctx);
+
 int EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype,
                                int cmd, int p1, void *p2);
+int EVP_PKEY_CTX_ctrl_str(EVP_PKEY_CTX *ctx, const char *type,
+                                               const char *value);
 
 
 int EVP_PKEY_sign_init(EVP_PKEY_CTX *ctx);

diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
index 9ca351a53e9d37560ef0de13a34a8de5abd0e0cc..7c363956968e3f6b66330b6bb6da19a5d33c6d62 100644 (file)
--- a/crypto/evp/pmeth_lib.c
+++ b/crypto/evp/pmeth_lib.c
@@ -171,7 +171,8 @@ int EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype,
 
        }
 
-int EVP_PKEY_CTX_ctrl_str(EVP_PKEY_CTX *ctx, char *name, char *value)
+int EVP_PKEY_CTX_ctrl_str(EVP_PKEY_CTX *ctx,
+                                       const char *name, const char *value)
        {
        if (!ctx || !ctx->pmeth || !ctx->pmeth->ctrl)
                {

diff --git a/crypto/rsa/rsa.h b/crypto/rsa/rsa.h
index 6a9062b27ecea4113310cbce7635eca6cc3a5dc6..2b03ede5fdf0c3595f6719e6e704674728d11110 100644 (file)
--- a/crypto/rsa/rsa.h
+++ b/crypto/rsa/rsa.h
@@ -192,6 +192,12 @@ struct rsa_st
                                                 * be used for all exponents.
                                                 */
 
+#define EVP_PKEY_CTX_set_rsa_padding(ctx, pad) \
+       EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_RSA, EVP_PKEY_CTRL_RSA_PADDING, \
+                               pad, NULL)
+
+#define EVP_PKEY_CTRL_RSA_PADDING      1
+
 #define RSA_PKCS1_PADDING      1
 #define RSA_SSLV23_PADDING     2
 #define RSA_NO_PADDING         3

diff --git a/crypto/rsa/rsa_pmeth.c b/crypto/rsa/rsa_pmeth.c
index 7fe9e52a7d3e5681f2a8582aac865860b088ce72..5401b0544a0ff8edfd7a6516cf02162ead168188 100644 (file)
--- a/crypto/rsa/rsa_pmeth.c
+++ b/crypto/rsa/rsa_pmeth.c
@@ -151,6 +151,52 @@ static int pkey_rsa_decrypt(EVP_PKEY_CTX *ctx, unsigned char *out, int *outlen,
        return 1;
        }
 
+static int pkey_rsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
+       {
+       RSA_PKEY_CTX *rctx = ctx->data;
+       switch (type)
+               {
+
+               case EVP_PKEY_CTRL_RSA_PADDING:
+               /* TODO: add PSS support */
+               if ((p1 >= RSA_PKCS1_PADDING) && (p1 <= RSA_X931_PADDING))
+                       {
+                       rctx->pad_mode = p1;
+                       return 1;
+                       }
+               return 0;
+
+               default:
+               return -2;
+
+               }
+       }
+                       
+static int pkey_rsa_ctrl_str(EVP_PKEY_CTX *ctx,
+                       const char *type, const char *value)
+       {
+       if (!strcmp(type, "rsa_padding_mode"))
+               {
+               int pm;
+               if (!value)
+                       return 0;
+               if (!strcmp(value, "pkcs1"))
+                       pm = RSA_PKCS1_PADDING;
+               else if (!strcmp(value, "sslv23"))
+                       pm = RSA_SSLV23_PADDING;
+               else if (!strcmp(value, "none"))
+                       pm = RSA_NO_PADDING;
+               else if (!strcmp(value, "oeap"))
+                       pm = RSA_PKCS1_OAEP_PADDING;
+               else if (!strcmp(value, "x931"))
+                       pm = RSA_X931_PADDING;
+               else
+                       return -2;
+               return pkey_rsa_ctrl(ctx, EVP_PKEY_CTRL_RSA_PADDING, pm, NULL);
+               }
+       return -2;
+       }
+
 const EVP_PKEY_METHOD rsa_pkey_meth = 
        {
        EVP_PKEY_RSA,
@@ -179,7 +225,8 @@ const EVP_PKEY_METHOD rsa_pkey_meth =
        0,
        pkey_rsa_decrypt,
 
-       0,0
+       pkey_rsa_ctrl,
+       pkey_rsa_ctrl_str
 
 
        };