summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_srvr.c
diff options
context:
space:
mode:
authorbeck <>2018-11-09 05:43:39 +0000
committerbeck <>2018-11-09 05:43:39 +0000
commitc6acb32cb24165396b53a48759e8cbc90cfc9b60 (patch)
treef86f450a0c28a07039c237526fc15aa1123308c4 /src/lib/libssl/ssl_srvr.c
parent85848fddf8c87379828aad8b378f86e0d5966a60 (diff)
downloadopenbsd-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_srvr.c')
-rw-r--r--src/lib/libssl/ssl_srvr.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_srvr.c b/src/lib/libssl/ssl_srvr.c
index 59d560d06d..51e5475f54 100644
--- a/src/lib/libssl/ssl_srvr.c
+++ b/src/lib/libssl/ssl_srvr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_srvr.c,v 1.53 2018/11/09 05:02:53 beck Exp $ */ 1/* $OpenBSD: ssl_srvr.c,v 1.54 2018/11/09 05:43:39 beck Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -2159,7 +2159,8 @@ ssl3_get_cert_verify(SSL *s)
2159 2159
2160 if (!CBS_get_u16(&cbs, &sigalg)) 2160 if (!CBS_get_u16(&cbs, &sigalg))
2161 goto truncated; 2161 goto truncated;
2162 if ((md = ssl_sigalg_md(sigalg)) == NULL) { 2162 if ((md = ssl_sigalg_md(sigalg, tls12_sigalgs,
2163 tls12_sigalgs_len)) == NULL) {
2163 SSLerror(s, SSL_R_UNKNOWN_DIGEST); 2164 SSLerror(s, SSL_R_UNKNOWN_DIGEST);
2164 al = SSL_AD_DECODE_ERROR; 2165 al = SSL_AD_DECODE_ERROR;
2165 goto f_err; 2166 goto f_err;