3c37d0aba5
Rather than printing the SSL_ERROR_* constants, print the actual error. This should be a bit more understandable. Debugging this also uncovered some other issues on Windows: - We were mixing up C runtime and Winsock errors, which are separate in Windows. - The thread local implementation interferes with WSAGetLastError due to a quirk of TlsGetValue. This could affect other Windows consumers. (Chromium uses a custom BIO, so it isn't affected.) - SocketSetNonBlocking also interferes with WSAGetLastError. - Listen for FD_CLOSE along with FD_READ. Connection close does not signal FD_READ. (The select loop only barely works on Windows anyway due to issues with stdin and line buffering, but if we take stdin out of the equation, FD_CLOSE can be tested.) Change-Id: Ia8d42b5ac39ebb3045d410dd768f83a3bb88b2cb Reviewed-on: https://boringssl-review.googlesource.com/28186 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: Steven Valdez <svaldez@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
72 lines
2.6 KiB
C++
72 lines
2.6 KiB
C++
/* Copyright (c) 2014, Google Inc.
|
|
*
|
|
* Permission to use, copy, modify, and/or distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
|
|
* SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
|
|
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
|
|
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
|
|
|
|
#ifndef OPENSSL_HEADER_TOOL_TRANSPORT_COMMON_H
|
|
#define OPENSSL_HEADER_TOOL_TRANSPORT_COMMON_H
|
|
|
|
#include <openssl/ssl.h>
|
|
#include <string.h>
|
|
|
|
#include <string>
|
|
|
|
// InitSocketLibrary calls the Windows socket init functions, if needed.
|
|
bool InitSocketLibrary();
|
|
|
|
// Connect sets |*out_sock| to be a socket connected to the destination given
|
|
// in |hostname_and_port|, which should be of the form "www.example.com:123".
|
|
// It returns true on success and false otherwise.
|
|
bool Connect(int *out_sock, const std::string &hostname_and_port);
|
|
|
|
class Listener {
|
|
public:
|
|
Listener() {}
|
|
~Listener();
|
|
|
|
// Init initializes the listener to listen on |port|, which should be of the
|
|
// form "123".
|
|
bool Init(const std::string &port);
|
|
|
|
// Accept sets |*out_sock| to be a socket connected to the listener.
|
|
bool Accept(int *out_sock);
|
|
|
|
private:
|
|
int server_sock_ = -1;
|
|
|
|
Listener(const Listener &) = delete;
|
|
Listener &operator=(const Listener &) = delete;
|
|
};
|
|
|
|
bool VersionFromString(uint16_t *out_version, const std::string &version);
|
|
|
|
void PrintConnectionInfo(BIO *bio, const SSL *ssl);
|
|
|
|
bool SocketSetNonBlocking(int sock, bool is_non_blocking);
|
|
|
|
// PrintSSLError prints information about the most recent SSL error to stderr.
|
|
// |ssl_err| must be the output of |SSL_get_error| and the |SSL| object must be
|
|
// connected to socket from |Connect|.
|
|
void PrintSSLError(FILE *file, const char *msg, int ssl_err, int ret);
|
|
|
|
bool TransferData(SSL *ssl, int sock);
|
|
|
|
// DoSMTPStartTLS performs the SMTP STARTTLS mini-protocol over |sock|. It
|
|
// returns true on success and false otherwise.
|
|
bool DoSMTPStartTLS(int sock);
|
|
|
|
// DoHTTPTunnel sends an HTTP CONNECT request over |sock|. It returns true on
|
|
// success and false otherwise.
|
|
bool DoHTTPTunnel(int sock, const std::string &hostname_and_port);
|
|
|
|
#endif // !OPENSSL_HEADER_TOOL_TRANSPORT_COMMON_H
|