From: miod <miod@openbsd.org>
Date: Wed, 23 Jul 2014 20:43:56 +0000 (+0000)
Subject: Make sure PEM_def_callback() correctly handles negative buffer sizes; all uses
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=22ef553aae387132af612332a700c963f580fd98;p=openbsd

Make sure PEM_def_callback() correctly handles negative buffer sizes; all uses
within libcrypto are safe, but until we can change this function prototype to
use size_t instead of int, better be safe than sorry.

tweaks and ok guenther@
---

diff --git a/lib/libcrypto/pem/pem_lib.c b/lib/libcrypto/pem/pem_lib.c
index 8e5c82c245c..26b1876f368 100644
--- a/lib/libcrypto/pem/pem_lib.c
+++ b/lib/libcrypto/pem/pem_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem_lib.c,v 1.33 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: pem_lib.c,v 1.34 2014/07/23 20:43:56 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -85,17 +85,22 @@ static int load_iv(char **fromp, unsigned char *to, int num);
 static int check_pem(const char *nm, const char *name);
 int pem_check_suffix(const char *pem_str, const char *suffix);
 
+/* XXX LSSL ABI XXX return value and `num' ought to be size_t */
 int
 PEM_def_callback(char *buf, int num, int w, void *key)
 {
-	int i, j;
+	size_t l;
+	int i;
 	const char *prompt;
 
 	if (key) {
-		i = strlen(key);
-		i = (i > num) ? num : i;
-		memcpy(buf, key, i);
-		return (i);
+		l = strlen(key);
+		if (num < 0)
+			return -1;
+		if (l > (size_t)num)
+			l = (size_t)num;
+		memcpy(buf, key, l);
+		return (int)l;
 	}
 
 	prompt = EVP_get_pw_prompt();
@@ -110,13 +115,15 @@ PEM_def_callback(char *buf, int num, int w, void *key)
 			memset(buf, 0, num);
 			return (-1);
 		}
-		j = strlen(buf);
-		if (j < MIN_LENGTH) {
-			fprintf(stderr, "phrase is too short, needs to be at least %d chars\n", MIN_LENGTH);
+		l = strlen(buf);
+		if (l < MIN_LENGTH) {
+			fprintf(stderr, "phrase is too short, "
+			    "needs to be at least %zu chars\n",
+			    (size_t)MIN_LENGTH);
 		} else
 			break;
 	}
-	return (j);
+	return (int)l;
 }
 
 void
diff --git a/lib/libssl/src/crypto/pem/pem_lib.c b/lib/libssl/src/crypto/pem/pem_lib.c
index 8e5c82c245c..26b1876f368 100644
--- a/lib/libssl/src/crypto/pem/pem_lib.c
+++ b/lib/libssl/src/crypto/pem/pem_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem_lib.c,v 1.33 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: pem_lib.c,v 1.34 2014/07/23 20:43:56 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -85,17 +85,22 @@ static int load_iv(char **fromp, unsigned char *to, int num);
 static int check_pem(const char *nm, const char *name);
 int pem_check_suffix(const char *pem_str, const char *suffix);
 
+/* XXX LSSL ABI XXX return value and `num' ought to be size_t */
 int
 PEM_def_callback(char *buf, int num, int w, void *key)
 {
-	int i, j;
+	size_t l;
+	int i;
 	const char *prompt;
 
 	if (key) {
-		i = strlen(key);
-		i = (i > num) ? num : i;
-		memcpy(buf, key, i);
-		return (i);
+		l = strlen(key);
+		if (num < 0)
+			return -1;
+		if (l > (size_t)num)
+			l = (size_t)num;
+		memcpy(buf, key, l);
+		return (int)l;
 	}
 
 	prompt = EVP_get_pw_prompt();
@@ -110,13 +115,15 @@ PEM_def_callback(char *buf, int num, int w, void *key)
 			memset(buf, 0, num);
 			return (-1);
 		}
-		j = strlen(buf);
-		if (j < MIN_LENGTH) {
-			fprintf(stderr, "phrase is too short, needs to be at least %d chars\n", MIN_LENGTH);
+		l = strlen(buf);
+		if (l < MIN_LENGTH) {
+			fprintf(stderr, "phrase is too short, "
+			    "needs to be at least %zu chars\n",
+			    (size_t)MIN_LENGTH);
 		} else
 			break;
 	}
-	return (j);
+	return (int)l;
 }
 
 void