diff options
author | djm <> | 2009-01-30 03:56:05 +0000 |
---|---|---|
committer | djm <> | 2009-01-30 03:56:05 +0000 |
commit | 8531d6a47f499006aa2c2a5c41809ee5886137e2 (patch) | |
tree | 9a9ab172330d8ebfc736c4a4ba22e7a1515e9959 | |
parent | 69fb10c74e812b136c6b8284ba02e064101eb977 (diff) | |
download | openbsd-8531d6a47f499006aa2c2a5c41809ee5886137e2.tar.gz openbsd-8531d6a47f499006aa2c2a5c41809ee5886137e2.tar.bz2 openbsd-8531d6a47f499006aa2c2a5c41809ee5886137e2.zip |
remove some gratuitous changes that do nothing other than inrease
the size of the diff against openssl mainline
-rw-r--r-- | src/lib/libssl/src/apps/s_client.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/libssl/src/apps/s_client.c b/src/lib/libssl/src/apps/s_client.c index 66d54989a2..70e7254a91 100644 --- a/src/lib/libssl/src/apps/s_client.c +++ b/src/lib/libssl/src/apps/s_client.c | |||
@@ -297,7 +297,6 @@ int MAIN(int argc, char **argv) | |||
297 | char *cbuf=NULL,*sbuf=NULL,*mbuf=NULL; | 297 | char *cbuf=NULL,*sbuf=NULL,*mbuf=NULL; |
298 | int cbuf_len,cbuf_off; | 298 | int cbuf_len,cbuf_off; |
299 | int sbuf_len,sbuf_off; | 299 | int sbuf_len,sbuf_off; |
300 | int mbuf_len; | ||
301 | fd_set readfds,writefds; | 300 | fd_set readfds,writefds; |
302 | char *port=PORT_STR; | 301 | char *port=PORT_STR; |
303 | int full_log=1; | 302 | int full_log=1; |
@@ -322,6 +321,7 @@ int MAIN(int argc, char **argv) | |||
322 | int sock_type=SOCK_STREAM; | 321 | int sock_type=SOCK_STREAM; |
323 | BIO *sbio; | 322 | BIO *sbio; |
324 | char *inrand=NULL; | 323 | char *inrand=NULL; |
324 | int mbuf_len=0; | ||
325 | #ifndef OPENSSL_NO_ENGINE | 325 | #ifndef OPENSSL_NO_ENGINE |
326 | char *engine_id=NULL; | 326 | char *engine_id=NULL; |
327 | char *ssl_client_engine_id=NULL; | 327 | char *ssl_client_engine_id=NULL; |
@@ -925,7 +925,6 @@ SSL_set_tlsext_status_ids(con, ids); | |||
925 | cbuf_off=0; | 925 | cbuf_off=0; |
926 | sbuf_len=0; | 926 | sbuf_len=0; |
927 | sbuf_off=0; | 927 | sbuf_off=0; |
928 | mbuf_len=0; | ||
929 | 928 | ||
930 | /* This is an ugly hack that does a lot of assumptions */ | 929 | /* This is an ugly hack that does a lot of assumptions */ |
931 | /* We do have to handle multi-line responses which may come | 930 | /* We do have to handle multi-line responses which may come |