summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_clnt.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_clnt.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_clnt.c')
-rw-r--r--src/lib/libssl/ssl_clnt.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_clnt.c b/src/lib/libssl/ssl_clnt.c
index f1b3d40e7c..5dbda1f2fa 100644
--- a/src/lib/libssl/ssl_clnt.c
+++ b/src/lib/libssl/ssl_clnt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_clnt.c,v 1.38 2018/11/09 00:34:55 beck Exp $ */ 1/* $OpenBSD: ssl_clnt.c,v 1.39 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 *
@@ -1510,7 +1510,8 @@ ssl3_get_server_key_exchange(SSL *s)
1510 1510
1511 if (!CBS_get_u16(&cbs, &sigalg)) 1511 if (!CBS_get_u16(&cbs, &sigalg))
1512 goto truncated; 1512 goto truncated;
1513 if ((md = ssl_sigalg_md(sigalg)) == NULL) { 1513 if ((md = ssl_sigalg_md(sigalg, tls12_sigalgs,
1514 tls12_sigalgs_len)) == NULL) {
1514 SSLerror(s, SSL_R_UNKNOWN_DIGEST); 1515 SSLerror(s, SSL_R_UNKNOWN_DIGEST);
1515 al = SSL_AD_DECODE_ERROR; 1516 al = SSL_AD_DECODE_ERROR;
1516 goto f_err; 1517 goto f_err;