diff options
author | jsing <> | 2015-08-22 16:36:05 +0000 |
---|---|---|
committer | jsing <> | 2015-08-22 16:36:05 +0000 |
commit | 3d9f323c9126c3921ff102a172c67dfa4975449a (patch) | |
tree | 914abdd328ee31b3be41e0883b0af14975b39f57 /src/usr.bin/openssl/s_server.c | |
parent | 8aaa3462961697bb402dbd95d36536a55500e050 (diff) | |
download | openbsd-3d9f323c9126c3921ff102a172c67dfa4975449a.tar.gz openbsd-3d9f323c9126c3921ff102a172c67dfa4975449a.tar.bz2 openbsd-3d9f323c9126c3921ff102a172c67dfa4975449a.zip |
Remove all duplicate prototypes for *_main functions (these are already
provided by progs.h). Also, move the FUNCTION type (and flags) into
openssl.c since that is the only place of use. Lastly, remove pointless
'extern' from the prototypes and use char **argv instead of char *argv[]
(the former is used elsewhere).
ok deraadt@ doug@
Diffstat (limited to 'src/usr.bin/openssl/s_server.c')
-rw-r--r-- | src/usr.bin/openssl/s_server.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/usr.bin/openssl/s_server.c b/src/usr.bin/openssl/s_server.c index 317b1a849f..2ac8c06c1e 100644 --- a/src/usr.bin/openssl/s_server.c +++ b/src/usr.bin/openssl/s_server.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s_server.c,v 1.14 2015/07/20 18:31:01 doug Exp $ */ | 1 | /* $OpenBSD: s_server.c,v 1.15 2015/08/22 16:36:05 jsing 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 | * |
@@ -577,8 +577,6 @@ alpn_cb(SSL *s, const unsigned char **out, unsigned char *outlen, | |||
577 | return (SSL_TLSEXT_ERR_OK); | 577 | return (SSL_TLSEXT_ERR_OK); |
578 | } | 578 | } |
579 | 579 | ||
580 | int s_server_main(int, char **); | ||
581 | |||
582 | #ifndef OPENSSL_NO_SRTP | 580 | #ifndef OPENSSL_NO_SRTP |
583 | static char *srtp_profiles = NULL; | 581 | static char *srtp_profiles = NULL; |
584 | #endif | 582 | #endif |