From c6f3fe1fbc8da2fa6de30b10f1f219ab1f809438 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Wed, 11 Feb 2015 06:46:33 +0000 Subject: Be consistent with naming - only use "host" and "hostname" when referring to an actual host and use "servername" when referring to the name of the TLS server that we expect to be indentified in the server certificate. Likewise, rename verify_host to verify_name and use the term "name" throughout the verification code (rather than host or hostname). Requested by and ok tedu@ --- src/lib/libtls/tls_internal.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/libtls/tls_internal.h') diff --git a/src/lib/libtls/tls_internal.h b/src/lib/libtls/tls_internal.h index f0feddcf5b..78e6b1fe2b 100644 --- a/src/lib/libtls/tls_internal.h +++ b/src/lib/libtls/tls_internal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: tls_internal.h,v 1.9 2015/02/07 09:50:09 jsing Exp $ */ +/* $OpenBSD: tls_internal.h,v 1.10 2015/02/11 06:46:33 jsing Exp $ */ /* * Copyright (c) 2014 Jeremie Courreges-Anglas * Copyright (c) 2014 Joel Sing @@ -41,8 +41,8 @@ struct tls_config { size_t key_len; uint32_t protocols; int verify_cert; - int verify_host; int verify_depth; + int verify_name; }; #define TLS_CLIENT (1 << 0) @@ -66,7 +66,7 @@ struct tls { struct tls *tls_new(void); struct tls *tls_server_conn(struct tls *ctx); -int tls_check_hostname(struct tls *ctx, X509 *cert, const char *host); +int tls_check_servername(struct tls *ctx, X509 *cert, const char *servername); int tls_configure_keypair(struct tls *ctx); int tls_configure_server(struct tls *ctx); int tls_configure_ssl(struct tls *ctx); -- cgit v1.2.3-55-g6feb