===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/rsautl.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/openssl/rsautl.c	2015/08/22 16:36:05	1.6
--- src/usr.bin/openssl/rsautl.c	2015/09/11 14:30:23	1.7
***************
*** 1,4 ****
! /* $OpenBSD: rsautl.c,v 1.6 2015/08/22 16:36:05 jsing Exp $ */
  /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
   * project 2000.
   */
--- 1,4 ----
! /* $OpenBSD: rsautl.c,v 1.7 2015/09/11 14:30:23 bcook Exp $ */
  /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
   * project 2000.
   */
***************
*** 81,92 ****
  int
  rsautl_main(int argc, char **argv)
  {
- 	ENGINE *e = NULL;
  	BIO *in = NULL, *out = NULL;
  	char *infile = NULL, *outfile = NULL;
- #ifndef OPENSSL_NO_ENGINE
- 	char *engine = NULL;
- #endif
  	char *keyfile = NULL;
  	char rsa_mode = RSA_VERIFY, key_type = KEY_PRIVKEY;
  	int keyform = FORMAT_PEM;
--- 81,88 ----
***************
*** 133,145 ****
  				badarg = 1;
  			else
  				keyform = str2fmt(*(++argv));
- #ifndef OPENSSL_NO_ENGINE
- 		} else if (!strcmp(*argv, "-engine")) {
- 			if (--argc < 1)
- 				badarg = 1;
- 			else
- 				engine = *(++argv);
- #endif
  		} else if (!strcmp(*argv, "-pubin")) {
  			key_type = KEY_PUBKEY;
  		} else if (!strcmp(*argv, "-certin")) {
--- 129,134 ----
***************
*** 184,192 ****
  		BIO_printf(bio_err, "A private key is needed for this operation\n");
  		goto end;
  	}
- #ifndef OPENSSL_NO_ENGINE
- 	e = setup_engine(bio_err, engine, 0);
- #endif
  	if (!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
  		BIO_printf(bio_err, "Error getting password\n");
  		goto end;
--- 173,178 ----
***************
*** 195,211 ****
  	switch (key_type) {
  	case KEY_PRIVKEY:
  		pkey = load_key(bio_err, keyfile, keyform, 0,
! 		    passin, e, "Private Key");
  		break;
  
  	case KEY_PUBKEY:
  		pkey = load_pubkey(bio_err, keyfile, keyform, 0,
! 		    NULL, e, "Public Key");
  		break;
  
  	case KEY_CERT:
  		x = load_cert(bio_err, keyfile, keyform,
! 		    NULL, e, "Certificate");
  		if (x) {
  			pkey = X509_get_pubkey(x);
  			X509_free(x);
--- 181,197 ----
  	switch (key_type) {
  	case KEY_PRIVKEY:
  		pkey = load_key(bio_err, keyfile, keyform, 0,
! 		    passin, "Private Key");
  		break;
  
  	case KEY_PUBKEY:
  		pkey = load_pubkey(bio_err, keyfile, keyform, 0,
! 		    NULL, "Public Key");
  		break;
  
  	case KEY_CERT:
  		x = load_cert(bio_err, keyfile, keyform,
! 		    NULL, "Certificate");
  		if (x) {
  			pkey = X509_get_pubkey(x);
  			X509_free(x);
***************
*** 336,345 ****
  	BIO_printf(bio_err, "-encrypt        encrypt with public key\n");
  	BIO_printf(bio_err, "-decrypt        decrypt with private key\n");
  	BIO_printf(bio_err, "-hexdump        hex dump output\n");
- #ifndef OPENSSL_NO_ENGINE
- 	BIO_printf(bio_err, "-engine e       use engine e, possibly a hardware device.\n");
- 	BIO_printf(bio_err, "-passin arg    pass phrase source\n");
- #endif
- 
  }
- 
--- 322,325 ----