diff options
| author | Rich Salz <rsalz@akamai.com> | 2014-07-10 00:16:40 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@akamai.com> | 2014-07-14 18:03:33 -0400 |
| commit | af8d46725a31112ac15925f64938acd282ae0691 (patch) | |
| tree | c097bd2ce606147f8957a65f4bdafa65e7e6faf7 | |
| parent | 3541ca49b5d00b815e49ae9272daef10472883f4 (diff) | |
| download | openssl-new-af8d46725a31112ac15925f64938acd282ae0691.tar.gz | |
Fix merge error ;remove big chunk of old tlsext authz stuff.
| -rw-r--r-- | apps/s_client.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 9a171d01fc..35e3a2b0e2 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -218,37 +218,6 @@ static int c_quiet=0; static int c_ign_eof=0; static int c_brief=0; -#ifndef OPENSSL_NO_TLSEXT - -static unsigned char *generated_supp_data = NULL; - -static const unsigned char *most_recent_supplemental_data = NULL; -static size_t most_recent_supplemental_data_length = 0; - -static int server_provided_server_authz = 0; -static int server_provided_client_authz = 0; - -static const unsigned char auth_ext_data[]={TLSEXT_AUTHZDATAFORMAT_dtcp}; - -static int suppdata_cb(SSL *s, unsigned short supp_data_type, - const unsigned char *in, - unsigned short inlen, int *al, - void *arg); - -static int auth_suppdata_generate_cb(SSL *s, unsigned short supp_data_type, - const unsigned char **out, - unsigned short *outlen, int *al, void *arg); - -static int authz_tlsext_generate_cb(SSL *s, unsigned short ext_type, - const unsigned char **out, unsigned short *outlen, - int *al, void *arg); - -static int authz_tlsext_cb(SSL *s, unsigned short ext_type, - const unsigned char *in, - unsigned short inlen, int *al, - void *arg); -#endif - const char* s_client_help[] = { "-host host use -connect instead", "-port port use -connect instead", |