src/usr.bin/openssl/dhparam.c - diff

Return to dhparam.c CVS log

Up to [local] / src / usr.bin / openssl

Diff for /src/usr.bin/openssl/dhparam.c between version 1.5 and 1.6

version 1.5, 2015/08/22 16:36:05

version 1.6, 2015/09/11 14:30:23

Line 135

int C;

int check;

int dsaparam;

#ifndef OPENSSL_NO_ENGINE

char *engine;

#endif

int g;

char *infile;

int informat;

Line 181

Line 178

.type = OPTION_FLAG,

.opt.flag = &dhparam_config.dsaparam,

#ifndef OPENSSL_NO_ENGINE

{

.name = "engine",

.argname = "id",

.desc = "Use the engine specified by the given identifier",

.type = OPTION_ARG,

.opt.arg = &dhparam_config.engine,

#endif

{

.name = "in",

.argname = "file",

.desc = "Input file (default stdin)",

Line 237

Line 225

dhparam_usage()

{

fprintf(stderr,

"usage: dhparam [-2 | -5] [-C] [-check] [-dsaparam] [-engine id]\n"

"usage: dhparam [-2 | -5] [-C] [-check] [-dsaparam]\n"

" [-in file] [-inform DER | PEM] [-noout] [-out file]\n"

" [-outform DER | PEM] [-text] [numbits]\n\n");

options_usage(dhparam_options);

Line 272

Line 260

return (1);

}

#ifndef OPENSSL_NO_ENGINE

setup_engine(bio_err, dhparam_config.engine, 0);

#endif

if (dhparam_config.g && !num)

num = DEFBITS;