===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/genrsa.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/openssl/genrsa.c	2015/08/22 16:36:05	1.4
--- src/usr.bin/openssl/genrsa.c	2015/09/11 14:30:23	1.5
***************
*** 1,4 ****
! /* $OpenBSD: genrsa.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: genrsa.c,v 1.5 2015/09/11 14:30:23 bcook Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
***************
*** 89,97 ****
  genrsa_main(int argc, char **argv)
  {
  	BN_GENCB cb;
- #ifndef OPENSSL_NO_ENGINE
- 	ENGINE *e = NULL;
- #endif
  	int ret = 1;
  	int i, num = DEFBITS;
  	long l;
--- 89,94 ----
***************
*** 99,107 ****
  	unsigned long f4 = RSA_F4;
  	char *outfile = NULL;
  	char *passargout = NULL, *passout = NULL;
- #ifndef OPENSSL_NO_ENGINE
- 	char *engine = NULL;
- #endif
  	BIO *out = NULL;
  	BIGNUM *bn = BN_new();
  	RSA *rsa = NULL;
--- 96,101 ----
***************
*** 128,140 ****
  			f4 = 3;
  		else if (strcmp(*argv, "-F4") == 0 || strcmp(*argv, "-f4") == 0)
  			f4 = RSA_F4;
- #ifndef OPENSSL_NO_ENGINE
- 		else if (strcmp(*argv, "-engine") == 0) {
- 			if (--argc < 1)
- 				goto bad;
- 			engine = *(++argv);
- 		}
- #endif
  #ifndef OPENSSL_NO_DES
  		else if (strcmp(*argv, "-des") == 0)
  			enc = EVP_des_cbc();
--- 122,127 ----
***************
*** 190,198 ****
  		BIO_printf(bio_err, " -passout arg    output file pass phrase source\n");
  		BIO_printf(bio_err, " -f4             use F4 (0x10001) for the E value\n");
  		BIO_printf(bio_err, " -3              use 3 for the E value\n");
- #ifndef OPENSSL_NO_ENGINE
- 		BIO_printf(bio_err, " -engine e       use engine e, possibly a hardware device.\n");
- #endif
  		goto err;
  	}
  
--- 177,182 ----
***************
*** 200,208 ****
  		BIO_printf(bio_err, "Error getting password\n");
  		goto err;
  	}
- #ifndef OPENSSL_NO_ENGINE
- 	e = setup_engine(bio_err, engine, 0);
- #endif
  
  	if (outfile == NULL) {
  		BIO_set_fp(out, stdout, BIO_NOCLOSE);
--- 184,189 ----
***************
*** 215,225 ****
  
  	BIO_printf(bio_err, "Generating RSA private key, %d bit long modulus\n",
  	    num);
- #ifdef OPENSSL_NO_ENGINE
  	rsa = RSA_new();
- #else
- 	rsa = RSA_new_method(e);
- #endif
  	if (!rsa)
  		goto err;
  
--- 196,202 ----