diff options
| author |   djm <djm@openbsd.org> | 2020-06-26 05:03:36 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-06-26 05:03:36 +0000 |
| commit | 9f2010443c5a8942d4360ea8f27c128cfef311f1 (patch) | |
| tree | 11bff04afd2fa176c6fa9fed3895b74624414c0e | |
| parent | Defer creation of ~/.ssh by ssh(1) until we attempt to write to it so we (diff) | |
| download | wireguard-openbsd-9f2010443c5a8942d4360ea8f27c128cfef311f1.tar.xz wireguard-openbsd-9f2010443c5a8942d4360ea8f27c128cfef311f1.zip | |
constify a few things; ok dtucker (as part of another diff)
| -rw-r--r-- | usr.bin/ssh/authfd.c | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/authfd.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/ssh/authfd.c b/usr.bin/ssh/authfd.c index 488087540eb..ab5b2b705b8 100644 --- a/usr.bin/ssh/authfd.c +++ b/usr.bin/ssh/authfd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: authfd.c,v 1.123 2020/03/06 18:24:39 markus Exp $ */ +/* $OpenBSD: authfd.c,v 1.124 2020/06/26 05:03:36 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -335,7 +335,7 @@ ssh_free_identitylist(struct ssh_identitylist *idl) * Returns 0 if found, or a negative SSH_ERR_* error code on failure. */ int -ssh_agent_has_key(int sock, struct sshkey *key) +ssh_agent_has_key(int sock, const struct sshkey *key) { int r, ret = SSH_ERR_KEY_NOT_FOUND; size_t i; @@ -533,7 +533,7 @@ ssh_add_identity_constrained(int sock, struct sshkey *key, * This call is intended only for use by ssh-add(1) and like applications. */ int -ssh_remove_identity(int sock, struct sshkey *key) +ssh_remove_identity(int sock, const struct sshkey *key) { struct sshbuf *msg; int r; diff --git a/usr.bin/ssh/authfd.h b/usr.bin/ssh/authfd.h index c3bf6259aa9..4fbf82f8c00 100644 --- a/usr.bin/ssh/authfd.h +++ b/usr.bin/ssh/authfd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: authfd.h,v 1.48 2019/12/21 02:19:13 djm Exp $ */ +/* $OpenBSD: authfd.h,v 1.49 2020/06/26 05:03:36 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -33,8 +33,8 @@ void ssh_free_identitylist(struct ssh_identitylist *idl); int ssh_add_identity_constrained(int sock, struct sshkey *key, const char *comment, u_int life, u_int confirm, u_int maxsign, const char *provider); -int ssh_agent_has_key(int sock, struct sshkey *key); -int ssh_remove_identity(int sock, struct sshkey *key); +int ssh_agent_has_key(int sock, const struct sshkey *key); +int ssh_remove_identity(int sock, const struct sshkey *key); int ssh_update_card(int sock, int add, const char *reader_id, const char *pin, u_int life, u_int confirm); int ssh_remove_all_identities(int sock, int version); |