From c6acb32cb24165396b53a48759e8cbc90cfc9b60 Mon Sep 17 00:00:00 2001
From: beck <>
Date: Fri, 9 Nov 2018 05:43:39 +0000
Subject: Ensure we only choose sigalgs from our prefernce list, not the whole
 list ok jsing@

---
 src/lib/libssl/ssl_sigalgs.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/lib/libssl/ssl_sigalgs.c')

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 @@
-/* $OpenBSD: ssl_sigalgs.c,v 1.2 2018/11/09 05:02:53 beck Exp $ */
+/* $OpenBSD: ssl_sigalgs.c,v 1.3 2018/11/09 05:43:39 beck Exp $ */
 /*
  * Copyright (c) 2018, Bob Beck <beck@openbsd.org>
  *
@@ -188,12 +188,19 @@ ssl_sigalg_lookup(uint16_t sigalg)
 }
 
 const EVP_MD *
-ssl_sigalg_md(uint16_t sigalg)
+ssl_sigalg_md(uint16_t sigalg, uint16_t *values, size_t len)
 {
 	const struct ssl_sigalg *sap;
+	int i;
 
-	if ((sap = ssl_sigalg_lookup(sigalg)) != NULL)
-		return sap->md();
+	for (i = 0; i < len; i++) {
+		if (values[i] == sigalg)
+			break;
+	}
+	if (values[i] == sigalg) {
+		if ((sap = ssl_sigalg_lookup(sigalg)) != NULL)
+			return sap->md();
+	}
 
 	return NULL;
 }
-- 
cgit v1.2.3-55-g6feb