===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/req.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -c -r1.20 -r1.21
*** src/usr.bin/openssl/req.c	2021/10/22 09:44:30	1.20
--- src/usr.bin/openssl/req.c	2021/10/23 11:36:44	1.21
***************
*** 1,4 ****
! /* $OpenBSD: req.c,v 1.20 2021/10/22 09:44:30 tb Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
--- 1,4 ----
! /* $OpenBSD: req.c,v 1.21 2021/10/23 11:36:44 tb Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
***************
*** 143,149 ****
  	char *keyfile;
  	int keyform;
  	char *keyout;
- 	int kludge;
  	int modulus;
  	int multirdn;
  	int newhdr;
--- 143,148 ----
***************
*** 296,307 ****
  		.opt.argfunc = req_opt_addext,
  	},
  	{
- 		.name = "asn1-kludge",
- 		.type = OPTION_VALUE,
- 		.opt.value = &req_config.kludge,
- 		.value = 1,
- 	},
- 	{
  		.name = "batch",
  		.desc = "Operate in batch mode",
  		.type = OPTION_FLAG,
--- 295,300 ----
***************
*** 402,413 ****
  		.opt.argfunc = req_opt_newkey,
  	},
  	{
- 		.name = "no-asn1-kludge",
- 		.type = OPTION_VALUE,
- 		.opt.value = &req_config.kludge,
- 		.value = 0,
- 	},
- 	{
  		.name = "nodes",
  		.desc = "Do not encrypt output private key",
  		.type = OPTION_FLAG,
--- 395,400 ----
***************
*** 544,555 ****
  req_usage(void)
  {
  	fprintf(stderr,
! 	    "usage: req [-addext ext] [-asn1-kludge] [-batch] [-config file]\n"
  	    "    [-days n] [-extensions section] [-in file]\n"
  	    "    [-inform der | pem] [-key keyfile] [-keyform der | pem]\n"
  	    "    [-keyout file] [-md4 | -md5 | -sha1] [-modulus]\n"
  	    "    [-multivalue-rdn] [-nameopt option] [-new] [-newhdr]\n"
! 	    "    [-newkey arg] [-no-asn1-kludge] [-nodes] [-noout]\n"
  	    "    [-out file] [-outform der | pem] [-passin arg]\n"
  	    "    [-passout arg] [-pkeyopt opt:value] [-pubkey]\n"
  	    "    [-reqexts section] [-reqopt option] [-set_serial n]\n"
--- 531,542 ----
  req_usage(void)
  {
  	fprintf(stderr,
! 	    "usage: req [-addext ext] [-batch] [-config file]\n"
  	    "    [-days n] [-extensions section] [-in file]\n"
  	    "    [-inform der | pem] [-key keyfile] [-keyform der | pem]\n"
  	    "    [-keyout file] [-md4 | -md5 | -sha1] [-modulus]\n"
  	    "    [-multivalue-rdn] [-nameopt option] [-new] [-newhdr]\n"
! 	    "    [-newkey arg] [-nodes] [-noout]\n"
  	    "    [-out file] [-outform der | pem] [-passin arg]\n"
  	    "    [-passout arg] [-pkeyopt opt:value] [-pubkey]\n"
  	    "    [-reqexts section] [-reqopt option] [-set_serial n]\n"
***************
*** 851,861 ****
  		BIO_printf(bio_err, "-----\n");
  	}
  	if (!req_config.newreq) {
- 		/*
- 		 * Since we are using a pre-existing certificate request, the
- 		 * kludge 'format' info should not be changed.
- 		 */
- 		req_config.kludge = -1;
  		if (req_config.infile == NULL)
  			BIO_set_fp(in, stdin, BIO_NOCLOSE);
  		else {
--- 838,843 ----
***************
*** 890,899 ****
  			}
  			i = make_REQ(req, pkey, req_config.subj, req_config.multirdn, !req_config.x509, req_config.chtype);
  			req_config.subj = NULL;	/* done processing '-subj' option */
- 			if ((req_config.kludge > 0) && !sk_X509_ATTRIBUTE_num(req->req_info->attributes)) {
- 				sk_X509_ATTRIBUTE_free(req->req_info->attributes);
- 				req->req_info->attributes = NULL;
- 			}
  			if (!i) {
  				BIO_printf(bio_err, "problems making Certificate Request\n");
  				goto end;
--- 872,877 ----