===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/x509.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/openssl/x509.c	2015/08/22 16:36:05	1.5
--- src/usr.bin/openssl/x509.c	2015/09/11 14:30:23	1.6
***************
*** 1,4 ****
! /* $OpenBSD: x509.c,v 1.5 2015/08/22 16:36:05 jsing Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
--- 1,4 ----
! /* $OpenBSD: x509.c,v 1.6 2015/09/11 14:30:23 bcook Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
***************
*** 140,148 ****
  	" -extensions     - section from config file with X509V3 extensions to add\n",
  	" -clrext         - delete extensions before signing and input certificate\n",
  	" -nameopt arg    - various certificate name options\n",
- #ifndef OPENSSL_NO_ENGINE
- 	" -engine e       - use engine e, possibly a hardware device.\n",
- #endif
  	" -certopt arg    - various certificate text options\n",
  	NULL
  };
--- 140,145 ----
***************
*** 160,166 ****
  int
  x509_main(int argc, char **argv)
  {
- 	ENGINE *e = NULL;
  	int ret = 1;
  	X509_REQ *req = NULL;
  	X509 *x = NULL, *xca = NULL;
--- 157,162 ----
***************
*** 200,208 ****
  	char *extsect = NULL, *extfile = NULL, *passin = NULL, *passargin = NULL;
  	int checkend = 0, checkoffset = 0;
  	unsigned long nmflag = 0, certflag = 0;
- #ifndef OPENSSL_NO_ENGINE
- 	char *engine = NULL;
- #endif
  	const char *errstr = NULL;
  
  	reqfile = 0;
--- 196,201 ----
***************
*** 345,357 ****
  			if (!set_name_ex(&nmflag, *(++argv)))
  				goto bad;
  		}
- #ifndef OPENSSL_NO_ENGINE
- 		else if (strcmp(*argv, "-engine") == 0) {
- 			if (--argc < 1)
- 				goto bad;
- 			engine = *(++argv);
- 		}
- #endif
  		else if (strcmp(*argv, "-C") == 0)
  			C = ++num;
  		else if (strcmp(*argv, "-email") == 0)
--- 338,343 ----
***************
*** 441,449 ****
  			BIO_printf(bio_err, "%s", *pp);
  		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");
--- 427,432 ----
***************
*** 575,586 ****
  		X509_set_pubkey(x, pkey);
  		EVP_PKEY_free(pkey);
  	} else
! 		x = load_cert(bio_err, infile, informat, NULL, e, "Certificate");
  
  	if (x == NULL)
  		goto end;
  	if (CA_flag) {
! 		xca = load_cert(bio_err, CAfile, CAformat, NULL, e, "CA Certificate");
  		if (xca == NULL)
  			goto end;
  	}
--- 558,569 ----
  		X509_set_pubkey(x, pkey);
  		EVP_PKEY_free(pkey);
  	} else
! 		x = load_cert(bio_err, infile, informat, NULL, "Certificate");
  
  	if (x == NULL)
  		goto end;
  	if (CA_flag) {
! 		xca = load_cert(bio_err, CAfile, CAformat, NULL, "CA Certificate");
  		if (xca == NULL)
  			goto end;
  	}
***************
*** 813,819 ****
  				if (Upkey == NULL) {
  					Upkey = load_key(bio_err,
  					    keyfile, keyformat, 0,
! 					    passin, e, "Private key");
  					if (Upkey == NULL)
  						goto end;
  				}
--- 796,802 ----
  				if (Upkey == NULL) {
  					Upkey = load_key(bio_err,
  					    keyfile, keyformat, 0,
! 					    passin, "Private key");
  					if (Upkey == NULL)
  						goto end;
  				}
***************
*** 825,832 ****
  				if (CAkeyfile != NULL) {
  					CApkey = load_key(bio_err,
  					    CAkeyfile, CAkeyformat,
! 					    0, passin, e,
! 					    "CA Private Key");
  					if (CApkey == NULL)
  						goto end;
  				}
--- 808,814 ----
  				if (CAkeyfile != NULL) {
  					CApkey = load_key(bio_err,
  					    CAkeyfile, CAkeyformat,
! 					    0, passin, "CA Private Key");
  					if (CApkey == NULL)
  						goto end;
  				}
***************
*** 845,851 ****
  				} else {
  					pk = load_key(bio_err,
  					    keyfile, keyformat, 0,
! 					    passin, e, "request key");
  					if (pk == NULL)
  						goto end;
  				}
--- 827,833 ----
  				} else {
  					pk = load_key(bio_err,
  					    keyfile, keyformat, 0,
! 					    passin, "request key");
  					if (pk == NULL)
  						goto end;
  				}