From: djm@openbsd.org <djm@openbsd.org>
Date: Thu, 31 Oct 2019 21:28:27 +0000 (+0000)
Subject: upstream: fix -Wshadow warning
X-Git-Tag: V_8_2_P1~376
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b923a90abc7bccb11a513dc8b5c0f13a0ea9682c;p=thirdparty%2Fopenssh-portable.git

upstream: fix -Wshadow warning

OpenBSD-Commit-ID: 3441eb04f872a00c2483c11a5f1570dfe775103c
---

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 14bf2560d..0d0586576 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.358 2019/10/31 21:23:19 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.359 2019/10/31 21:28:27 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1711,7 +1711,7 @@ load_pkcs11_key(char *path)
 static int
 agent_signer(struct sshkey *key, u_char **sigp, size_t *lenp,
     const u_char *data, size_t datalen,
-    const char *alg, const char *sk_provider, u_int compat, void *ctx)
+    const char *alg, const char *provider, u_int compat, void *ctx)
 {
 	int *agent_fdp = (int *)ctx;