diff options
| author |   jsing <jsing@openbsd.org> | 2018-03-20 15:40:10 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2018-03-20 15:40:10 +0000 |
| commit | 1556a9e07ec6fd929a1670e17798956ddfbb34cb (patch) | |
| tree | 1c732802781195ffcb0a86b0d42a6ebcb5a8d1d0 | |
| parent | sync (diff) | |
| download | wireguard-openbsd-1556a9e07ec6fd929a1670e17798956ddfbb34cb.tar.xz wireguard-openbsd-1556a9e07ec6fd929a1670e17798956ddfbb34cb.zip | |
Avoid potentially calling strchr() on a NULL pointer in
tls_config_set_ecdhecurve().
Spotted by Coverity.
| -rw-r--r-- | lib/libtls/tls_config.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/libtls/tls_config.c b/lib/libtls/tls_config.c index 02f2b3c6e92..d32176fe6e1 100644 --- a/lib/libtls/tls_config.c +++ b/lib/libtls/tls_config.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tls_config.c,v 1.50 2018/03/19 16:34:47 jsing Exp $ */ +/* $OpenBSD: tls_config.c,v 1.51 2018/03/20 15:40:10 jsing Exp $ */ /* * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> * @@ -517,17 +517,16 @@ tls_config_set_dheparams(struct tls_config *config, const char *params) int tls_config_set_ecdhecurve(struct tls_config *config, const char *curve) { - if (strchr(curve, ',') != NULL || strchr(curve, ':') != NULL) { + if (curve == NULL || + strcasecmp(curve, "none") == 0 || + strcasecmp(curve, "auto") == 0) { + curve = TLS_ECDHE_CURVES; + } else if (strchr(curve, ',') != NULL || strchr(curve, ':') != NULL) { tls_config_set_errorx(config, "invalid ecdhe curve '%s'", curve); return (-1); } - if (curve == NULL || - strcasecmp(curve, "none") == 0 || - strcasecmp(curve, "auto") == 0) - curve = TLS_ECDHE_CURVES; - return tls_config_set_ecdhecurves(config, curve); } |