From: djm@openbsd.org <djm@openbsd.org>
Date: Fri, 15 Nov 2019 04:12:32 +0000 (+0000)
Subject: upstream: don't consult dlopen whitelist for internal security key
X-Git-Tag: V_8_2_P1~303
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab3600665387ae34785498558c4409e27f495b0b;p=thirdparty%2Fopenssh-portable.git

upstream: don't consult dlopen whitelist for internal security key

provider; spotted by dtucker@

OpenBSD-Commit-ID: bfe5fbd17e4ff95dd85b9212181652b54444192e
---

diff --git a/ssh-agent.c b/ssh-agent.c
index 97d084230..702dec17d 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.244 2019/11/15 02:38:07 djm Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.245 2019/11/15 04:12:32 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -646,7 +646,9 @@ process_add_identity(SocketEntry *e)
 			free(sk_provider);
 			goto send;
 		}
-		if (match_pattern_list(sk_provider,
+		if (strcasecmp(sk_provider, "internal") == 0)
+			debug("%s: internal provider", __func__);
+		else if (match_pattern_list(sk_provider,
 		    provider_whitelist, 0) != 1) {
 			error("Refusing add key: provider %s not whitelisted",
 			    sk_provider);