projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remainder of SSL purpose and trust code: trust and purpose setting in
[oweals/openssl.git]
/
ssl
/
t1_srvr.c
diff --git
a/ssl/t1_srvr.c
b/ssl/t1_srvr.c
index 56038792845ad03bbfdea8ea9530150953b23d37..996b7ca8e2ef54a6bc65288d94e9f9aa8e9810e0 100644
(file)
--- a/
ssl/t1_srvr.c
+++ b/
ssl/t1_srvr.c
@@
-57,19
+57,14
@@
*/
#include <stdio.h>
*/
#include <stdio.h>
-#include
"buffer.h"
-#include
"rand.h"
-#include
"objects.h"
-#include
"evp.h"
-#include
"x509.h"
+#include
<openssl/buffer.h>
+#include
<openssl/rand.h>
+#include
<openssl/objects.h>
+#include
<openssl/evp.h>
+#include
<openssl/x509.h>
#include "ssl_locl.h"
#include "ssl_locl.h"
-#ifndef NOPROTO
static SSL_METHOD *tls1_get_server_method(int ver);
static SSL_METHOD *tls1_get_server_method(int ver);
-#else
-static SSL_METHOD *tls1_get_server_method();
-#endif
-
static SSL_METHOD *tls1_get_server_method(int ver)
{
if (ver == TLS1_VERSION)
static SSL_METHOD *tls1_get_server_method(int ver)
{
if (ver == TLS1_VERSION)
@@
-85,11
+80,11
@@
SSL_METHOD *TLSv1_server_method(void)
if (init)
{
if (init)
{
- init=0;
memcpy((char *)&TLSv1_server_data,(char *)tlsv1_base_method(),
sizeof(SSL_METHOD));
TLSv1_server_data.ssl_accept=ssl3_accept;
TLSv1_server_data.get_ssl_method=tls1_get_server_method;
memcpy((char *)&TLSv1_server_data,(char *)tlsv1_base_method(),
sizeof(SSL_METHOD));
TLSv1_server_data.ssl_accept=ssl3_accept;
TLSv1_server_data.get_ssl_method=tls1_get_server_method;
+ init=0;
}
return(&TLSv1_server_data);
}
}
return(&TLSv1_server_data);
}