提交 0702150f 编写于 作者: D Dr. Stephen Henson

Make no-tlsext compile.

上级 a0ee0815
...@@ -205,7 +205,9 @@ static int c_showcerts=0; ...@@ -205,7 +205,9 @@ static int c_showcerts=0;
static void sc_usage(void); static void sc_usage(void);
static void print_stuff(BIO *berr,SSL *con,int full); static void print_stuff(BIO *berr,SSL *con,int full);
#ifndef OPENSSL_NO_TLSEXT
static int ocsp_resp_cb(SSL *s, void *arg); static int ocsp_resp_cb(SSL *s, void *arg);
#endif
static BIO *bio_c_out=NULL; static BIO *bio_c_out=NULL;
static int c_quiet=0; static int c_quiet=0;
static int c_ign_eof=0; static int c_ign_eof=0;
...@@ -1653,6 +1655,8 @@ static void print_stuff(BIO *bio, SSL *s, int full) ...@@ -1653,6 +1655,8 @@ static void print_stuff(BIO *bio, SSL *s, int full)
(void)BIO_flush(bio); (void)BIO_flush(bio);
} }
#ifndef OPENSSL_NO_TLSEXT
static int ocsp_resp_cb(SSL *s, void *arg) static int ocsp_resp_cb(SSL *s, void *arg)
{ {
const unsigned char *p; const unsigned char *p;
...@@ -1678,3 +1682,5 @@ static int ocsp_resp_cb(SSL *s, void *arg) ...@@ -1678,3 +1682,5 @@ static int ocsp_resp_cb(SSL *s, void *arg)
OCSP_RESPONSE_free(rsp); OCSP_RESPONSE_free(rsp);
return 1; return 1;
} }
#endif
...@@ -276,7 +276,7 @@ static int ssl23_client_hello(SSL *s) ...@@ -276,7 +276,7 @@ static int ssl23_client_hello(SSL *s)
{ {
version = SSL2_VERSION; version = SSL2_VERSION;
} }
#ifndef OPENSSL_NO_TLSEXT
if (version != SSL2_VERSION) if (version != SSL2_VERSION)
{ {
/* have to disable SSL 2.0 compatibility if we need TLS extensions */ /* have to disable SSL 2.0 compatibility if we need TLS extensions */
...@@ -291,6 +291,7 @@ static int ssl23_client_hello(SSL *s) ...@@ -291,6 +291,7 @@ static int ssl23_client_hello(SSL *s)
ssl2_compat = 0; ssl2_compat = 0;
#endif #endif
} }
#endif
buf=(unsigned char *)s->init_buf->data; buf=(unsigned char *)s->init_buf->data;
if (s->state == SSL23_ST_CW_CLNT_HELLO_A) if (s->state == SSL23_ST_CW_CLNT_HELLO_A)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册