summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2015-09-08 15:29:34 +0000
committerjsing <>2015-09-08 15:29:34 +0000
commit7e148f977119e2cb2058b9cf3eeb192afd550b41 (patch)
tree89e165a3785f57fff968e8befead2bb29d431737 /src
parent546626ef931a8053872c26e20dad7feab1cdee2e (diff)
downloadopenbsd-7e148f977119e2cb2058b9cf3eeb192afd550b41.tar.gz
openbsd-7e148f977119e2cb2058b9cf3eeb192afd550b41.tar.bz2
openbsd-7e148f977119e2cb2058b9cf3eeb192afd550b41.zip
Remove the default HTTPS port from tls_connect() - this is a TLS library,
not a HTTPS library. ok beck@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libtls/tls_client.c8
-rw-r--r--src/lib/libtls/tls_internal.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libtls/tls_client.c b/src/lib/libtls/tls_client.c
index 168a7089fc..55fb49ff78 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.21 2015/08/27 15:26:50 jsing Exp $ */ 1/* $OpenBSD: tls_client.c,v 1.22 2015/09/08 15:29:34 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -114,8 +114,10 @@ tls_connect_servername(struct tls *ctx, const char *host, const char *port,
114 tls_set_errorx(ctx, "memory allocation failure"); 114 tls_set_errorx(ctx, "memory allocation failure");
115 goto err; 115 goto err;
116 } 116 }
117 if (ret != 0) 117 if (ret != 0) {
118 port = HTTPS_PORT; 118 tls_set_errorx(ctx, "no port provided");
119 goto err;
120 }
119 } 121 }
120 122
121 h = (hs != NULL) ? hs : host; 123 h = (hs != NULL) ? hs : host;
diff --git a/src/lib/libtls/tls_internal.h b/src/lib/libtls/tls_internal.h
index 4503c20ab7..d767c37494 100644
--- a/src/lib/libtls/tls_internal.h
+++ b/src/lib/libtls/tls_internal.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls_internal.h,v 1.14 2015/08/27 15:26:50 jsing Exp $ */ 1/* $OpenBSD: tls_internal.h,v 1.15 2015/09/08 15:29:34 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org> 3 * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org>
4 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 4 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
@@ -21,8 +21,6 @@
21 21
22#include <openssl/ssl.h> 22#include <openssl/ssl.h>
23 23
24#define HTTPS_PORT "443"
25
26#define _PATH_SSL_CA_FILE "/etc/ssl/cert.pem" 24#define _PATH_SSL_CA_FILE "/etc/ssl/cert.pem"
27 25
28#define TLS_CIPHERS_COMPAT "ALL:!aNULL:!eNULL" 26#define TLS_CIPHERS_COMPAT "ALL:!aNULL:!eNULL"