diff options
Diffstat (limited to 'src/lib/libssl/src/apps/s_server.c')
| -rw-r--r-- | src/lib/libssl/src/apps/s_server.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/libssl/src/apps/s_server.c b/src/lib/libssl/src/apps/s_server.c index fb44573854..ebe205c4ab 100644 --- a/src/lib/libssl/src/apps/s_server.c +++ b/src/lib/libssl/src/apps/s_server.c | |||
| @@ -242,8 +242,6 @@ static int accept_socket = -1; | |||
| 242 | #ifndef OPENSSL_NO_TLSEXT | 242 | #ifndef OPENSSL_NO_TLSEXT |
| 243 | #define TEST_CERT2 "server2.pem" | 243 | #define TEST_CERT2 "server2.pem" |
| 244 | #endif | 244 | #endif |
| 245 | #undef PROG | ||
| 246 | #define PROG s_server_main | ||
| 247 | 245 | ||
| 248 | extern int verify_depth, verify_return_error; | 246 | extern int verify_depth, verify_return_error; |
| 249 | 247 | ||
| @@ -733,7 +731,7 @@ next_proto_cb(SSL * s, const unsigned char **data, unsigned int *len, void *arg) | |||
| 733 | 731 | ||
| 734 | #endif | 732 | #endif |
| 735 | 733 | ||
| 736 | int MAIN(int, char **); | 734 | int s_server_main(int, char **); |
| 737 | 735 | ||
| 738 | #ifndef OPENSSL_NO_JPAKE | 736 | #ifndef OPENSSL_NO_JPAKE |
| 739 | static char *jpake_secret = NULL; | 737 | static char *jpake_secret = NULL; |
| @@ -746,7 +744,7 @@ static char *srtp_profiles = NULL; | |||
| 746 | #endif | 744 | #endif |
| 747 | 745 | ||
| 748 | int | 746 | int |
| 749 | MAIN(int argc, char *argv[]) | 747 | s_server_main(int argc, char *argv[]) |
| 750 | { | 748 | { |
| 751 | X509_VERIFY_PARAM *vpm = NULL; | 749 | X509_VERIFY_PARAM *vpm = NULL; |
| 752 | int badarg = 0; | 750 | int badarg = 0; |
