summaryrefslogtreecommitdiff
path: root/src/lib/libtls/tls_client.c
diff options
context:
space:
mode:
authorjsing <>2015-09-29 13:10:53 +0000
committerjsing <>2015-09-29 13:10:53 +0000
commit709c2c131d5d5d3f3c8ecb110b01f3d5afa6ddfd (patch)
tree0c312edb7d4149622244dbffd24cd841a31acbd4 /src/lib/libtls/tls_client.c
parenta5f8b1e3beaca544186a330e0f61427c67779c1f (diff)
downloadopenbsd-709c2c131d5d5d3f3c8ecb110b01f3d5afa6ddfd.tar.gz
openbsd-709c2c131d5d5d3f3c8ecb110b01f3d5afa6ddfd.tar.bz2
openbsd-709c2c131d5d5d3f3c8ecb110b01f3d5afa6ddfd.zip
Instead of declaring a union in multiple places, move it to tls_internal.h.
ok deraadt@
Diffstat (limited to 'src/lib/libtls/tls_client.c')
-rw-r--r--src/lib/libtls/tls_client.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/libtls/tls_client.c b/src/lib/libtls/tls_client.c
index cea01d17fe..af1b05ab71 100644
--- a/src/lib/libtls/tls_client.c
+++ b/src/lib/libtls/tls_client.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls_client.c,v 1.29 2015/09/29 10:17:04 deraadt Exp $ */ 1/* $OpenBSD: tls_client.c,v 1.30 2015/09/29 13:10:53 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -166,10 +166,7 @@ int
166tls_connect_fds(struct tls *ctx, int fd_read, int fd_write, 166tls_connect_fds(struct tls *ctx, int fd_read, int fd_write,
167 const char *servername) 167 const char *servername)
168{ 168{
169 union { 169 union tls_addr addrbuf;
170 struct in_addr ip4;
171 struct in6_addr ip6;
172 } addrbuf;
173 int rv = -1; 170 int rv = -1;
174 171
175 if ((ctx->flags & TLS_CLIENT) == 0) { 172 if ((ctx->flags & TLS_CLIENT) == 0) {