summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2014-05-18 16:34:04 +0000
committerjsing <>2014-05-18 16:34:04 +0000
commit127e6e6abe32f23e8328bb307933d826a0ab25be (patch)
tree974e53adfd905034ceaa4d8b9aa1f6cb29926a08
parent875b6a262fda4de0349a7c9dd91e8078bf971f83 (diff)
downloadopenbsd-127e6e6abe32f23e8328bb307933d826a0ab25be.tar.gz
openbsd-127e6e6abe32f23e8328bb307933d826a0ab25be.tar.bz2
openbsd-127e6e6abe32f23e8328bb307933d826a0ab25be.zip
W_OK comes via unistd.h - nuke several #ifndef W_OK that attempt to handle
missing defines.
-rw-r--r--src/lib/libssl/src/apps/ca.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/lib/libssl/src/apps/ca.c b/src/lib/libssl/src/apps/ca.c
index 23c1318699..59f1969023 100644
--- a/src/lib/libssl/src/apps/ca.c
+++ b/src/lib/libssl/src/apps/ca.c
@@ -60,10 +60,6 @@
60 60
61#include <sys/types.h> 61#include <sys/types.h>
62 62
63#ifndef W_OK
64#include <sys/file.h>
65#endif
66
67#include <ctype.h> 63#include <ctype.h>
68#include <stdio.h> 64#include <stdio.h>
69#include <stdlib.h> 65#include <stdlib.h>
@@ -84,18 +80,11 @@
84#include <openssl/x509.h> 80#include <openssl/x509.h>
85#include <openssl/x509v3.h> 81#include <openssl/x509v3.h>
86 82
87#ifndef W_OK 83#define BASE_SECTION "ca"
88#define F_OK 0
89#define X_OK 1
90#define W_OK 2
91#define R_OK 4
92#endif
93
94#define BASE_SECTION "ca"
95 84
96#define ENV_DEFAULT_CA "default_ca" 85#define ENV_DEFAULT_CA "default_ca"
97 86
98#define STRING_MASK "string_mask" 87#define STRING_MASK "string_mask"
99#define UTF8_IN "utf8" 88#define UTF8_IN "utf8"
100 89
101#define ENV_DIR "dir" 90#define ENV_DIR "dir"