===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/ca.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -c -r1.50 -r1.51
*** src/usr.bin/openssl/ca.c	2021/10/22 09:44:30	1.50
--- src/usr.bin/openssl/ca.c	2021/10/23 12:00:18	1.51
***************
*** 1,4 ****
! /* $OpenBSD: ca.c,v 1.50 2021/10/22 09:44:30 tb Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
--- 1,4 ----
! /* $OpenBSD: ca.c,v 1.51 2021/10/23 12:00:18 tb Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
***************
*** 1784,1790 ****
  
  		if (ca_config.msie_hack) {
  			/* assume all type should be strings */
! 			nid = OBJ_obj2nid(ne->object);
  			if (nid == NID_undef)
  				goto err;
  
--- 1784,1790 ----
  
  		if (ca_config.msie_hack) {
  			/* assume all type should be strings */
! 			nid = OBJ_obj2nid(X509_NAME_ENTRY_get_object(ne));
  			if (nid == NID_undef)
  				goto err;
  
***************
*** 2328,2334 ****
  	X509_REQ *req = NULL;
  	CONF_VALUE *cv = NULL;
  	NETSCAPE_SPKI *spki = NULL;
- 	X509_REQ_INFO *ri;
  	char *type, *buf;
  	EVP_PKEY *pktmp = NULL;
  	X509_NAME *n = NULL;
--- 2328,2333 ----
***************
*** 2370,2377 ****
  	/*
  	 * Build up the subject name set.
  	 */
! 	ri = req->req_info;
! 	n = ri->subject;
  
  	for (i = 0;; i++) {
  		if (sk_CONF_VALUE_num(sk) <= i)
--- 2369,2375 ----
  	/*
  	 * Build up the subject name set.
  	 */
! 	n = X509_REQ_get_subject_name(req);
  
  	for (i = 0;; i++) {
  		if (sk_CONF_VALUE_num(sk) <= i)