diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-09-03 12:29:57 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-09-03 12:29:57 +0000 |
| commit | 0702150f53ae7a9afd61801a9e208aff07729024 (patch) | |
| tree | 4469d570d2d92c1492a10392ffec1d6c560387e8 | |
| parent | a0ee08151526089b069556cb555ce1ed3d33436e (diff) | |
| download | openssl-0702150f53ae7a9afd61801a9e208aff07729024.zip openssl-0702150f53ae7a9afd61801a9e208aff07729024.tar.gz openssl-0702150f53ae7a9afd61801a9e208aff07729024.tar.bz2 | |
Make no-tlsext compile.
| -rw-r--r-- | apps/s_client.c | 6 | ||||
| -rw-r--r-- | ssl/s23_clnt.c | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index f685532..776196e 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -205,7 +205,9 @@ static int c_showcerts=0; static void sc_usage(void); static void print_stuff(BIO *berr,SSL *con,int full); +#ifndef OPENSSL_NO_TLSEXT static int ocsp_resp_cb(SSL *s, void *arg); +#endif static BIO *bio_c_out=NULL; static int c_quiet=0; static int c_ign_eof=0; @@ -1653,6 +1655,8 @@ static void print_stuff(BIO *bio, SSL *s, int full) (void)BIO_flush(bio); } +#ifndef OPENSSL_NO_TLSEXT + static int ocsp_resp_cb(SSL *s, void *arg) { const unsigned char *p; @@ -1678,3 +1682,5 @@ static int ocsp_resp_cb(SSL *s, void *arg) OCSP_RESPONSE_free(rsp); return 1; } + +#endif diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c index f90e107..cc6c527 100644 --- a/ssl/s23_clnt.c +++ b/ssl/s23_clnt.c @@ -276,7 +276,7 @@ static int ssl23_client_hello(SSL *s) { version = SSL2_VERSION; } - +#ifndef OPENSSL_NO_TLSEXT if (version != SSL2_VERSION) { /* have to disable SSL 2.0 compatibility if we need TLS extensions */ @@ -291,6 +291,7 @@ static int ssl23_client_hello(SSL *s) ssl2_compat = 0; #endif } +#endif buf=(unsigned char *)s->init_buf->data; if (s->state == SSL23_ST_CW_CLNT_HELLO_A) |