From a6d663db02ac0a71cccf58cb65c2fd12eb475516 Mon Sep 17 00:00:00 2001
From: bcook <>
Date: Sat, 7 Feb 2015 04:09:43 +0000
Subject: Modify BSIZE to BUFLEN to avoid redefinition on HP-UX.

HP-UX defines BSIZE in its <sys/param.h>, and there is a route where its
getting included as a side-effect. I tracked back to at least from HP-UX 9.0
ca. 1993, up to the latest, so the user namespace is polluted.

from kinichiro <kinichiro.inoguchi@gmail.com>

ok miod@, jsing@
---
 src/usr.bin/openssl/apps.c | 24 ++++++++++++------------
 src/usr.bin/openssl/ca.c   |  6 +++---
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/usr.bin/openssl/apps.c b/src/usr.bin/openssl/apps.c
index d652abc549..8cef15fbb1 100644
--- a/src/usr.bin/openssl/apps.c
+++ b/src/usr.bin/openssl/apps.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apps.c,v 1.24 2015/01/03 03:03:39 lteo Exp $ */
+/* $OpenBSD: apps.c,v 1.25 2015/02/07 04:09:43 bcook Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -1384,7 +1384,7 @@ static IMPLEMENT_LHASH_COMP_FN(index_serial, OPENSSL_CSTRING)
 static IMPLEMENT_LHASH_HASH_FN(index_name, OPENSSL_CSTRING)
 static IMPLEMENT_LHASH_COMP_FN(index_name, OPENSSL_CSTRING)
 
-#define BSIZE 256
+#define BUFLEN 256
 
 BIGNUM *
 load_serial(char *serialfile, int create, ASN1_INTEGER **retai)
@@ -1442,7 +1442,7 @@ int
 save_serial(char *serialfile, char *suffix, BIGNUM *serial,
     ASN1_INTEGER **retai)
 {
-	char buf[1][BSIZE];
+	char buf[1][BUFLEN];
 	BIO *out = NULL;
 	int ret = 0, n;
 	ASN1_INTEGER *ai = NULL;
@@ -1452,12 +1452,12 @@ save_serial(char *serialfile, char *suffix, BIGNUM *serial,
 		j = strlen(serialfile);
 	else
 		j = strlen(serialfile) + strlen(suffix) + 1;
-	if (j >= BSIZE) {
+	if (j >= BUFLEN) {
 		BIO_printf(bio_err, "file name too long\n");
 		goto err;
 	}
 	if (suffix == NULL)
-		n = strlcpy(buf[0], serialfile, BSIZE);
+		n = strlcpy(buf[0], serialfile, BUFLEN);
 	else
 		n = snprintf(buf[0], sizeof buf[0], "%s.%s",
 		    serialfile, suffix);
@@ -1498,14 +1498,14 @@ err:
 int
 rotate_serial(char *serialfile, char *new_suffix, char *old_suffix)
 {
-	char buf[5][BSIZE];
+	char buf[5][BUFLEN];
 	int i, j;
 
 	i = strlen(serialfile) + strlen(old_suffix);
 	j = strlen(serialfile) + strlen(new_suffix);
 	if (i > j)
 		j = i;
-	if (j + 1 >= BSIZE) {
+	if (j + 1 >= BUFLEN) {
 		BIO_printf(bio_err, "file name too long\n");
 		goto err;
 	}
@@ -1570,7 +1570,7 @@ load_index(char *dbfile, DB_ATTR *db_attr)
 	TXT_DB *tmpdb = NULL;
 	BIO *in = BIO_new(BIO_s_file());
 	CONF *dbattr_conf = NULL;
-	char buf[1][BSIZE];
+	char buf[1][BUFLEN];
 	long errorline = -1;
 
 	if (in == NULL) {
@@ -1650,7 +1650,7 @@ index_index(CA_DB *db)
 int
 save_index(const char *dbfile, const char *suffix, CA_DB *db)
 {
-	char buf[3][BSIZE];
+	char buf[3][BUFLEN];
 	BIO *out = BIO_new(BIO_s_file());
 	int j;
 
@@ -1659,7 +1659,7 @@ save_index(const char *dbfile, const char *suffix, CA_DB *db)
 		goto err;
 	}
 	j = strlen(dbfile) + strlen(suffix);
-	if (j + 6 >= BSIZE) {
+	if (j + 6 >= BUFLEN) {
 		BIO_printf(bio_err, "file name too long\n");
 		goto err;
 	}
@@ -1700,14 +1700,14 @@ err:
 int
 rotate_index(const char *dbfile, const char *new_suffix, const char *old_suffix)
 {
-	char buf[5][BSIZE];
+	char buf[5][BUFLEN];
 	int i, j;
 
 	i = strlen(dbfile) + strlen(old_suffix);
 	j = strlen(dbfile) + strlen(new_suffix);
 	if (i > j)
 		j = i;
-	if (j + 6 >= BSIZE) {
+	if (j + 6 >= BUFLEN) {
 		BIO_printf(bio_err, "file name too long\n");
 		goto err;
 	}
diff --git a/src/usr.bin/openssl/ca.c b/src/usr.bin/openssl/ca.c
index 0e2e1c6450..c5ab691600 100644
--- a/src/usr.bin/openssl/ca.c
+++ b/src/usr.bin/openssl/ca.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ca.c,v 1.3 2014/09/01 20:54:37 doug Exp $ */
+/* $OpenBSD: ca.c,v 1.4 2015/02/07 04:09:43 bcook Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -291,8 +291,8 @@ ca_main(int argc, char **argv)
 	STACK_OF(CONF_VALUE) * attribs = NULL;
 	STACK_OF(X509) * cert_sk = NULL;
 	STACK_OF(OPENSSL_STRING) * sigopts = NULL;
-#define BSIZE 256
-	char buf[3][BSIZE];
+#define BUFLEN 256
+	char buf[3][BUFLEN];
 #ifndef OPENSSL_NO_ENGINE
 	char *engine = NULL;
 #endif
-- 
cgit v1.2.3-55-g6feb