#define DEFBITS 2048
static EVP_PKEY *dsa_to_dh(EVP_PKEY *dh);
-static int gendh_cb(EVP_PKEY_CTX *ctx);
typedef enum OPTION_choice {
- OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
+ OPT_COMMON,
OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT,
OPT_ENGINE, OPT_CHECK, OPT_TEXT, OPT_NOOUT,
OPT_DSAPARAM, OPT_2, OPT_3, OPT_5,
if (argc == 1) {
if (!opt_int(argv[0], &num) || num <= 0)
goto opthelp;
- } else if (argc != 0) {
+ } else if (!opt_check_rest_arg(NULL)) {
goto opthelp;
}
- app_RAND_load();
-
+ if (!app_RAND_load())
+ goto end;
if (g && !num)
num = DEFBITS;
alg);
goto end;
}
- EVP_PKEY_CTX_set_cb(ctx, gendh_cb);
+ EVP_PKEY_CTX_set_cb(ctx, progress_cb);
EVP_PKEY_CTX_set_app_data(ctx, bio_err);
BIO_printf(bio_err,
"Generating %s parameters, %d bit long %sprime\n",
alg, num, dsaparam ? "" : "safe ");
- if (!EVP_PKEY_paramgen_init(ctx)) {
+ if (EVP_PKEY_paramgen_init(ctx) <= 0) {
BIO_printf(bio_err,
"Error, unable to initialise %s parameters\n",
alg);
}
}
- if (!EVP_PKEY_paramgen(ctx, &tmppkey)) {
- BIO_printf(bio_err, "Error, %s generation failed\n", alg);
- goto end;
- }
-
+ tmppkey = app_paramgen(ctx, alg);
EVP_PKEY_CTX_free(ctx);
ctx = NULL;
if (dsaparam) {
*/
keytype = "DHX";
/*
- * BIO_reset() returns 0 for success for file BIOs only!!!
- * This won't work for stdin (and never has done)
- * TODO: We should fix this at some point
- */
+ * BIO_reset() returns 0 for success for file BIOs only!!!
+ * This won't work for stdin (and never has done)
+ */
if (BIO_reset(in) == 0)
done = 0;
}
ctx = EVP_PKEY_CTX_new_from_name(NULL, "DHX", NULL);
if (ctx == NULL
- || !EVP_PKEY_fromdata_init(ctx)
- || !EVP_PKEY_fromdata(ctx, &pkey, EVP_PKEY_KEY_PARAMETERS, params)) {
+ || EVP_PKEY_fromdata_init(ctx) <= 0
+ || EVP_PKEY_fromdata(ctx, &pkey, EVP_PKEY_KEY_PARAMETERS, params) <= 0) {
BIO_printf(bio_err, "Error, failed to set DH parameters\n");
goto err;
}
err:
EVP_PKEY_CTX_free(ctx);
- OSSL_PARAM_BLD_free_params(params);
+ OSSL_PARAM_free(params);
OSSL_PARAM_BLD_free(tmpl);
BN_free(bn_p);
BN_free(bn_q);
return pkey;
}
-static int gendh_cb(EVP_PKEY_CTX *ctx)
-{
- int p = EVP_PKEY_CTX_get_keygen_info(ctx, 0);
- BIO *b = EVP_PKEY_CTX_get_app_data(ctx);
- static const char symbols[] = ".+*\n";
- char c = (p >= 0 && (size_t)p < sizeof(symbols) - 1) ? symbols[p] : '?';
-
- BIO_write(b, &c, 1);
- (void)BIO_flush(b);
- return 1;
-}