summaryrefslogtreecommitdiff
path: root/authfd.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2018-02-10 09:25:34 +0000
committerDamien Miller <djm@mindrot.org>2018-02-10 20:26:40 +1100
commitd9e5cf078ea5380da6df767bb1773802ec557ef0 (patch)
tree22ddb85f348a21fbd762b084bd4aab65c2ff221a /authfd.c
parenta7c38215d564bf98e8e9eb40c1079e3adf686f15 (diff)
upstream commit
constify some private key-related functions; based on https://github.com/openssh/openssh-portable/pull/56 by Vincent Brillault OpenBSD-Commit-ID: dcb94a41834a15f4d00275cb5051616fdc4c988c
Diffstat (limited to 'authfd.c')
-rw-r--r--authfd.c8
1 files changed, 4 insertions, 4 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);