From ef84a12d8fc3f2dacb57102d5f84bfb4025a320a Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Wed, 3 Jul 2019 03:24:04 +0000
Subject: snprintf/vsnprintf return < 0 on error, rather than -1.

---
 src/lib/libc/net/inet_net_ntop.c    |  4 ++--
 src/lib/libcrypto/objects/obj_dat.c |  6 +++---
 src/lib/libcrypto/ts/ts_rsp_sign.c  |  4 ++--
 src/usr.bin/nc/socks.c              |  6 +++---
 src/usr.bin/openssl/apps.c          |  4 ++--
 src/usr.bin/openssl/ca.c            |  4 ++--
 src/usr.bin/openssl/req.c           | 18 +++++++++---------
 src/usr.bin/openssl/s_time.c        |  4 ++--
 8 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'src')

diff --git a/src/lib/libc/net/inet_net_ntop.c b/src/lib/libc/net/inet_net_ntop.c
index 652b24076e..1f1c4bed12 100644
--- a/src/lib/libc/net/inet_net_ntop.c
+++ b/src/lib/libc/net/inet_net_ntop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet_net_ntop.c,v 1.8 2015/05/14 11:52:43 jsg Exp $	*/
+/*	$OpenBSD: inet_net_ntop.c,v 1.9 2019/07/03 03:24:04 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2012 by Gilles Chehade <gilles@openbsd.org>
@@ -151,7 +151,7 @@ inet_net_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size)
 		return (NULL);
 
 	ret = snprintf(dst, size, "%s/%d", buf, bits);
-	if (ret == -1 || ret >= size) {
+	if (ret < 0 || ret >= size) {
 		errno = EMSGSIZE;
 		return (NULL); 
 	}
diff --git a/src/lib/libcrypto/objects/obj_dat.c b/src/lib/libcrypto/objects/obj_dat.c
index 6c50aa980a..c0b63e4d85 100644
--- a/src/lib/libcrypto/objects/obj_dat.c
+++ b/src/lib/libcrypto/objects/obj_dat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: obj_dat.c,v 1.41 2018/09/08 13:49:26 tb Exp $ */
+/* $OpenBSD: obj_dat.c,v 1.42 2019/07/03 03:24:04 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -608,7 +608,7 @@ OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name)
 				goto err;
 			i = snprintf(buf, buf_len, ".%s", bndec);
 			free(bndec);
-			if (i == -1)
+			if (i < 0)
 				goto err;
 			if (i >= buf_len) {
 				buf_len = 0;
@@ -619,7 +619,7 @@ OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name)
 			ret += i;
 		} else {
 			i = snprintf(buf, buf_len, ".%lu", l);
-			if (i == -1)
+			if (i < 0)
 				goto err;
 			if (i >= buf_len) {
 				buf_len = 0;
diff --git a/src/lib/libcrypto/ts/ts_rsp_sign.c b/src/lib/libcrypto/ts/ts_rsp_sign.c
index 9ab80160b3..6125fdd4be 100644
--- a/src/lib/libcrypto/ts/ts_rsp_sign.c
+++ b/src/lib/libcrypto/ts/ts_rsp_sign.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ts_rsp_sign.c,v 1.22 2018/05/13 15:04:05 tb Exp $ */
+/* $OpenBSD: ts_rsp_sign.c,v 1.23 2019/07/03 03:24:04 deraadt Exp $ */
 /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
  * project 2002.
  */
@@ -1001,7 +1001,7 @@ TS_RESP_set_genTime_with_precision(ASN1_GENERALIZEDTIME *asn1_time,
 	    "%04d%02d%02d%02d%02d%02d%sZ",
 	    tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
 	    tm->tm_hour, tm->tm_min, tm->tm_sec, usecstr);
-	if (rv == -1 || rv >= sizeof(genTime_str))
+	if (rv < 0 || rv >= sizeof(genTime_str))
 		goto err;
 
 	/* Now call OpenSSL to check and set our genTime value */
diff --git a/src/usr.bin/nc/socks.c b/src/usr.bin/nc/socks.c
index 856c3e7446..39e4331be3 100644
--- a/src/usr.bin/nc/socks.c
+++ b/src/usr.bin/nc/socks.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: socks.c,v 1.27 2019/01/10 12:44:54 mestre Exp $	*/
+/*	$OpenBSD: socks.c,v 1.28 2019/07/03 03:24:02 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1999 Niklas Hallqvist.  All rights reserved.
@@ -334,7 +334,7 @@ socks_connect(const char *host, const char *port,
 			    "CONNECT %s:%d HTTP/1.0\r\n",
 			    host, ntohs(serverport));
 		}
-		if (r == -1 || (size_t)r >= sizeof(buf))
+		if (r < 0 || (size_t)r >= sizeof(buf))
 			errx(1, "hostname too long");
 		r = strlen(buf);
 
@@ -357,7 +357,7 @@ socks_connect(const char *host, const char *port,
 				errx(1, "Proxy username/password too long");
 			r = snprintf(buf, sizeof(buf), "Proxy-Authorization: "
 			    "Basic %s\r\n", resp);
-			if (r == -1 || (size_t)r >= sizeof(buf))
+			if (r < 0 || (size_t)r >= sizeof(buf))
 				errx(1, "Proxy auth response too long");
 			r = strlen(buf);
 			if ((cnt = atomicio(vwrite, proxyfd, buf, r)) != r)
diff --git a/src/usr.bin/openssl/apps.c b/src/usr.bin/openssl/apps.c
index 47e21265af..39ce7a5f34 100644
--- a/src/usr.bin/openssl/apps.c
+++ b/src/usr.bin/openssl/apps.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apps.c,v 1.52 2019/06/28 13:35:02 deraadt Exp $ */
+/* $OpenBSD: apps.c,v 1.53 2019/07/03 03:24:02 deraadt Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -1328,7 +1328,7 @@ save_serial(char *serialfile, char *suffix, BIGNUM *serial,
 	else
 		n = snprintf(serialpath, sizeof serialpath, "%s.%s",
 		    serialfile, suffix);
-	if (n == -1 || n >= sizeof(serialpath)) {
+	if (n < 0 || n >= sizeof(serialpath)) {
 		BIO_printf(bio_err, "serial too long\n");
 		goto err;
 	}
diff --git a/src/usr.bin/openssl/ca.c b/src/usr.bin/openssl/ca.c
index 2e79849572..ac183f28bf 100644
--- a/src/usr.bin/openssl/ca.c
+++ b/src/usr.bin/openssl/ca.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ca.c,v 1.26 2018/02/07 05:47:55 jsing Exp $ */
+/* $OpenBSD: ca.c,v 1.27 2019/07/03 03:24:02 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1109,7 +1109,7 @@ ca_main(int argc, char **argv)
 				k = snprintf(pempath, sizeof(pempath),
 				    "%s/%s.pem", outdir, serialstr);
 				free(serialstr);
-				if (k == -1 || k >= sizeof(pempath)) {
+				if (k < 0 || k >= sizeof(pempath)) {
 					BIO_printf(bio_err,
 					    "certificate file name too long\n");
 					goto err;
diff --git a/src/usr.bin/openssl/req.c b/src/usr.bin/openssl/req.c
index c5cae4df89..6b7dfb98b9 100644
--- a/src/usr.bin/openssl/req.c
+++ b/src/usr.bin/openssl/req.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: req.c,v 1.15 2018/02/07 05:47:55 jsing Exp $ */
+/* $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,7 +1030,7 @@ prompt_info(X509_REQ * req,
 			if ((nid = OBJ_txt2nid(type)) == NID_undef)
 				goto start;
 			ret = snprintf(buf, sizeof buf, "%s_default", v->name);
-			if (ret == -1 || ret >= sizeof(buf)) {
+			if (ret < 0 || ret >= sizeof(buf)) {
 				BIO_printf(bio_err, "Name '%s' too long for default\n",
 				    v->name);
 				return 0;
@@ -1040,7 +1040,7 @@ prompt_info(X509_REQ * req,
 				def = "";
 			}
 			ret = snprintf(buf, sizeof buf, "%s_value", v->name);
-			if (ret == -1 || ret >= sizeof(buf)) {
+			if (ret < 0 || ret >= sizeof(buf)) {
 				BIO_printf(bio_err, "Name '%s' too long for value\n",
 				    v->name);
 				return 0;
@@ -1050,7 +1050,7 @@ prompt_info(X509_REQ * req,
 				value = NULL;
 			}
 			ret = snprintf(buf, sizeof buf, "%s_min", v->name);
-			if (ret == -1 || ret >= sizeof(buf)) {
+			if (ret < 0 || ret >= sizeof(buf)) {
 				BIO_printf(bio_err, "Name '%s' too long for min\n",
 				    v->name);
 				return 0;
@@ -1060,7 +1060,7 @@ prompt_info(X509_REQ * req,
 				n_min = -1;
 			}
 			ret = snprintf(buf, sizeof buf, "%s_max", v->name);
-			if (ret == -1 || ret >= sizeof(buf)) {
+			if (ret < 0 || ret >= sizeof(buf)) {
 				BIO_printf(bio_err, "Name '%s' too long for max\n",
 				    v->name);
 				return 0;
@@ -1098,7 +1098,7 @@ start2:			for (;;) {
 				if ((nid = OBJ_txt2nid(type)) == NID_undef)
 					goto start2;
 				ret = snprintf(buf, sizeof buf, "%s_default", type);
-				if (ret == -1 || ret >= sizeof(buf)) {
+				if (ret < 0 || ret >= sizeof(buf)) {
 					BIO_printf(bio_err, "Name '%s' too long for default\n",
 					    v->name);
 					return 0;
@@ -1109,7 +1109,7 @@ start2:			for (;;) {
 					def = "";
 				}
 				ret = snprintf(buf, sizeof buf, "%s_value", type);
-				if (ret == -1 || ret >= sizeof(buf)) {
+				if (ret < 0 || ret >= sizeof(buf)) {
 					BIO_printf(bio_err, "Name '%s' too long for value\n",
 					    v->name);
 					return 0;
@@ -1120,7 +1120,7 @@ start2:			for (;;) {
 					value = NULL;
 				}
 				ret = snprintf(buf, sizeof buf, "%s_min", type);
-				if (ret == -1 || ret >= sizeof(buf)) {
+				if (ret < 0 || ret >= sizeof(buf)) {
 					BIO_printf(bio_err, "Name '%s' too long for min\n",
 					    v->name);
 					return 0;
@@ -1130,7 +1130,7 @@ start2:			for (;;) {
 					n_min = -1;
 				}
 				ret = snprintf(buf, sizeof buf, "%s_max", type);
-				if (ret == -1 || ret >= sizeof(buf)) {
+				if (ret < 0 || ret >= sizeof(buf)) {
 					BIO_printf(bio_err, "Name '%s' too long for max\n",
 					    v->name);
 					return 0;
diff --git a/src/usr.bin/openssl/s_time.c b/src/usr.bin/openssl/s_time.c
index 1506ca356a..3263a2dff3 100644
--- a/src/usr.bin/openssl/s_time.c
+++ b/src/usr.bin/openssl/s_time.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s_time.c,v 1.32 2018/09/17 15:37:35 cheloha Exp $ */
+/* $OpenBSD: s_time.c,v 1.33 2019/07/03 03:24:02 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -377,7 +377,7 @@ run_test(SSL *scon)
 	if (s_time_config.www_path != NULL) {
 		retval = snprintf(buf, sizeof buf,
 		    "GET %s HTTP/1.0\r\n\r\n", s_time_config.www_path);
-		if (retval == -1 || retval >= sizeof buf) {
+		if (retval < 0 || retval >= sizeof buf) {
 			fprintf(stderr, "URL too long\n");
 			return 0;
 		}
-- 
cgit v1.2.3-55-g6feb