diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/src/apps/apps.c | 1 | ||||
| -rw-r--r-- | src/lib/libssl/src/apps/ca.c | 1 | ||||
| -rw-r--r-- | src/lib/libssl/src/apps/crl.c | 1 | ||||
| -rw-r--r-- | src/lib/libssl/src/apps/dgst.c | 1 | ||||
| -rw-r--r-- | src/lib/libssl/src/apps/enc.c | 2 | ||||
| -rw-r--r-- | src/lib/libssl/src/apps/s_client.c | 1 | ||||
| -rw-r--r-- | src/lib/libssl/src/apps/s_server.c | 1 | ||||
| -rw-r--r-- | src/lib/libssl/src/apps/s_time.c | 2 | ||||
| -rw-r--r-- | src/lib/libssl/src/apps/speed.c | 2 | ||||
| -rw-r--r-- | src/lib/libssl/src/apps/x509.c | 1 |
10 files changed, 0 insertions, 13 deletions
diff --git a/src/lib/libssl/src/apps/apps.c b/src/lib/libssl/src/apps/apps.c index 3b7adf372f..259981ea0f 100644 --- a/src/lib/libssl/src/apps/apps.c +++ b/src/lib/libssl/src/apps/apps.c | |||
| @@ -1383,7 +1383,6 @@ static IMPLEMENT_LHASH_COMP_FN(index_serial, OPENSSL_CSTRING) | |||
| 1383 | static IMPLEMENT_LHASH_HASH_FN(index_name, OPENSSL_CSTRING) | 1383 | static IMPLEMENT_LHASH_HASH_FN(index_name, OPENSSL_CSTRING) |
| 1384 | static IMPLEMENT_LHASH_COMP_FN(index_name, OPENSSL_CSTRING) | 1384 | static IMPLEMENT_LHASH_COMP_FN(index_name, OPENSSL_CSTRING) |
| 1385 | 1385 | ||
| 1386 | #undef BSIZE | ||
| 1387 | #define BSIZE 256 | 1386 | #define BSIZE 256 |
| 1388 | 1387 | ||
| 1389 | BIGNUM * | 1388 | BIGNUM * |
diff --git a/src/lib/libssl/src/apps/ca.c b/src/lib/libssl/src/apps/ca.c index 617264bb2f..a66a580ded 100644 --- a/src/lib/libssl/src/apps/ca.c +++ b/src/lib/libssl/src/apps/ca.c | |||
| @@ -307,7 +307,6 @@ ca_main(int argc, char **argv) | |||
| 307 | STACK_OF(CONF_VALUE) * attribs = NULL; | 307 | STACK_OF(CONF_VALUE) * attribs = NULL; |
| 308 | STACK_OF(X509) * cert_sk = NULL; | 308 | STACK_OF(X509) * cert_sk = NULL; |
| 309 | STACK_OF(OPENSSL_STRING) * sigopts = NULL; | 309 | STACK_OF(OPENSSL_STRING) * sigopts = NULL; |
| 310 | #undef BSIZE | ||
| 311 | #define BSIZE 256 | 310 | #define BSIZE 256 |
| 312 | char buf[3][BSIZE]; | 311 | char buf[3][BSIZE]; |
| 313 | #ifndef OPENSSL_NO_ENGINE | 312 | #ifndef OPENSSL_NO_ENGINE |
diff --git a/src/lib/libssl/src/apps/crl.c b/src/lib/libssl/src/apps/crl.c index 864f3ca530..fb963274ff 100644 --- a/src/lib/libssl/src/apps/crl.c +++ b/src/lib/libssl/src/apps/crl.c | |||
| @@ -67,7 +67,6 @@ | |||
| 67 | #include <openssl/pem.h> | 67 | #include <openssl/pem.h> |
| 68 | 68 | ||
| 69 | 69 | ||
| 70 | #undef POSTFIX | ||
| 71 | #define POSTFIX ".rvk" | 70 | #define POSTFIX ".rvk" |
| 72 | 71 | ||
| 73 | static const char *crl_usage[] = { | 72 | static const char *crl_usage[] = { |
diff --git a/src/lib/libssl/src/apps/dgst.c b/src/lib/libssl/src/apps/dgst.c index 04f49580fa..523f5ccc6b 100644 --- a/src/lib/libssl/src/apps/dgst.c +++ b/src/lib/libssl/src/apps/dgst.c | |||
| @@ -68,7 +68,6 @@ | |||
| 68 | #include <openssl/pem.h> | 68 | #include <openssl/pem.h> |
| 69 | #include <openssl/hmac.h> | 69 | #include <openssl/hmac.h> |
| 70 | 70 | ||
| 71 | #undef BUFSIZE | ||
| 72 | #define BUFSIZE 1024*8 | 71 | #define BUFSIZE 1024*8 |
| 73 | 72 | ||
| 74 | 73 | ||
diff --git a/src/lib/libssl/src/apps/enc.c b/src/lib/libssl/src/apps/enc.c index e2e6fecba6..eb986623f2 100644 --- a/src/lib/libssl/src/apps/enc.c +++ b/src/lib/libssl/src/apps/enc.c | |||
| @@ -71,8 +71,6 @@ | |||
| 71 | #include <ctype.h> | 71 | #include <ctype.h> |
| 72 | 72 | ||
| 73 | int set_hex(char *in, unsigned char *out, int size); | 73 | int set_hex(char *in, unsigned char *out, int size); |
| 74 | #undef SIZE | ||
| 75 | #undef BSIZE | ||
| 76 | 74 | ||
| 77 | #define SIZE (512) | 75 | #define SIZE (512) |
| 78 | #define BSIZE (8*1024) | 76 | #define BSIZE (8*1024) |
diff --git a/src/lib/libssl/src/apps/s_client.c b/src/lib/libssl/src/apps/s_client.c index 4bfdcab918..87966e30d9 100644 --- a/src/lib/libssl/src/apps/s_client.c +++ b/src/lib/libssl/src/apps/s_client.c | |||
| @@ -171,7 +171,6 @@ | |||
| 171 | 171 | ||
| 172 | /*#define TEST_CERT "client.pem" *//* no default cert. */ | 172 | /*#define TEST_CERT "client.pem" *//* no default cert. */ |
| 173 | 173 | ||
| 174 | #undef BUFSIZZ | ||
| 175 | #define BUFSIZZ 1024*8 | 174 | #define BUFSIZZ 1024*8 |
| 176 | 175 | ||
| 177 | extern int verify_depth; | 176 | extern int verify_depth; |
diff --git a/src/lib/libssl/src/apps/s_server.c b/src/lib/libssl/src/apps/s_server.c index 37c6e1b9a7..12f6c33c13 100644 --- a/src/lib/libssl/src/apps/s_server.c +++ b/src/lib/libssl/src/apps/s_server.c | |||
| @@ -230,7 +230,6 @@ get_dh512(void) | |||
| 230 | 230 | ||
| 231 | /* static int load_CA(SSL_CTX *ctx, char *file);*/ | 231 | /* static int load_CA(SSL_CTX *ctx, char *file);*/ |
| 232 | 232 | ||
| 233 | #undef BUFSIZZ | ||
| 234 | #define BUFSIZZ 16*1024 | 233 | #define BUFSIZZ 16*1024 |
| 235 | static int bufsize = BUFSIZZ; | 234 | static int bufsize = BUFSIZZ; |
| 236 | static int accept_socket = -1; | 235 | static int accept_socket = -1; |
diff --git a/src/lib/libssl/src/apps/s_time.c b/src/lib/libssl/src/apps/s_time.c index e048a551b2..4e95a22664 100644 --- a/src/lib/libssl/src/apps/s_time.c +++ b/src/lib/libssl/src/apps/s_time.c | |||
| @@ -81,7 +81,6 @@ | |||
| 81 | 81 | ||
| 82 | /*#define TEST_CERT "client.pem" *//* no default cert. */ | 82 | /*#define TEST_CERT "client.pem" *//* no default cert. */ |
| 83 | 83 | ||
| 84 | #undef BUFSIZZ | ||
| 85 | #define BUFSIZZ 1024*10 | 84 | #define BUFSIZZ 1024*10 |
| 86 | 85 | ||
| 87 | #define MYBUFSIZ 1024*8 | 86 | #define MYBUFSIZ 1024*8 |
| @@ -91,7 +90,6 @@ | |||
| 91 | #define min(a,b) (((a) < (b)) ? (a) : (b)) | 90 | #define min(a,b) (((a) < (b)) ? (a) : (b)) |
| 92 | #define max(a,b) (((a) > (b)) ? (a) : (b)) | 91 | #define max(a,b) (((a) > (b)) ? (a) : (b)) |
| 93 | 92 | ||
| 94 | #undef SECONDS | ||
| 95 | #define SECONDS 30 | 93 | #define SECONDS 30 |
| 96 | extern int verify_depth; | 94 | extern int verify_depth; |
| 97 | extern int verify_error; | 95 | extern int verify_error; |
diff --git a/src/lib/libssl/src/apps/speed.c b/src/lib/libssl/src/apps/speed.c index 29a4b181db..83564be6fd 100644 --- a/src/lib/libssl/src/apps/speed.c +++ b/src/lib/libssl/src/apps/speed.c | |||
| @@ -73,7 +73,6 @@ | |||
| 73 | 73 | ||
| 74 | #ifndef OPENSSL_NO_SPEED | 74 | #ifndef OPENSSL_NO_SPEED |
| 75 | 75 | ||
| 76 | #undef SECONDS | ||
| 77 | #define SECONDS 3 | 76 | #define SECONDS 3 |
| 78 | #define RSA_SECONDS 10 | 77 | #define RSA_SECONDS 10 |
| 79 | #define DSA_SECONDS 10 | 78 | #define DSA_SECONDS 10 |
| @@ -175,7 +174,6 @@ | |||
| 175 | #include "./testrsa.h" | 174 | #include "./testrsa.h" |
| 176 | #endif | 175 | #endif |
| 177 | 176 | ||
| 178 | #undef BUFSIZE | ||
| 179 | #define BUFSIZE ((long)1024*8+1) | 177 | #define BUFSIZE ((long)1024*8+1) |
| 180 | int run = 0; | 178 | int run = 0; |
| 181 | 179 | ||
diff --git a/src/lib/libssl/src/apps/x509.c b/src/lib/libssl/src/apps/x509.c index fb301d3ea8..899ed00cc1 100644 --- a/src/lib/libssl/src/apps/x509.c +++ b/src/lib/libssl/src/apps/x509.c | |||
| @@ -78,7 +78,6 @@ | |||
| 78 | #endif | 78 | #endif |
| 79 | 79 | ||
| 80 | 80 | ||
| 81 | #undef POSTFIX | ||
| 82 | #define POSTFIX ".srl" | 81 | #define POSTFIX ".srl" |
| 83 | #define DEF_DAYS 30 | 82 | #define DEF_DAYS 30 |
| 84 | 83 | ||
