tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream: fix double words ok dtucker@ 

OpenBSD-Commit-ID: 44d3223902fbce5276422bdc8063ab72a4078489
This commit is contained in:
jsg@openbsd.org 2023-04-12 08:53:54 +00:00 committed by Damien Miller
parent 6452f89577
commit 740dafa20f
No known key found for this signature in database
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PROTOCOL.agent
View File

@ -31,7 +31,7 @@ should be bound for user authentication or forwarding.
When an agent received this message, it will verify the signature and When an agent received this message, it will verify the signature and
check the consistency of its contents, including refusing to accept check the consistency of its contents, including refusing to accept
a duplicate session identifier, or any attempt to bind a connection a duplicate session identifier, or any attempt to bind a connection
previously bound for authentication. It will then then record the previously bound for authentication. It will then record the
binding for the life of the connection for use later in testing per-key binding for the life of the connection for use later in testing per-key
destination constraints. destination constraints.
@ -81,4 +81,4 @@ the constraint is:
This option is only valid for XMSS keys. This option is only valid for XMSS keys.
$OpenBSD: PROTOCOL.agent,v 1.18 2022/09/21 22:26:50 dtucker Exp $ $OpenBSD: PROTOCOL.agent,v 1.19 2023/04/12 08:53:54 jsg Exp $

4
sftp-server.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sftp-server.c,v 1.146 2023/03/07 05:37:26 djm Exp $ */ /* $OpenBSD: sftp-server.c,v 1.147 2023/04/12 08:53:54 jsg Exp $ */
/* /*
* Copyright (c) 2000-2004 Markus Friedl. All rights reserved. * Copyright (c) 2000-2004 Markus Friedl. All rights reserved.
* *
@ -607,7 +607,7 @@ send_handle(u_int32_t id, int handle)
int hlen; int hlen;
handle_to_string(handle, &string, &hlen); handle_to_string(handle, &string, &hlen);
debug("request %u: sent handle handle %d", id, handle); debug("request %u: sent handle %d", id, handle);
send_data_or_handle(SSH2_FXP_HANDLE, id, string, hlen); send_data_or_handle(SSH2_FXP_HANDLE, id, string, hlen);
free(string); free(string);
} }

4
sftp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sftp.c,v 1.233 2023/04/06 03:12:32 djm Exp $ */ /* $OpenBSD: sftp.c,v 1.234 2023/04/12 08:53:54 jsg Exp $ */
/* /*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
* *
@ -618,7 +618,7 @@ escape_glob(const char *s)
/* /*
* Arg p must be dynamically allocated. make_absolute will either return it * Arg p must be dynamically allocated. make_absolute will either return it
* or free it and and allocate a new one. Caller must free returned string. * or free it and allocate a new one. Caller must free returned string.
*/ */
static char * static char *
make_absolute_pwd_glob(char *p, const char *pwd) make_absolute_pwd_glob(char *p, const char *pwd)

4
ssh-keygen.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.466 2023/03/08 00:05:37 djm Exp $ */ /* $OpenBSD: ssh-keygen.c,v 1.467 2023/04/12 08:53:54 jsg Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1186,7 +1186,7 @@ known_hosts_hash(struct hostkey_foreach_line *l, void *_ctx)
case HKF_STATUS_OK: case HKF_STATUS_OK:
case HKF_STATUS_MATCHED: case HKF_STATUS_MATCHED:
/* /*
* Don't hash hosts already already hashed, with wildcard * Don't hash hosts already hashed, with wildcard
* characters or a CA/revocation marker. * characters or a CA/revocation marker.
*/ */
if (was_hashed || has_wild || l->marker != MRK_NONE) { if (was_hashed || has_wild || l->marker != MRK_NONE) {