Revert "tlsdate: Support IPv6-only networks"
This reverts commit 411bfbd54e5eea784596ef6622010d37483d8058.
Reason for revert:
No longer needed. Revisit IPv6 support at a later date.
Bug=b:70175610
Original change's description:
> tlsdate: Support IPv6-only networks
>
> This is based on a patch that buildroot applies to tlsdate,
> originally authored by Avery Pennarun (apenwarr@gmail.com).
> https://github.com/jameshilliard/buildroot/blob/master/package/tlsdate/tlsdate-0020-openssl-ipv6.patch
>
> BUG=b:63137232
> TEST=tlsdate is able to sync time on IPv6 only system
>
> Change-Id: I8529ea54fbcc1e77f2cdc2787debbe793cd68f53
> Reviewed-on: https://chromium-review.googlesource.com/717021
> Commit-Ready: Ian Coolidge <icoolidge@google.com>
> Tested-by: Ian Coolidge <icoolidge@google.com>
> Reviewed-by: Dan Erat <derat@chromium.org>
Bug: b:63137232
Change-Id: I0bf8918f121f533ad065963c26357e1d533ca3b8
Reviewed-on: https://chromium-review.googlesource.com/807284
Commit-Ready: Joshua Emele <jemele@google.com>
Commit-Ready: Ian Coolidge <icoolidge@google.com>
Tested-by: Joshua Emele <jemele@google.com>
Tested-by: Ian Coolidge <icoolidge@google.com>
Reviewed-by: Dan Erat <derat@chromium.org>
Reviewed-by: Ian Coolidge <icoolidge@google.com>
diff --git a/src/tlsdate-helper.c b/src/tlsdate-helper.c
index e0cabce..7455d39 100644
--- a/src/tlsdate-helper.c
+++ b/src/tlsdate-helper.c
@@ -75,11 +75,6 @@
*/
#include "config.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-
#include "src/tlsdate-helper.h"
#include "src/proxy-bio.h"
@@ -165,42 +160,12 @@
}
static BIO *
-make_ssl_bio (SSL_CTX *ctx, const char *host, const char *port)
+make_ssl_bio (SSL_CTX *ctx)
{
BIO *con = NULL;
BIO *ssl = NULL;
- int err, sock = -1;
- struct addrinfo *ai = NULL, *cai = NULL;
- struct addrinfo hints = {
- .ai_flags = AI_ADDRCONFIG,
- .ai_family = AF_UNSPEC,
- .ai_socktype = SOCK_STREAM,
- };
- err = getaddrinfo (host, port, &hints, &ai);
- if (err != 0 || !ai) {
- die ("getaddrinfo(%s): %s\n", host, gai_strerror (err));
- }
- for (cai = ai; cai; cai = cai->ai_next) {
- sock = socket (cai->ai_family, SOCK_STREAM, 0);
- if (sock < 0) {
- perror ("socket");
- continue;
- }
-
- if (connect (sock, cai->ai_addr, cai->ai_addrlen) != 0) {
- perror ("connect");
- close (sock);
- sock = -1;
- continue;
- }
-
- break;
- }
- if (ai) freeaddrinfo (ai);
- if (sock < 0) die ("failed to find any remote addresses\n");
-
- if (!(con = BIO_new_fd (sock, 1)))
- die ("BIO_new_fd failed\n");
+ if (! (con = BIO_new (BIO_s_connect())))
+ die ("BIO_s_connect failed\n");
if (! (ssl = BIO_new_ssl (ctx, 1)))
die ("BIO_new_ssl failed\n");
setup_proxy (ssl);
@@ -770,8 +735,7 @@
}
}
}
- verb ("V: opening socket to %s:%s\n", host, port);
- if (NULL == (s_bio = make_ssl_bio(ctx, host, port)))
+ if (NULL == (s_bio = make_ssl_bio (ctx)))
die ("SSL BIO setup failed\n");
BIO_get_ssl (s_bio, &ssl);
if (NULL == ssl)
@@ -782,6 +746,10 @@
}
SSL_set_mode (ssl, SSL_MODE_AUTO_RETRY);
SSL_set_tlsext_host_name (ssl, host);
+ verb ("V: opening socket to %s:%s\n", host, port);
+ if ( (1 != BIO_set_conn_hostname (s_bio, host)) ||
+ (1 != BIO_set_conn_port (s_bio, port)))
+ die ("Failed to initialize connection to `%s:%s'\n", host, port);
if (NULL == BIO_new_fp (stdout, BIO_NOCLOSE))
die ("BIO_new_fp returned error, possibly: %s", strerror (errno));
// This should run in seccomp
