- Update to 8.4p1 (skipped 8.3)

 - https://www.openssh.com/txt/release-8.3
 - https://www.openssh.com/txt/release-8.4

PR:		239807, 250319
Sponsored by:	Dell EMC

1 files changed, 15 insertions, 15 deletions

diff --git a/security/openssh-portable/files/patch-ssh-agent.c b/security/openssh-portable/files/patch-ssh-agent.c
index 5cfaabd07ac2..547c8e4958e2 100644
--- a/security/openssh-portable/files/patch-ssh-agent.c
+++ b/security/openssh-portable/files/patch-ssh-agent.c
@@ -8,11 +8,11 @@ r226103 | des | 2011-10-07 08:10:16 -0500 (Fri, 07 Oct 2011) | 5 lines
 Add a -x option that causes ssh-agent(1) to exit when all clients have
 disconnected.
 
---- ssh-agent.c.orig	2020-02-13 16:40:54.000000000 -0800
-+++ ssh-agent.c	2020-03-21 17:04:44.305866000 -0700
-@@ -167,15 +167,34 @@ static long lifetime = 0;
- 
- static int fingerprint_hash = SSH_FP_HASH_DEFAULT;
+--- ssh-agent.c.orig	2020-09-27 00:25:01.000000000 -0700
++++ ssh-agent.c	2020-11-09 09:07:10.924940000 -0800
+@@ -171,15 +171,34 @@ static int fingerprint_hash = SSH_FP_HASH_DEFAULT;
+ /* Refuse signing of non-SSH messages for web-origin FIDO keys */
+ static int restrict_websafe = 1;
  
 +/*
 + * Client connection count; incremented in new_socket() and decremented in
@@ -45,7 +45,7 @@ disconnected.
  }
  
  static void
-@@ -875,6 +894,10 @@ new_socket(sock_type type, int fd)
+@@ -961,6 +980,10 @@ new_socket(sock_type type, int fd)
  {
  	u_int i, old_alloc, new_alloc;
  
@@ -56,16 +56,16 @@ disconnected.
  	set_nonblock(fd);
  
  	if (fd > max_fd)
-@@ -1170,7 +1193,7 @@ static void
+@@ -1261,7 +1284,7 @@ static void
  usage(void)
  {
  	fprintf(stderr,
 -	    "usage: ssh-agent [-c | -s] [-Dd] [-a bind_address] [-E fingerprint_hash]\n"
 +	    "usage: ssh-agent [-c | -s] [-Ddx] [-a bind_address] [-E fingerprint_hash]\n"
- 	    "                 [-P provider_whitelist] [-t life] [command [arg ...]]\n"
- 	    "       ssh-agent [-c | -s] -k\n");
- 	exit(1);
-@@ -1202,6 +1225,7 @@ main(int ac, char **av)
+ 	    "                 [-P allowed_providers] [-t life]\n"
+ 	    "       ssh-agent [-a bind_address] [-E fingerprint_hash] [-P allowed_providers]\n"
+ 	    "                 [-t life] command [arg ...]\n"
+@@ -1295,6 +1318,7 @@ main(int ac, char **av)
  	/* drop */
  	setegid(getgid());
  	setgid(getgid());
@@ -73,16 +73,16 @@ disconnected.
  
  	platform_disable_tracing(0);	/* strict=no */
  
-@@ -1213,7 +1237,7 @@ main(int ac, char **av)
+@@ -1306,7 +1330,7 @@ main(int ac, char **av)
  	__progname = ssh_get_progname(av[0]);
  	seed_rng();
  
--	while ((ch = getopt(ac, av, "cDdksE:a:P:t:")) != -1) {
-+	while ((ch = getopt(ac, av, "cDdksE:a:P:t:x")) != -1) {
+-	while ((ch = getopt(ac, av, "cDdksE:a:O:P:t:")) != -1) {
++	while ((ch = getopt(ac, av, "cDdksE:a:O:P:t:x")) != -1) {
  		switch (ch) {
  		case 'E':
  			fingerprint_hash = ssh_digest_alg_by_name(optarg);
-@@ -1256,6 +1280,9 @@ main(int ac, char **av)
+@@ -1355,6 +1379,9 @@ main(int ac, char **av)
  				fprintf(stderr, "Invalid lifetime\n");
  				usage();
  			}