upstream: Remove duplicate includes.

 Patch from AtariDreams via github PR#364.

OpenBSD-Commit-ID: b9186638a05cb8b56ef7c0de521922b6723644ea

diff --git a/ssh-agent.c b/ssh-agent.c
index 44eb0a681c3ea98b46a1c922e54363f77605af87..63e1137bca64c11898d6032532156d0e04ecfa64 100644 (file)
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.293 2022/10/07 06:00:58 jmc Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.294 2022/12/04 11:03:11 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -87,7 +87,6 @@
 #include "ssherr.h"
 #include "match.h"
 #include "msg.h"
-#include "ssherr.h"
 #include "pathnames.h"
 #include "ssh-pkcs11.h"
 #include "sk-api.h"

diff --git a/ssh-sk-helper.c b/ssh-sk-helper.c
index bd9b410a697464dc6bf7b3488cb5834f5b8bf9f3..9857b632bfcba8e924c4cb1afc7790c92ae99327 100644 (file)
--- a/ssh-sk-helper.c
+++ b/ssh-sk-helper.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-sk-helper.c,v 1.13 2022/04/29 03:16:48 dtucker Exp $ */
+/* $OpenBSD: ssh-sk-helper.c,v 1.14 2022/12/04 11:03:11 dtucker Exp $ */
 /*
  * Copyright (c) 2019 Google LLC
  *
@@ -43,7 +43,6 @@
 #include "sshbuf.h"
 #include "msg.h"
 #include "uidswap.h"
-#include "sshkey.h"
 #include "ssherr.h"
 #include "ssh-sk.h"