diff options
| author |   jsing <jsing@openbsd.org> | 2017-08-11 18:48:56 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2017-08-11 18:48:56 +0000 |
| commit | 89f7e9973b8f634051268c13accf6e449a53d03c (patch) | |
| tree | 38a44824ce14269a1992f73f5246301197fb4c32 /usr.sbin/httpd/server.c | |
| parent | pledge ctfdump to stdio and rpath (diff) | |
| download | wireguard-openbsd-89f7e9973b8f634051268c13accf6e449a53d03c.tar.xz wireguard-openbsd-89f7e9973b8f634051268c13accf6e449a53d03c.zip | |
Convert httpd to tls_config_set_ecdhecurves(), allowing a list of curves
to be specified, rather than a single curve.
ok beck@
Diffstat (limited to 'usr.sbin/httpd/server.c')
| -rw-r--r-- | usr.sbin/httpd/server.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/httpd/server.c b/usr.sbin/httpd/server.c index 8270a85d973..1a57d0be055 100644 --- a/usr.sbin/httpd/server.c +++ b/usr.sbin/httpd/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.110 2017/07/19 17:36:25 jsing Exp $ */ +/* $OpenBSD: server.c,v 1.111 2017/08/11 18:48:56 jsing Exp $ */ /* * Copyright (c) 2006 - 2015 Reyk Floeter <reyk@openbsd.org> @@ -142,7 +142,7 @@ server_tls_cmp(struct server *s1, struct server *s2, int match_keypair) return (-1); if (strcmp(sc1->tls_dhe_params, sc2->tls_dhe_params) != 0) return (-1); - if (strcmp(sc1->tls_ecdhe_curve, sc2->tls_ecdhe_curve) != 0) + if (strcmp(sc1->tls_ecdhe_curves, sc2->tls_ecdhe_curves) != 0) return (-1); if (match_keypair) { @@ -237,9 +237,9 @@ server_tls_init(struct server *srv) __func__, tls_config_error(srv->srv_tls_config)); return (-1); } - if (tls_config_set_ecdhecurve(srv->srv_tls_config, - srv->srv_conf.tls_ecdhe_curve) != 0) { - log_warnx("%s: failed to set tls ecdhe curve: %s", + if (tls_config_set_ecdhecurves(srv->srv_tls_config, + srv->srv_conf.tls_ecdhe_curves) != 0) { + log_warnx("%s: failed to set tls ecdhe curves: %s", __func__, tls_config_error(srv->srv_tls_config)); return (-1); } |