diff options
| author |   beck <beck@openbsd.org> | 2019-04-01 02:09:21 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2019-04-01 02:09:21 +0000 |
| commit | c0ee21c180f27ef406886fe3db37eb201c51574c (patch) | |
| tree | 9e86b9ac6a9d18948454b9128c2820822c193d67 /lib/libssl | |
| parent | Bring documentation into better correspondance (diff) | |
| download | wireguard-openbsd-c0ee21c180f27ef406886fe3db37eb201c51574c.tar.xz wireguard-openbsd-c0ee21c180f27ef406886fe3db37eb201c51574c.zip | |
Correct subtle bug in sigalgs, only care about curve_nid if we are
checking the curve.
ok jsing@ tb@
Diffstat (limited to 'lib/libssl')
| -rw-r--r-- | lib/libssl/ssl_sigalgs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/libssl/ssl_sigalgs.c b/lib/libssl/ssl_sigalgs.c index 129ccccfbce..37fdcfa73fc 100644 --- a/lib/libssl/ssl_sigalgs.c +++ b/lib/libssl/ssl_sigalgs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_sigalgs.c,v 1.19 2019/03/25 17:33:26 jsing Exp $ */ +/* $OpenBSD: ssl_sigalgs.c,v 1.20 2019/04/01 02:09:21 beck Exp $ */ /* * Copyright (c) 2018-2019 Bob Beck <beck@openbsd.org> * @@ -244,11 +244,11 @@ ssl_sigalg_pkey_ok(const struct ssl_sigalg *sigalg, EVP_PKEY *pkey, return 0; } - if (pkey->type == EVP_PKEY_EC) { + if (pkey->type == EVP_PKEY_EC && check_curve) { + /* Curve must match for EC keys. */ if (sigalg->curve_nid == 0) return 0; - /* Curve must match for EC keys. */ - if (check_curve && EC_GROUP_get_curve_name(EC_KEY_get0_group + if (EC_GROUP_get_curve_name(EC_KEY_get0_group (EVP_PKEY_get0_EC_KEY(pkey))) != sigalg->curve_nid) { return 0; } |