Add client functionality to helper tool.
diff --git a/tool/CMakeLists.txt b/tool/CMakeLists.txt
index 03f5202..d9f6732 100644
--- a/tool/CMakeLists.txt
+++ b/tool/CMakeLists.txt
@@ -3,6 +3,8 @@
add_executable(
bssl
+ args.cc
+ client.cc
const.cc
speed.cc
tool.cc
diff --git a/tool/args.cc b/tool/args.cc
new file mode 100644
index 0000000..1882de0
--- /dev/null
+++ b/tool/args.cc
@@ -0,0 +1,73 @@
+/* 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. */
+
+#include <string>
+#include <vector>
+#include <map>
+
+#include <string.h>
+
+#include "internal.h"
+
+
+bool ParseKeyValueArguments(std::map<std::string, std::string> *out_args,
+ const std::vector<std::string> &args,
+ const struct argument *templates) {
+ out_args->clear();
+
+ for (size_t i = 0; i < args.size(); i++) {
+ const std::string &arg = args[i];
+ const struct argument *templ = nullptr;
+ for (size_t j = 0; templates[j].name[0] != 0; j++) {
+ if (strcmp(arg.c_str(), templates[j].name) == 0) {
+ templ = &templates[j];
+ break;
+ }
+ }
+
+ if (templ == nullptr) {
+ fprintf(stderr, "Unknown argument: %s\n", arg.c_str());
+ return false;
+ }
+
+ if (i + 1 >= args.size()) {
+ fprintf(stderr, "Missing argument for option: %s\n", arg.c_str());
+ return false;
+ }
+
+ if (out_args->find(arg) != out_args->end()) {
+ fprintf(stderr, "Duplicate value given for: %s\n", arg.c_str());
+ return false;
+ }
+
+ (*out_args)[arg] = args[++i];
+ }
+
+ for (size_t j = 0; templates[j].name[0] != 0; j++) {
+ const struct argument *templ = &templates[j];
+ if (templ->required && out_args->find(templ->name) == out_args->end()) {
+ fprintf(stderr, "Missing value for required argument: %s\n", templ->name);
+ return false;
+ }
+ }
+
+ return true;
+}
+
+void PrintUsage(const struct argument *templates) {
+ for (size_t i = 0; templates[i].name[0] != 0; i++) {
+ const struct argument *templ = &templates[i];
+ fprintf(stderr, "%s\t%s\n", templ->name, templ->description);
+ }
+}
diff --git a/tool/client.cc b/tool/client.cc
new file mode 100644
index 0000000..eb8d16e
--- /dev/null
+++ b/tool/client.cc
@@ -0,0 +1,280 @@
+/* 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. */
+
+#include <openssl/base.h>
+
+#include <string>
+#include <vector>
+
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#if !defined(OPENSSL_WINDOWS)
+#include <arpa/inet.h>
+#include <fcntl.h>
+#include <netdb.h>
+#include <sys/select.h>
+#include <unistd.h>
+#else
+#include <WinSock2.h>
+#include <WS2tcpip.h>
+typedef int socklen_t;
+#endif
+
+#include <openssl/err.h>
+#include <openssl/ssl.h>
+
+#include "internal.h"
+
+
+static const struct argument kArguments[] = {
+ {
+ "-connect", true,
+ "The hostname and port of the server to connect to, e.g. foo.com:443",
+ },
+ {
+ "", false, "",
+ },
+};
+
+// 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.
+static bool Connect(int *out_sock, const std::string &hostname_and_port) {
+ const size_t colon_offset = hostname_and_port.find_last_of(':');
+ std::string hostname, port;
+
+ if (colon_offset == std::string::npos) {
+ hostname = hostname_and_port;
+ port = "443";
+ } else {
+ hostname = hostname_and_port.substr(0, colon_offset);
+ port = hostname_and_port.substr(colon_offset + 1);
+ }
+
+ struct addrinfo hint, *result;
+ memset(&hint, 0, sizeof(hint));
+ hint.ai_family = AF_UNSPEC;
+ hint.ai_socktype = SOCK_STREAM;
+
+ int ret = getaddrinfo(hostname.c_str(), port.c_str(), &hint, &result);
+ if (ret != 0) {
+ fprintf(stderr, "getaddrinfo returned: %s\n", gai_strerror(ret));
+ return false;
+ }
+
+ bool ok = false;
+ char buf[256];
+
+ *out_sock =
+ socket(result->ai_family, result->ai_socktype, result->ai_protocol);
+ if (*out_sock < 0) {
+ perror("socket");
+ goto out;
+ }
+
+ switch (result->ai_family) {
+ case AF_INET: {
+ struct sockaddr_in *sin =
+ reinterpret_cast<struct sockaddr_in *>(result->ai_addr);
+ fprintf(stderr, "Connecting to %s:%d\n",
+ inet_ntop(result->ai_family, &sin->sin_addr, buf, sizeof(buf)),
+ ntohs(sin->sin_port));
+ break;
+ }
+ case AF_INET6: {
+ struct sockaddr_in6 *sin6 =
+ reinterpret_cast<struct sockaddr_in6 *>(result->ai_addr);
+ fprintf(stderr, "Connecting to [%s]:%d\n",
+ inet_ntop(result->ai_family, &sin6->sin6_addr, buf, sizeof(buf)),
+ ntohs(sin6->sin6_port));
+ break;
+ }
+ }
+
+ if (connect(*out_sock, result->ai_addr, result->ai_addrlen) != 0) {
+ perror("connect");
+ goto out;
+ }
+ ok = true;
+
+out:
+ freeaddrinfo(result);
+ return ok;
+}
+
+static void PrintConnectionInfo(const SSL *ssl) {
+ const SSL_CIPHER *cipher = SSL_get_current_cipher(ssl);
+
+ fprintf(stderr, " Version: %s\n", SSL_get_version(ssl));
+ fprintf(stderr, " Cipher: %s\n", SSL_CIPHER_get_name(cipher));
+ fprintf(stderr, " Secure renegotiation: %s\n",
+ SSL_get_secure_renegotiation_support(ssl) ? "yes" : "no");
+}
+
+static bool SocketSetNonBlocking(int sock, bool is_non_blocking) {
+ bool ok;
+
+#if defined(OPENSSL_WINDOWS)
+ u_long arg = is_non_blocking;
+ ok = 0 == ioctlsocket(sock, FIOBIO, &arg);
+#else
+ int flags = fcntl(sock, F_GETFL, 0);
+ if (flags < 0) {
+ return false;
+ }
+ if (is_non_blocking) {
+ flags |= O_NONBLOCK;
+ } else {
+ flags &= ~O_NONBLOCK;
+ }
+ ok = 0 == fcntl(sock, F_SETFL, flags);
+#endif
+ if (!ok) {
+ fprintf(stderr, "Failed to set socket non-blocking.\n");
+ }
+ return ok;
+}
+
+// PrintErrorCallback is a callback function from OpenSSL's
+// |ERR_print_errors_cb| that writes errors to a given |FILE*|.
+static int PrintErrorCallback(const char *str, size_t len, void *ctx) {
+ fwrite(str, len, 1, reinterpret_cast<FILE*>(ctx));
+ return 1;
+}
+
+bool TransferData(SSL *ssl, int sock) {
+ bool stdin_open = true;
+
+ fd_set read_fds;
+ FD_ZERO(&read_fds);
+
+ if (!SocketSetNonBlocking(sock, true)) {
+ return false;
+ }
+
+ for (;;) {
+ if (stdin_open) {
+ FD_SET(0, &read_fds);
+ }
+ FD_SET(sock, &read_fds);
+
+ int ret = select(sock + 1, &read_fds, NULL, NULL, NULL);
+ if (ret <= 0) {
+ perror("select");
+ return false;
+ }
+
+ if (FD_ISSET(0, &read_fds)) {
+ uint8_t buffer[512];
+ ssize_t n;
+
+ do {
+ n = read(0, buffer, sizeof(buffer));
+ } while (n == -1 && errno == EINTR);
+
+ if (n == 0) {
+ FD_CLR(0, &read_fds);
+ stdin_open = false;
+ shutdown(sock, SHUT_WR);
+ continue;
+ } else if (n < 0) {
+ perror("read from stdin");
+ return false;
+ }
+
+ if (!SocketSetNonBlocking(sock, false)) {
+ return false;
+ }
+ int ssl_ret = SSL_write(ssl, buffer, n);
+ if (!SocketSetNonBlocking(sock, true)) {
+ return false;
+ }
+
+ if (ssl_ret <= 0) {
+ int ssl_err = SSL_get_error(ssl, ssl_ret);
+ fprintf(stderr, "Error while writing: %d\n", ssl_err);
+ ERR_print_errors_cb(PrintErrorCallback, stderr);
+ return false;
+ } else if (ssl_ret != n) {
+ fprintf(stderr, "Short write from SSL_write.\n");
+ return false;
+ }
+ }
+
+ if (FD_ISSET(sock, &read_fds)) {
+ uint8_t buffer[512];
+ int ssl_ret = SSL_read(ssl, buffer, sizeof(buffer));
+
+ if (ssl_ret < 0) {
+ int ssl_err = SSL_get_error(ssl, ssl_ret);
+ if (ssl_err == SSL_ERROR_WANT_READ) {
+ continue;
+ }
+ fprintf(stderr, "Error while reading: %d\n", ssl_err);
+ ERR_print_errors_cb(PrintErrorCallback, stderr);
+ return false;
+ } else if (ssl_ret == 0) {
+ return true;
+ }
+
+ ssize_t n;
+ do {
+ n = write(1, buffer, ssl_ret);
+ } while (n == -1 && errno == EINTR);
+
+ if (n != ssl_ret) {
+ fprintf(stderr, "Short write to stderr.\n");
+ return false;
+ }
+ }
+ }
+}
+
+bool Client(const std::vector<std::string> &args) {
+ std::map<std::string, std::string> args_map;
+
+ if (!ParseKeyValueArguments(&args_map, args, kArguments)) {
+ PrintUsage(kArguments);
+ return false;
+ }
+
+ SSL_CTX *ctx = SSL_CTX_new(SSLv23_client_method());
+
+ int sock;
+ if (!Connect(&sock, args_map["-connect"])) {
+ return false;
+ }
+
+ BIO *bio = BIO_new_socket(sock, BIO_CLOSE);
+ SSL *ssl = SSL_new(ctx);
+ SSL_set_bio(ssl, bio, bio);
+
+ int ret = SSL_connect(ssl);
+ if (ret != 1) {
+ int ssl_err = SSL_get_error(ssl, ret);
+ fprintf(stderr, "Error while connecting: %d\n", ssl_err);
+ ERR_print_errors_cb(PrintErrorCallback, stderr);
+ return false;
+ }
+
+ fprintf(stderr, "Connected.\n");
+ PrintConnectionInfo(ssl);
+
+ bool ok = TransferData(ssl, sock);
+
+ SSL_free(ssl);
+ SSL_CTX_free(ctx);
+ return ok;
+}
diff --git a/tool/internal.h b/tool/internal.h
new file mode 100644
index 0000000..843dcdc
--- /dev/null
+++ b/tool/internal.h
@@ -0,0 +1,35 @@
+/* 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_INTERNAL_H
+#define OPENSSL_HEADER_TOOL_INTERNAL_H
+
+#include <string>
+#include <vector>
+#include <map>
+
+
+struct argument {
+ const char name[15];
+ bool required;
+ const char *description;
+};
+
+bool ParseKeyValueArguments(std::map<std::string, std::string> *out_args, const
+ std::vector<std::string> &args, const struct argument *templates);
+
+void PrintUsage(const struct argument *templates);
+
+
+#endif /* !OPENSSL_HEADER_TOOL_INTERNAL_H */
diff --git a/tool/tool.cc b/tool/tool.cc
index 4bcfdb3..b8aa911 100644
--- a/tool/tool.cc
+++ b/tool/tool.cc
@@ -16,12 +16,14 @@
#include <vector>
#include <openssl/err.h>
+#include <openssl/ssl.h>
bool Speed(const std::vector<std::string> &args);
+bool Client(const std::vector<std::string> &args);
static void usage(const char *name) {
- printf("Usage: %s [speed]\n", name);
+ printf("Usage: %s [speed|client]\n", name);
}
int main(int argc, char **argv) {
@@ -30,7 +32,7 @@
tool = argv[1];
}
- ERR_load_crypto_strings();
+ SSL_library_init();
std::vector<std::string> args;
for (int i = 2; i < argc; i++) {
@@ -39,6 +41,8 @@
if (tool == "speed") {
return !Speed(args);
+ } else if (tool == "s_client" || tool == "client") {
+ return !Client(args);
} else {
usage(argv[0]);
return 1;
