===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/rsa.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/openssl/rsa.c	2015/08/19 18:25:31	1.4
--- src/usr.bin/openssl/rsa.c	2015/09/11 14:30:23	1.5
***************
*** 1,4 ****
! /* $OpenBSD: rsa.c,v 1.4 2015/08/19 18:25:31 deraadt Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
--- 1,4 ----
! /* $OpenBSD: rsa.c,v 1.5 2015/09/11 14:30:23 bcook Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
***************
*** 77,85 ****
  static struct {
  	int check;
  	const EVP_CIPHER *enc;
- #ifndef OPENSSL_NO_ENGINE
- 	char *engine;
- #endif
  	char *infile;
  	int informat;
  	int modulus;
--- 77,82 ----
***************
*** 119,134 ****
  		.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)",
--- 116,122 ----
***************
*** 258,264 ****
  rsa_usage()
  {
  	fprintf(stderr,
! 	    "usage: rsa [-ciphername] [-check] [-engine id] [-in file] "
  	    "[-inform fmt]\n"
  	    "    [-modulus] [-noout] [-out file] [-outform fmt] "
  	    "[-passin src]\n"
--- 246,252 ----
  rsa_usage()
  {
  	fprintf(stderr,
! 	    "usage: rsa [-ciphername] [-check] [-in file] "
  	    "[-inform fmt]\n"
  	    "    [-modulus] [-noout] [-out file] [-outform fmt] "
  	    "[-passin src]\n"
***************
*** 274,280 ****
  int
  rsa_main(int argc, char **argv)
  {
- 	ENGINE *e = NULL;
  	int ret = 1;
  	RSA *rsa = NULL;
  	int i;
--- 262,267 ----
***************
*** 291,300 ****
  		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");
--- 278,283 ----
***************
*** 323,334 ****
  				tmpformat = rsa_config.informat;
  
  			pkey = load_pubkey(bio_err, rsa_config.infile,
! 			    tmpformat, 1, passin, e, "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");
  
  		if (pkey != NULL)
  			rsa = EVP_PKEY_get1_RSA(pkey);
--- 306,317 ----
  				tmpformat = rsa_config.informat;
  
  			pkey = load_pubkey(bio_err, rsa_config.infile,
! 			    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, "Private Key");
  
  		if (pkey != NULL)
  			rsa = EVP_PKEY_get1_RSA(pkey);