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

Return to rsa.c CVS log

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

Diff for /src/usr.bin/openssl/rsa.c between version 1.4 and 1.5

version 1.4, 2015/08/19 18:25:31

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

Line 77

static struct {

int check;

const EVP_CIPHER *enc;

#ifndef OPENSSL_NO_ENGINE

char *engine;

#endif

char *infile;

int informat;

int modulus;

Line 119

Line 116

.type = OPTION_FLAG,

.opt.flag = &rsa_config.check,

#ifndef OPENSSL_NO_ENGINE

{

.name = "engine",

.argname = "id",

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

.type = OPTION_ARG,

.opt.arg = &rsa_config.engine,

#endif

{

.name = "in",

.argname = "file",

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

Line 258

Line 246

rsa_usage()

{

fprintf(stderr,

"usage: rsa [-ciphername] [-check] [-engine id] [-in file] "

"usage: rsa [-ciphername] [-check] [-in file] "

"[-inform fmt]\n"

" [-modulus] [-noout] [-out file] [-outform fmt] "

"[-passin src]\n"

Line 274

Line 262

int

rsa_main(int argc, char **argv)

{

ENGINE *e = NULL;

int ret = 1;

RSA *rsa = NULL;

int i;

Line 291

Line 278

goto end;

}

#ifndef OPENSSL_NO_ENGINE

e = setup_engine(bio_err, rsa_config.engine, 0);

#endif

if (!app_passwd(bio_err, rsa_config.passargin, rsa_config.passargout,

&passin, &passout)) {

BIO_printf(bio_err, "Error getting passwords\n");

Line 323

Line 306

tmpformat = rsa_config.informat;

pkey = load_pubkey(bio_err, rsa_config.infile,

tmpformat, 1, passin, e, "Public Key");

tmpformat, 1, passin, "Public Key");

} else

pkey = load_key(bio_err, rsa_config.infile,

(rsa_config.informat == FORMAT_NETSCAPE &&

rsa_config.sgckey ? FORMAT_IISSGC :

rsa_config.informat), 1, passin, e, "Private Key");

rsa_config.informat), 1, passin, "Private Key");

if (pkey != NULL)

rsa = EVP_PKEY_get1_RSA(pkey);