===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/dsaparam.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/openssl/dsaparam.c	2015/08/22 16:36:05	1.4
--- src/usr.bin/openssl/dsaparam.c	2015/09/11 14:30:23	1.5
***************
*** 1,4 ****
! /* $OpenBSD: dsaparam.c,v 1.4 2015/08/22 16:36:05 jsing Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
--- 1,4 ----
! /* $OpenBSD: dsaparam.c,v 1.5 2015/09/11 14:30:23 bcook Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
***************
*** 81,89 ****
  
  static struct {
  	int C;
- #ifndef OPENSSL_NO_ENGINE
- 	char *engine;
- #endif
  	int genkey;
  	char *infile;
  	int informat;
--- 81,86 ----
***************
*** 100,115 ****
  		.type = OPTION_FLAG,
  		.opt.flag = &dsaparam_config.C,
  	},
- #ifndef OPENSSL_NO_ENGINE
  	{
- 		.name = "engine",
- 		.argname = "id",
- 		.desc = "Use the engine specified by the given identifier",
- 		.type = OPTION_ARG,
- 		.opt.arg = &dsaparam_config.engine,
- 	},
- #endif
- 	{
  		.name = "genkey",
  		.desc = "Generate a DSA key",
  		.type = OPTION_FLAG,
--- 97,103 ----
***************
*** 162,168 ****
  dsaparam_usage(void)
  {
  	fprintf(stderr,
! 	    "usage: dsaparam [-C] [-engine id] [-genkey] [-in file]\n"
  	    "    [-inform format] [-noout] [-out file] [-outform format]\n"
  	    "    [-text] [numbits]\n\n");
  	options_usage(dsaparam_options);
--- 150,156 ----
  dsaparam_usage(void)
  {
  	fprintf(stderr,
! 	    "usage: dsaparam [-C] [-genkey] [-in file]\n"
  	    "    [-inform format] [-noout] [-out file] [-outform format]\n"
  	    "    [-text] [numbits]\n\n");
  	options_usage(dsaparam_options);
***************
*** 221,230 ****
  			goto end;
  		}
  	}
- 
- #ifndef OPENSSL_NO_ENGINE
- 	setup_engine(bio_err, dsaparam_config.engine, 0);
- #endif
  
  	if (numbits > 0) {
  		BN_GENCB cb;
--- 209,214 ----