diff options
author | beck <> | 2018-11-09 05:43:39 +0000 |
---|---|---|
committer | beck <> | 2018-11-09 05:43:39 +0000 |
commit | c6acb32cb24165396b53a48759e8cbc90cfc9b60 (patch) | |
tree | f86f450a0c28a07039c237526fc15aa1123308c4 /src/lib/libssl/ssl_sigalgs.c | |
parent | 85848fddf8c87379828aad8b378f86e0d5966a60 (diff) | |
download | openbsd-c6acb32cb24165396b53a48759e8cbc90cfc9b60.tar.gz openbsd-c6acb32cb24165396b53a48759e8cbc90cfc9b60.tar.bz2 openbsd-c6acb32cb24165396b53a48759e8cbc90cfc9b60.zip |
Ensure we only choose sigalgs from our prefernce list, not the whole list
ok jsing@
Diffstat (limited to 'src/lib/libssl/ssl_sigalgs.c')
-rw-r--r-- | src/lib/libssl/ssl_sigalgs.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_sigalgs.c b/src/lib/libssl/ssl_sigalgs.c index fe10965feb..3f82117dcf 100644 --- a/src/lib/libssl/ssl_sigalgs.c +++ b/src/lib/libssl/ssl_sigalgs.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_sigalgs.c,v 1.2 2018/11/09 05:02:53 beck Exp $ */ | 1 | /* $OpenBSD: ssl_sigalgs.c,v 1.3 2018/11/09 05:43:39 beck Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2018, Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2018, Bob Beck <beck@openbsd.org> |
4 | * | 4 | * |
@@ -188,12 +188,19 @@ ssl_sigalg_lookup(uint16_t sigalg) | |||
188 | } | 188 | } |
189 | 189 | ||
190 | const EVP_MD * | 190 | const EVP_MD * |
191 | ssl_sigalg_md(uint16_t sigalg) | 191 | ssl_sigalg_md(uint16_t sigalg, uint16_t *values, size_t len) |
192 | { | 192 | { |
193 | const struct ssl_sigalg *sap; | 193 | const struct ssl_sigalg *sap; |
194 | int i; | ||
194 | 195 | ||
195 | if ((sap = ssl_sigalg_lookup(sigalg)) != NULL) | 196 | for (i = 0; i < len; i++) { |
196 | return sap->md(); | 197 | if (values[i] == sigalg) |
198 | break; | ||
199 | } | ||
200 | if (values[i] == sigalg) { | ||
201 | if ((sap = ssl_sigalg_lookup(sigalg)) != NULL) | ||
202 | return sap->md(); | ||
203 | } | ||
197 | 204 | ||
198 | return NULL; | 205 | return NULL; |
199 | } | 206 | } |