From e03239f999acf9dc3da0f2f72bde36abbe678911 Mon Sep 17 00:00:00 2001
From: "jsg@openbsd.org" <jsg@openbsd.org>
Date: Sun, 22 Sep 2024 12:56:21 +0000
Subject: [PATCH] upstream: remove some unused defines; ok djm@

OpenBSD-Commit-ID: 81869ee6356fdbff19dae6ff757095e6b24de712
---
 authfile.c      | 4 +---
 monitor.c       | 4 +---
 progressmeter.c | 3 +--
 sshkey.c        | 5 +----
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/authfile.c b/authfile.c
index 445f2dd54..4a2f21eb7 100644
--- a/authfile.c
+++ b/authfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfile.c,v 1.144 2023/03/14 07:26:25 dtucker Exp $ */
+/* $OpenBSD: authfile.c,v 1.145 2024/09/22 12:56:21 jsg Exp $ */
 /*
  * Copyright (c) 2000, 2013 Markus Friedl.  All rights reserved.
  *
@@ -49,8 +49,6 @@
 #include "ssherr.h"
 #include "krl.h"
 
-#define MAX_KEY_FILE_SIZE	(1024 * 1024)
-
 /* Save a key blob to a file */
 static int
 sshkey_save_private_blob(struct sshbuf *keybuf, const char *filename)
diff --git a/monitor.c b/monitor.c
index 5966b4f96..f3f79de43 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.244 2024/09/15 01:09:40 djm Exp $ */
+/* $OpenBSD: monitor.c,v 1.245 2024/09/22 12:56:21 jsg Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -1834,8 +1834,6 @@ monitor_openfds(struct monitor *mon, int do_logfds)
 		mon->m_log_recvfd = mon->m_log_sendfd = -1;
 }
 
-#define MM_MEMSIZE	65536
-
 struct monitor *
 monitor_init(void)
 {
diff --git a/progressmeter.c b/progressmeter.c
index 4ee968e74..f1712da30 100644
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: progressmeter.c,v 1.53 2023/04/12 14:22:04 jsg Exp $ */
+/* $OpenBSD: progressmeter.c,v 1.54 2024/09/22 12:56:21 jsg Exp $ */
 /*
  * Copyright (c) 2003 Nils Nordman.  All rights reserved.
  *
@@ -46,7 +46,6 @@
 
 #define DEFAULT_WINSIZE 80
 #define MAX_WINSIZE 512
-#define PADDING 1		/* padding between the progress indicators */
 #define UPDATE_INTERVAL 1	/* update the progress meter every second */
 #define STALL_TIME 5		/* we're stalled after this many seconds */
 
diff --git a/sshkey.c b/sshkey.c
index 1db83788d..73fb89ac2 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.c,v 1.146 2024/09/04 05:33:34 djm Exp $ */
+/* $OpenBSD: sshkey.c,v 1.147 2024/09/22 12:56:21 jsg Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Alexander von Gernler.  All rights reserved.
@@ -79,9 +79,6 @@
 #define DEFAULT_CIPHERNAME	"aes256-ctr"
 #define	DEFAULT_ROUNDS		24
 
-/* Version identification string for SSH v1 identity files. */
-#define LEGACY_BEGIN		"SSH PRIVATE KEY FILE FORMAT 1.1\n"
-
 /*
  * Constants relating to "shielding" support; protection of keys expected
  * to remain in memory for long durations