=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/gendsa.c,v retrieving revision 1.3 retrieving revision 1.4 diff -c -r1.3 -r1.4 *** src/usr.bin/openssl/gendsa.c 2015/09/10 02:17:17 1.3 --- src/usr.bin/openssl/gendsa.c 2015/09/11 14:30:23 1.4 *************** *** 1,4 **** ! /* $OpenBSD: gendsa.c,v 1.3 2015/09/10 02:17:17 lteo Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * --- 1,4 ---- ! /* $OpenBSD: gendsa.c,v 1.4 2015/09/11 14:30:23 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * *************** *** 84,92 **** 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--; --- 84,89 ---- *************** *** 102,114 **** 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 --- 99,104 ---- *************** *** 164,180 **** 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; --- 154,163 ----