summaryrefslogtreecommitdiff
path: root/src/lib/libtls/tls_config.c
diff options
context:
space:
mode:
authorjsing <>2016-05-27 14:38:40 +0000
committerjsing <>2016-05-27 14:38:40 +0000
commit02efd2825938b0467533f9bd0feeb0f8e0443e74 (patch)
tree5b697221d95cc723019dc979f74af389ca3025be /src/lib/libtls/tls_config.c
parent6c3d4fd7941ef049d641eaa523e53e1c2f97f2e4 (diff)
downloadopenbsd-02efd2825938b0467533f9bd0feeb0f8e0443e74.tar.gz
openbsd-02efd2825938b0467533f9bd0feeb0f8e0443e74.tar.bz2
openbsd-02efd2825938b0467533f9bd0feeb0f8e0443e74.zip
Rename some of the internal error setting functions to more closely follow
existing naming standards. Also provide functions for setting a struct tls_error * directly (rather than having to have a struct tls * or a struct tls_config *).
Diffstat (limited to 'src/lib/libtls/tls_config.c')
-rw-r--r--src/lib/libtls/tls_config.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libtls/tls_config.c b/src/lib/libtls/tls_config.c
index 2e8e049016..8f73a5a45b 100644
--- a/src/lib/libtls/tls_config.c
+++ b/src/lib/libtls/tls_config.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls_config.c,v 1.17 2016/05/27 14:27:22 jsing Exp $ */ 1/* $OpenBSD: tls_config.c,v 1.18 2016/05/27 14:38:40 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -306,7 +306,7 @@ tls_config_set_dheparams(struct tls_config *config, const char *params)
306 else if (strcasecmp(params, "legacy") == 0) 306 else if (strcasecmp(params, "legacy") == 0)
307 keylen = 1024; 307 keylen = 1024;
308 else { 308 else {
309 tls_set_config_errorx(config, "invalid dhe param '%s'", params); 309 tls_config_set_errorx(config, "invalid dhe param '%s'", params);
310 return (-1); 310 return (-1);
311 } 311 }
312 312
@@ -325,7 +325,7 @@ tls_config_set_ecdhecurve(struct tls_config *config, const char *name)
325 else if (strcasecmp(name, "auto") == 0) 325 else if (strcasecmp(name, "auto") == 0)
326 nid = -1; 326 nid = -1;
327 else if ((nid = OBJ_txt2nid(name)) == NID_undef) { 327 else if ((nid = OBJ_txt2nid(name)) == NID_undef) {
328 tls_set_config_errorx(config, "invalid ecdhe curve '%s'", name); 328 tls_config_set_errorx(config, "invalid ecdhe curve '%s'", name);
329 return (-1); 329 return (-1);
330 } 330 }
331 331