summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/libssl/src/apps/apps.c1
-rw-r--r--lib/libssl/src/apps/ca.c1
-rw-r--r--lib/libssl/src/apps/crl.c1
-rw-r--r--lib/libssl/src/apps/dgst.c1
-rw-r--r--lib/libssl/src/apps/enc.c2
-rw-r--r--lib/libssl/src/apps/s_client.c1
-rw-r--r--lib/libssl/src/apps/s_server.c1
-rw-r--r--lib/libssl/src/apps/s_time.c2
-rw-r--r--lib/libssl/src/apps/speed.c2
-rw-r--r--lib/libssl/src/apps/x509.c1
10 files changed, 0 insertions, 13 deletions
diff --git a/lib/libssl/src/apps/apps.c b/lib/libssl/src/apps/apps.c
index 3b7adf372fa..259981ea0ff 100644
--- a/lib/libssl/src/apps/apps.c
+++ b/lib/libssl/src/apps/apps.c
@@ -1383,7 +1383,6 @@ 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)
-#undef BSIZE
#define BSIZE 256
BIGNUM *
diff --git a/lib/libssl/src/apps/ca.c b/lib/libssl/src/apps/ca.c
index 617264bb2f1..a66a580ded6 100644
--- a/lib/libssl/src/apps/ca.c
+++ b/lib/libssl/src/apps/ca.c
@@ -307,7 +307,6 @@ ca_main(int argc, char **argv)
STACK_OF(CONF_VALUE) * attribs = NULL;
STACK_OF(X509) * cert_sk = NULL;
STACK_OF(OPENSSL_STRING) * sigopts = NULL;
-#undef BSIZE
#define BSIZE 256
char buf[3][BSIZE];
#ifndef OPENSSL_NO_ENGINE
diff --git a/lib/libssl/src/apps/crl.c b/lib/libssl/src/apps/crl.c
index 864f3ca530c..fb963274fff 100644
--- a/lib/libssl/src/apps/crl.c
+++ b/lib/libssl/src/apps/crl.c
@@ -67,7 +67,6 @@
#include <openssl/pem.h>
-#undef POSTFIX
#define POSTFIX ".rvk"
static const char *crl_usage[] = {
diff --git a/lib/libssl/src/apps/dgst.c b/lib/libssl/src/apps/dgst.c
index 04f49580fa7..523f5ccc6ba 100644
--- a/lib/libssl/src/apps/dgst.c
+++ b/lib/libssl/src/apps/dgst.c
@@ -68,7 +68,6 @@
#include <openssl/pem.h>
#include <openssl/hmac.h>
-#undef BUFSIZE
#define BUFSIZE 1024*8
diff --git a/lib/libssl/src/apps/enc.c b/lib/libssl/src/apps/enc.c
index e2e6fecba68..eb986623f27 100644
--- a/lib/libssl/src/apps/enc.c
+++ b/lib/libssl/src/apps/enc.c
@@ -71,8 +71,6 @@
#include <ctype.h>
int set_hex(char *in, unsigned char *out, int size);
-#undef SIZE
-#undef BSIZE
#define SIZE (512)
#define BSIZE (8*1024)
diff --git a/lib/libssl/src/apps/s_client.c b/lib/libssl/src/apps/s_client.c
index 4bfdcab9181..87966e30d9d 100644
--- a/lib/libssl/src/apps/s_client.c
+++ b/lib/libssl/src/apps/s_client.c
@@ -171,7 +171,6 @@
/*#define TEST_CERT "client.pem" *//* no default cert. */
-#undef BUFSIZZ
#define BUFSIZZ 1024*8
extern int verify_depth;
diff --git a/lib/libssl/src/apps/s_server.c b/lib/libssl/src/apps/s_server.c
index 37c6e1b9a75..12f6c33c132 100644
--- a/lib/libssl/src/apps/s_server.c
+++ b/lib/libssl/src/apps/s_server.c
@@ -230,7 +230,6 @@ get_dh512(void)
/* static int load_CA(SSL_CTX *ctx, char *file);*/
-#undef BUFSIZZ
#define BUFSIZZ 16*1024
static int bufsize = BUFSIZZ;
static int accept_socket = -1;
diff --git a/lib/libssl/src/apps/s_time.c b/lib/libssl/src/apps/s_time.c
index e048a551b29..4e95a226649 100644
--- a/lib/libssl/src/apps/s_time.c
+++ b/lib/libssl/src/apps/s_time.c
@@ -81,7 +81,6 @@
/*#define TEST_CERT "client.pem" *//* no default cert. */
-#undef BUFSIZZ
#define BUFSIZZ 1024*10
#define MYBUFSIZ 1024*8
@@ -91,7 +90,6 @@
#define min(a,b) (((a) < (b)) ? (a) : (b))
#define max(a,b) (((a) > (b)) ? (a) : (b))
-#undef SECONDS
#define SECONDS 30
extern int verify_depth;
extern int verify_error;
diff --git a/lib/libssl/src/apps/speed.c b/lib/libssl/src/apps/speed.c
index 29a4b181db0..83564be6fd5 100644
--- a/lib/libssl/src/apps/speed.c
+++ b/lib/libssl/src/apps/speed.c
@@ -73,7 +73,6 @@
#ifndef OPENSSL_NO_SPEED
-#undef SECONDS
#define SECONDS 3
#define RSA_SECONDS 10
#define DSA_SECONDS 10
@@ -175,7 +174,6 @@
#include "./testrsa.h"
#endif
-#undef BUFSIZE
#define BUFSIZE ((long)1024*8+1)
int run = 0;
diff --git a/lib/libssl/src/apps/x509.c b/lib/libssl/src/apps/x509.c
index fb301d3ea8a..899ed00cc1e 100644
--- a/lib/libssl/src/apps/x509.c
+++ b/lib/libssl/src/apps/x509.c
@@ -78,7 +78,6 @@
#endif
-#undef POSTFIX
#define POSTFIX ".srl"
#define DEF_DAYS 30