diff options
author | bcook <> | 2015-02-07 04:09:43 +0000 |
---|---|---|
committer | bcook <> | 2015-02-07 04:09:43 +0000 |
commit | a6d663db02ac0a71cccf58cb65c2fd12eb475516 (patch) | |
tree | 0284aa781a8a760fe0cc3218fb9e10412abc7cd5 /src/usr.bin/openssl/ca.c | |
parent | 48c8f1168082cd30fdd7d7d05f9a81c1b1e2ed14 (diff) | |
download | openbsd-a6d663db02ac0a71cccf58cb65c2fd12eb475516.tar.gz openbsd-a6d663db02ac0a71cccf58cb65c2fd12eb475516.tar.bz2 openbsd-a6d663db02ac0a71cccf58cb65c2fd12eb475516.zip |
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@
Diffstat (limited to 'src/usr.bin/openssl/ca.c')
-rw-r--r-- | src/usr.bin/openssl/ca.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 @@ | |||
1 | /* $OpenBSD: ca.c,v 1.3 2014/09/01 20:54:37 doug Exp $ */ | 1 | /* $OpenBSD: ca.c,v 1.4 2015/02/07 04:09:43 bcook Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -291,8 +291,8 @@ ca_main(int argc, char **argv) | |||
291 | STACK_OF(CONF_VALUE) * attribs = NULL; | 291 | STACK_OF(CONF_VALUE) * attribs = NULL; |
292 | STACK_OF(X509) * cert_sk = NULL; | 292 | STACK_OF(X509) * cert_sk = NULL; |
293 | STACK_OF(OPENSSL_STRING) * sigopts = NULL; | 293 | STACK_OF(OPENSSL_STRING) * sigopts = NULL; |
294 | #define BSIZE 256 | 294 | #define BUFLEN 256 |
295 | char buf[3][BSIZE]; | 295 | char buf[3][BUFLEN]; |
296 | #ifndef OPENSSL_NO_ENGINE | 296 | #ifndef OPENSSL_NO_ENGINE |
297 | char *engine = NULL; | 297 | char *engine = NULL; |
298 | #endif | 298 | #endif |