summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--authfd.c8
-rw-r--r--authfd.h4
-rw-r--r--sshconnect.c6
-rw-r--r--sshconnect.h4
4 files changed, 11 insertions, 11 deletions
diff --git a/authfd.c b/authfd.c
index ac635dff9..148bc9bfb 100644
--- a/authfd.c
+++ b/authfd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: authfd.c,v 1.106 2018/01/23 05:27:21 djm Exp $ */ 1/* $OpenBSD: authfd.c,v 1.107 2018/02/10 09:25:34 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -391,7 +391,7 @@ ssh_agent_sign(int sock, const struct sshkey *key,
391 391
392 392
393static int 393static int
394ssh_encode_identity_ssh2(struct sshbuf *b, struct sshkey *key, 394ssh_encode_identity_ssh2(struct sshbuf *b, const struct sshkey *key,
395 const char *comment) 395 const char *comment)
396{ 396{
397 int r; 397 int r;
@@ -426,8 +426,8 @@ encode_constraints(struct sshbuf *m, u_int life, u_int confirm)
426 * This call is intended only for use by ssh-add(1) and like applications. 426 * This call is intended only for use by ssh-add(1) and like applications.
427 */ 427 */
428int 428int
429ssh_add_identity_constrained(int sock, struct sshkey *key, const char *comment, 429ssh_add_identity_constrained(int sock, const struct sshkey *key,
430 u_int life, u_int confirm) 430 const char *comment, u_int life, u_int confirm)
431{ 431{
432 struct sshbuf *msg; 432 struct sshbuf *msg;
433 int r, constrained = (life || confirm); 433 int r, constrained = (life || confirm);
diff --git a/authfd.h b/authfd.h
index 43abf85da..41997ce6d 100644
--- a/authfd.h
+++ b/authfd.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: authfd.h,v 1.41 2017/06/28 01:09:22 djm Exp $ */ 1/* $OpenBSD: authfd.h,v 1.42 2018/02/10 09:25:34 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -29,7 +29,7 @@ void ssh_close_authentication_socket(int sock);
29int ssh_lock_agent(int sock, int lock, const char *password); 29int ssh_lock_agent(int sock, int lock, const char *password);
30int ssh_fetch_identitylist(int sock, struct ssh_identitylist **idlp); 30int ssh_fetch_identitylist(int sock, struct ssh_identitylist **idlp);
31void ssh_free_identitylist(struct ssh_identitylist *idl); 31void ssh_free_identitylist(struct ssh_identitylist *idl);
32int ssh_add_identity_constrained(int sock, struct sshkey *key, 32int ssh_add_identity_constrained(int sock, const struct sshkey *key,
33 const char *comment, u_int life, u_int confirm); 33 const char *comment, u_int life, u_int confirm);
34int ssh_remove_identity(int sock, struct sshkey *key); 34int ssh_remove_identity(int sock, struct sshkey *key);
35int ssh_update_card(int sock, int add, const char *reader_id, 35int ssh_update_card(int sock, int add, const char *reader_id,
diff --git a/sshconnect.c b/sshconnect.c
index e37bb0856..6eff397d6 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect.c,v 1.293 2018/02/07 22:52:45 dtucker Exp $ */ 1/* $OpenBSD: sshconnect.c,v 1.294 2018/02/10 09:25:35 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1458,8 +1458,8 @@ ssh_local_cmd(const char *args)
1458} 1458}
1459 1459
1460void 1460void
1461maybe_add_key_to_agent(char *authfile, struct sshkey *private, char *comment, 1461maybe_add_key_to_agent(char *authfile, const struct sshkey *private,
1462 char *passphrase) 1462 char *comment, char *passphrase)
1463{ 1463{
1464 int auth_sock = -1, r; 1464 int auth_sock = -1, r;
1465 1465
diff --git a/sshconnect.h b/sshconnect.h
index b5029e234..dd648b096 100644
--- a/sshconnect.h
+++ b/sshconnect.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect.h,v 1.31 2017/09/12 06:32:07 djm Exp $ */ 1/* $OpenBSD: sshconnect.h,v 1.32 2018/02/10 09:25:35 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -57,7 +57,7 @@ void ssh_userauth2(const char *, const char *, char *, Sensitive *);
57void ssh_put_password(char *); 57void ssh_put_password(char *);
58int ssh_local_cmd(const char *); 58int ssh_local_cmd(const char *);
59 59
60void maybe_add_key_to_agent(char *, struct sshkey *, char *, char *); 60void maybe_add_key_to_agent(char *, const struct sshkey *, char *, char *);
61 61
62/* 62/*
63 * Macros to raise/lower permissions. 63 * Macros to raise/lower permissions.