diff options
| author | June McEnroe <june@causal.agency> | 2022-02-27 10:28:40 -0500 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2022-02-27 11:12:26 -0500 |
| commit | 9c718c5df514e2a20c7d04e1db1716fdbab45a04 (patch) | |
| tree | 0645cd11cf0382906afde12e54fff66725506b69 /tls_client.c | |
| parent | tls: Revert accidentally(?) reverted upstream (diff) | |
| parent | Import LibreSSL 3.5.0 (diff) | |
| download | libretls-9c718c5df514e2a20c7d04e1db1716fdbab45a04.tar.gz libretls-9c718c5df514e2a20c7d04e1db1716fdbab45a04.zip | |
Merge LibreSSL 3.5.0
Diffstat (limited to '')
| -rw-r--r-- | tls_client.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tls_client.c b/tls_client.c index 47ebc40..b1d2a44 100644 --- a/tls_client.c +++ b/tls_client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls_client.c,v 1.47 2021/06/01 20:26:11 tb Exp $ */ +/* $OpenBSD: tls_client.c,v 1.48 2021/10/21 08:38:11 tb Exp $ */ /* * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> * @@ -75,11 +75,8 @@ tls_connect_servername(struct tls *ctx, const char *host, const char *port, goto err; } - /* - * If port is NULL try to extract a port from the specified host, - * otherwise use the default. - */ - if ((p = (char *)port) == NULL) { + /* If port is NULL, try to extract a port from the specified host. */ + if (port == NULL) { ret = tls_host_port(host, &hs, &ps); if (ret == -1) { tls_set_errorx(ctx, "memory allocation failure"); |