===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/req.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -c -r1.15 -r1.16
*** src/usr.bin/openssl/req.c	2018/02/07 05:47:55	1.15
--- src/usr.bin/openssl/req.c	2019/07/03 03:24:02	1.16
***************
*** 1,4 ****
! /* $OpenBSD: req.c,v 1.15 2018/02/07 05:47:55 jsing Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
--- 1,4 ----
! /* $OpenBSD: req.c,v 1.16 2019/07/03 03:24:02 deraadt Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
***************
*** 1030,1036 ****
  			if ((nid = OBJ_txt2nid(type)) == NID_undef)
  				goto start;
  			ret = snprintf(buf, sizeof buf, "%s_default", v->name);
! 			if (ret == -1 || ret >= sizeof(buf)) {
  				BIO_printf(bio_err, "Name '%s' too long for default\n",
  				    v->name);
  				return 0;
--- 1030,1036 ----
  			if ((nid = OBJ_txt2nid(type)) == NID_undef)
  				goto start;
  			ret = snprintf(buf, sizeof buf, "%s_default", v->name);
! 			if (ret < 0 || ret >= sizeof(buf)) {
  				BIO_printf(bio_err, "Name '%s' too long for default\n",
  				    v->name);
  				return 0;
***************
*** 1040,1046 ****
  				def = "";
  			}
  			ret = snprintf(buf, sizeof buf, "%s_value", v->name);
! 			if (ret == -1 || ret >= sizeof(buf)) {
  				BIO_printf(bio_err, "Name '%s' too long for value\n",
  				    v->name);
  				return 0;
--- 1040,1046 ----
  				def = "";
  			}
  			ret = snprintf(buf, sizeof buf, "%s_value", v->name);
! 			if (ret < 0 || ret >= sizeof(buf)) {
  				BIO_printf(bio_err, "Name '%s' too long for value\n",
  				    v->name);
  				return 0;
***************
*** 1050,1056 ****
  				value = NULL;
  			}
  			ret = snprintf(buf, sizeof buf, "%s_min", v->name);
! 			if (ret == -1 || ret >= sizeof(buf)) {
  				BIO_printf(bio_err, "Name '%s' too long for min\n",
  				    v->name);
  				return 0;
--- 1050,1056 ----
  				value = NULL;
  			}
  			ret = snprintf(buf, sizeof buf, "%s_min", v->name);
! 			if (ret < 0 || ret >= sizeof(buf)) {
  				BIO_printf(bio_err, "Name '%s' too long for min\n",
  				    v->name);
  				return 0;
***************
*** 1060,1066 ****
  				n_min = -1;
  			}
  			ret = snprintf(buf, sizeof buf, "%s_max", v->name);
! 			if (ret == -1 || ret >= sizeof(buf)) {
  				BIO_printf(bio_err, "Name '%s' too long for max\n",
  				    v->name);
  				return 0;
--- 1060,1066 ----
  				n_min = -1;
  			}
  			ret = snprintf(buf, sizeof buf, "%s_max", v->name);
! 			if (ret < 0 || ret >= sizeof(buf)) {
  				BIO_printf(bio_err, "Name '%s' too long for max\n",
  				    v->name);
  				return 0;
***************
*** 1098,1104 ****
  				if ((nid = OBJ_txt2nid(type)) == NID_undef)
  					goto start2;
  				ret = snprintf(buf, sizeof buf, "%s_default", type);
! 				if (ret == -1 || ret >= sizeof(buf)) {
  					BIO_printf(bio_err, "Name '%s' too long for default\n",
  					    v->name);
  					return 0;
--- 1098,1104 ----
  				if ((nid = OBJ_txt2nid(type)) == NID_undef)
  					goto start2;
  				ret = snprintf(buf, sizeof buf, "%s_default", type);
! 				if (ret < 0 || ret >= sizeof(buf)) {
  					BIO_printf(bio_err, "Name '%s' too long for default\n",
  					    v->name);
  					return 0;
***************
*** 1109,1115 ****
  					def = "";
  				}
  				ret = snprintf(buf, sizeof buf, "%s_value", type);
! 				if (ret == -1 || ret >= sizeof(buf)) {
  					BIO_printf(bio_err, "Name '%s' too long for value\n",
  					    v->name);
  					return 0;
--- 1109,1115 ----
  					def = "";
  				}
  				ret = snprintf(buf, sizeof buf, "%s_value", type);
! 				if (ret < 0 || ret >= sizeof(buf)) {
  					BIO_printf(bio_err, "Name '%s' too long for value\n",
  					    v->name);
  					return 0;
***************
*** 1120,1126 ****
  					value = NULL;
  				}
  				ret = snprintf(buf, sizeof buf, "%s_min", type);
! 				if (ret == -1 || ret >= sizeof(buf)) {
  					BIO_printf(bio_err, "Name '%s' too long for min\n",
  					    v->name);
  					return 0;
--- 1120,1126 ----
  					value = NULL;
  				}
  				ret = snprintf(buf, sizeof buf, "%s_min", type);
! 				if (ret < 0 || ret >= sizeof(buf)) {
  					BIO_printf(bio_err, "Name '%s' too long for min\n",
  					    v->name);
  					return 0;
***************
*** 1130,1136 ****
  					n_min = -1;
  				}
  				ret = snprintf(buf, sizeof buf, "%s_max", type);
! 				if (ret == -1 || ret >= sizeof(buf)) {
  					BIO_printf(bio_err, "Name '%s' too long for max\n",
  					    v->name);
  					return 0;
--- 1130,1136 ----
  					n_min = -1;
  				}
  				ret = snprintf(buf, sizeof buf, "%s_max", type);
! 				if (ret < 0 || ret >= sizeof(buf)) {
  					BIO_printf(bio_err, "Name '%s' too long for max\n",
  					    v->name);
  					return 0;