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

Return to gendsa.c CVS log

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

version 1.3, 2015/09/10 02:17:17

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

Line 84

char *passargout = NULL, *passout = NULL;

BIO *out = NULL, *in = NULL;

const EVP_CIPHER *enc = NULL;

#ifndef OPENSSL_NO_ENGINE

char *engine = NULL;

#endif

argv++;

argc--;

Line 102

Line 99

goto bad;

passargout = *(++argv);

}

#ifndef OPENSSL_NO_ENGINE

else if (strcmp(*argv, "-engine") == 0) {

if (--argc < 1)

goto bad;

engine = *(++argv);

}

#endif

else if (strcmp(*argv, "-") == 0)

goto bad;

#ifndef OPENSSL_NO_DES

Line 164

Line 154

BIO_printf(bio_err, " -camellia128, -camellia192, -camellia256\n");

BIO_printf(bio_err, " encrypt PEM output with cbc camellia\n");

#endif

#ifndef OPENSSL_NO_ENGINE

BIO_printf(bio_err, " -engine e - use engine e, possibly a hardware device.\n");

#endif

BIO_printf(bio_err, " dsaparam-file\n");

BIO_printf(bio_err, " - a DSA parameter file as generated by the dsaparam command\n");

goto end;

}

#ifndef OPENSSL_NO_ENGINE

setup_engine(bio_err, engine, 0);

#endif

if (!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {

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

goto end;