summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2020-06-26 05:03:36 +0000
committerDamien Miller <djm@mindrot.org>2020-06-26 15:24:28 +1000
commita3e0c376ffc11862fa3568b28188bd12965973e1 (patch)
tree4c01cf827ee43bafb1a4155e787165ccad9bd6c6
parent74344c3ca42c3f53b00b025daf09ae7f6aa38076 (diff)
upstream: constify a few things; ok dtucker (as part of another
diff) OpenBSD-Commit-ID: 7c17fc987085994d752304bd20b1ae267a9bcdf6
-rw-r--r--authfd.c6
-rw-r--r--authfd.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/authfd.c b/authfd.c
index 4b647a62..8288ef21 100644
--- a/authfd.c
+++ b/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
@@ -336,7 +336,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;
@@ -534,7 +534,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/authfd.h b/authfd.h
index c3bf6259..4fbf82f8 100644
--- a/authfd.h
+++ b/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);