Support for DSA keygen, fix for genpkey.

diff --git a/apps/genpkey.c b/apps/genpkey.c
index 34432874e8c1dd59de569520820d6254261e10c7..9a58b64e9299083755aff35332a37fcb750b2c02 100644 (file)
--- a/apps/genpkey.c
+++ b/apps/genpkey.c
@@ -87,7 +87,7 @@ int MAIN(int argc, char **argv)
        int badarg = 0;
        int ret = 1;
 
        int badarg = 0;
        int ret = 1;
 

-       int do_param = -1;
+       int do_param = 0;

 
        if (bio_err == NULL)
                bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
 
        if (bio_err == NULL)
                bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);


@@ -147,8 +147,6 @@ int MAIN(int argc, char **argv)
                        {
                        if (!args[1])
                                goto bad;
                        {
                        if (!args[1])
                                goto bad;

-                       if (do_param == -1)
-                               do_param = 0;

                        if (!init_gen_str(bio_err, &ctx, *(++args),e, do_param))
                                goto end;
                        }
                        if (!init_gen_str(bio_err, &ctx, *(++args),e, do_param))
                                goto end;
                        }

diff --git a/crypto/dsa/dsa.h b/crypto/dsa/dsa.h
index 97efb92bd9f3d2b7ebbf14d7b8d3be14c542667a..c4d440d51c2eec1790ef7e3e23aa693f261103bf 100644 (file)
--- a/crypto/dsa/dsa.h
+++ b/crypto/dsa/dsa.h
@@ -279,6 +279,7 @@ void ERR_load_DSA_strings(void);
 #define DSA_F_DSA_VERIFY                                108
 #define DSA_F_I2D_DSA_SIG                               111
 #define DSA_F_PKEY_DSA_CTRL                             120
 #define DSA_F_DSA_VERIFY                                108
 #define DSA_F_I2D_DSA_SIG                               111
 #define DSA_F_PKEY_DSA_CTRL                             120

+#define DSA_F_PKEY_DSA_KEYGEN                           121

 #define DSA_F_SIG_CB                                    114
 
 /* Reason codes. */
 #define DSA_F_SIG_CB                                    114
 
 /* Reason codes. */


@@ -288,6 +289,7 @@ void ERR_load_DSA_strings(void);
 #define DSA_R_DECODE_ERROR                              104
 #define DSA_R_INVALID_DIGEST_TYPE                       106
 #define DSA_R_MISSING_PARAMETERS                        101
 #define DSA_R_DECODE_ERROR                              104
 #define DSA_R_INVALID_DIGEST_TYPE                       106
 #define DSA_R_MISSING_PARAMETERS                        101

+#define DSA_R_NO_PARAMETERS_SET                                 107

 #define DSA_R_PARAMETER_ENCODING_ERROR                  105
 
 #ifdef  __cplusplus
 #define DSA_R_PARAMETER_ENCODING_ERROR                  105
 
 #ifdef  __cplusplus

diff --git a/crypto/dsa/dsa_err.c b/crypto/dsa/dsa_err.c
index 5365f614a494f8f216d923698d1beab2f9fc2a4c..8bd6968fa776d314250cbb5a061704831e51bac8 100644 (file)
--- a/crypto/dsa/dsa_err.c
+++ b/crypto/dsa/dsa_err.c
@@ -89,6 +89,7 @@ static ERR_STRING_DATA DSA_str_functs[]=
 {ERR_FUNC(DSA_F_DSA_VERIFY),   "DSA_verify"},
 {ERR_FUNC(DSA_F_I2D_DSA_SIG),  "i2d_DSA_SIG"},
 {ERR_FUNC(DSA_F_PKEY_DSA_CTRL),        "PKEY_DSA_CTRL"},
 {ERR_FUNC(DSA_F_DSA_VERIFY),   "DSA_verify"},
 {ERR_FUNC(DSA_F_I2D_DSA_SIG),  "i2d_DSA_SIG"},
 {ERR_FUNC(DSA_F_PKEY_DSA_CTRL),        "PKEY_DSA_CTRL"},

+{ERR_FUNC(DSA_F_PKEY_DSA_KEYGEN),      "PKEY_DSA_KEYGEN"},

 {ERR_FUNC(DSA_F_SIG_CB),       "SIG_CB"},
 {0,NULL}
        };
 {ERR_FUNC(DSA_F_SIG_CB),       "SIG_CB"},
 {0,NULL}
        };


@@ -101,6 +102,7 @@ static ERR_STRING_DATA DSA_str_reasons[]=
 {ERR_REASON(DSA_R_DECODE_ERROR)          ,"decode error"},
 {ERR_REASON(DSA_R_INVALID_DIGEST_TYPE)   ,"invalid digest type"},
 {ERR_REASON(DSA_R_MISSING_PARAMETERS)    ,"missing parameters"},
 {ERR_REASON(DSA_R_DECODE_ERROR)          ,"decode error"},
 {ERR_REASON(DSA_R_INVALID_DIGEST_TYPE)   ,"invalid digest type"},
 {ERR_REASON(DSA_R_MISSING_PARAMETERS)    ,"missing parameters"},

+{ERR_REASON(DSA_R_NO_PARAMETERS_SET)     ,"no parameters set"},

 {ERR_REASON(DSA_R_PARAMETER_ENCODING_ERROR),"parameter encoding error"},
 {0,NULL}
        };
 {ERR_REASON(DSA_R_PARAMETER_ENCODING_ERROR),"parameter encoding error"},
 {0,NULL}
        };

diff --git a/crypto/dsa/dsa_pmeth.c b/crypto/dsa/dsa_pmeth.c
index f91d03c20859aef4f487493db4092f64b25f28b3..364ba15a12c98915a1c845e637b0d8ec3855d0e3 100644 (file)
--- a/crypto/dsa/dsa_pmeth.c
+++ b/crypto/dsa/dsa_pmeth.c
@@ -200,6 +200,24 @@ static int pkey_dsa_paramgen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
        return ret;
        }
 
        return ret;
        }
 

+static int pkey_dsa_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
+       {
+       DSA *dsa = NULL;
+       if (ctx->pkey == NULL)
+               {
+               DSAerr(DSA_F_PKEY_DSA_KEYGEN, DSA_R_NO_PARAMETERS_SET);
+               return 0;
+               }
+       dsa = DSA_new();
+       if (!dsa)
+               return 0;
+       EVP_PKEY_assign_DSA(pkey, dsa);
+       /* Note: if error return, pkey is freed by parent routine */
+       if (!EVP_PKEY_copy_parameters(pkey, ctx->pkey))
+               return 0;
+       return DSA_generate_key(pkey->pkey.dsa);
+       }
+

 const EVP_PKEY_METHOD dsa_pkey_meth = 
        {
        EVP_PKEY_DSA,
 const EVP_PKEY_METHOD dsa_pkey_meth = 
        {
        EVP_PKEY_DSA,


@@ -210,7 +228,8 @@ const EVP_PKEY_METHOD dsa_pkey_meth =
        0,
        pkey_dsa_paramgen,
 
        0,
        pkey_dsa_paramgen,
 

-       0,0,
+       0,
+       pkey_dsa_keygen,

 
        0,
        pkey_dsa_sign,
 
        0,
        pkey_dsa_sign,