summaryrefslogtreecommitdiff
path: root/src/lib/libssl/s3_srvr.c
diff options
context:
space:
mode:
authormarkus <>2002-09-05 22:12:12 +0000
committermarkus <>2002-09-05 22:12:12 +0000
commite08fb7998d733407336e83a299f140b0c1d2fcd3 (patch)
tree64de5de3b0be4adfc5050b6f785b6975c564b730 /src/lib/libssl/s3_srvr.c
parentb200d1ec45aafc7c92b197a4b605e34834d74f1d (diff)
downloadopenbsd-e08fb7998d733407336e83a299f140b0c1d2fcd3.tar.gz
openbsd-e08fb7998d733407336e83a299f140b0c1d2fcd3.tar.bz2
openbsd-e08fb7998d733407336e83a299f140b0c1d2fcd3.zip
merge with 0.9.7-beta1
Diffstat (limited to 'src/lib/libssl/s3_srvr.c')
-rw-r--r--src/lib/libssl/s3_srvr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c
index dfffed7165..cef8d4f81e 100644
--- a/src/lib/libssl/s3_srvr.c
+++ b/src/lib/libssl/s3_srvr.c
@@ -114,8 +114,6 @@
114 114
115 115
116#include <stdio.h> 116#include <stdio.h>
117#include "ssl_locl.h"
118#include "kssl_lcl.h"
119#include <openssl/buffer.h> 117#include <openssl/buffer.h>
120#include <openssl/rand.h> 118#include <openssl/rand.h>
121#include <openssl/objects.h> 119#include <openssl/objects.h>
@@ -123,8 +121,10 @@
123#include <openssl/x509.h> 121#include <openssl/x509.h>
124#ifndef OPENSSL_NO_KRB5 122#ifndef OPENSSL_NO_KRB5
125#include <openssl/krb5_asn.h> 123#include <openssl/krb5_asn.h>
124#include "kssl_lcl.h"
126#endif 125#endif
127#include <openssl/md5.h> 126#include <openssl/md5.h>
127#include "ssl_locl.h"
128 128
129static SSL_METHOD *ssl3_get_server_method(int ver); 129static SSL_METHOD *ssl3_get_server_method(int ver);
130static int ssl3_get_client_hello(SSL *s); 130static int ssl3_get_client_hello(SSL *s);