projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
solaris64 entry.
[openssl.git]
/
ssl
/
s23_clnt.c
diff --git
a/ssl/s23_clnt.c
b/ssl/s23_clnt.c
index c7f85a621f3d17483b885cee06134c7d36174483..386ebe3f8eedae92a55f0c17432a383ad1af49f0 100644
(file)
--- a/
ssl/s23_clnt.c
+++ b/
ssl/s23_clnt.c
@@
-57,29
+57,20
@@
*/
#include <stdio.h>
*/
#include <stdio.h>
-#include
"buffer.h"
-#include
"rand.h"
-#include
"objects.h"
-#include
"evp.h"
+#include
<openssl/buffer.h>
+#include
<openssl/rand.h>
+#include
<openssl/objects.h>
+#include
<openssl/evp.h>
#include "ssl_locl.h"
#include "ssl_locl.h"
-#define BREAK break
-
-#ifndef NOPROTO
static SSL_METHOD *ssl23_get_client_method(int ver);
static int ssl23_client_hello(SSL *s);
static int ssl23_get_server_hello(SSL *s);
static SSL_METHOD *ssl23_get_client_method(int ver);
static int ssl23_client_hello(SSL *s);
static int ssl23_get_server_hello(SSL *s);
-#else
-static SSL_METHOD *ssl23_get_client_method();
-static int ssl23_client_hello();
-static int ssl23_get_server_hello();
-#endif
-
static SSL_METHOD *ssl23_get_client_method(int ver)
{
if (ver == SSL2_VERSION)
return(SSLv2_client_method());
static SSL_METHOD *ssl23_get_client_method(int ver)
{
if (ver == SSL2_VERSION)
return(SSLv2_client_method());
-
else
if (ver == SSL3_VERSION)
+ if (ver == SSL3_VERSION)
return(SSLv3_client_method());
else if (ver == TLS1_VERSION)
return(TLSv1_client_method());
return(SSLv3_client_method());
else if (ver == TLS1_VERSION)
return(TLSv1_client_method());