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

diff --git a/authfd.c b/authfd.c
index ac635dff985f9003a11441019a967a086b9a7c7d..148bc9bfbaea081f03049c7299220182d6de420e 100644 (file)
--- a/authfd.c
+++ b/authfd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfd.c,v 1.106 2018/01/23 05:27:21 djm Exp $ */
+/* $OpenBSD: authfd.c,v 1.107 2018/02/10 09:25:34 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -391,7 +391,7 @@ ssh_agent_sign(int sock, const struct sshkey *key,
 
 
 static int
-ssh_encode_identity_ssh2(struct sshbuf *b, struct sshkey *key,
+ssh_encode_identity_ssh2(struct sshbuf *b, const struct sshkey *key,
     const char *comment)
 {
        int r;
@@ -426,8 +426,8 @@ encode_constraints(struct sshbuf *m, u_int life, u_int confirm)
  * This call is intended only for use by ssh-add(1) and like applications.
  */
 int
-ssh_add_identity_constrained(int sock, struct sshkey *key, const char *comment,
-    u_int life, u_int confirm)
+ssh_add_identity_constrained(int sock, const struct sshkey *key,
+    const char *comment, u_int life, u_int confirm)
 {
        struct sshbuf *msg;
        int r, constrained = (life || confirm);

diff --git a/authfd.h b/authfd.h
index 43abf85dadfed9621e36ee5338c5b09dadd0a6c3..41997ce6d293580c7f3ad6bf2ce2b9693a668590 100644 (file)
--- a/authfd.h
+++ b/authfd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfd.h,v 1.41 2017/06/28 01:09:22 djm Exp $ */
+/* $OpenBSD: authfd.h,v 1.42 2018/02/10 09:25:34 djm Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -29,7 +29,7 @@ void  ssh_close_authentication_socket(int sock);
 int    ssh_lock_agent(int sock, int lock, const char *password);
 int    ssh_fetch_identitylist(int sock, struct ssh_identitylist **idlp);
 void   ssh_free_identitylist(struct ssh_identitylist *idl);
-int    ssh_add_identity_constrained(int sock, struct sshkey *key,
+int    ssh_add_identity_constrained(int sock, const struct sshkey *key,
            const char *comment, u_int life, u_int confirm);
 int    ssh_remove_identity(int sock, struct sshkey *key);
 int    ssh_update_card(int sock, int add, const char *reader_id,

diff --git a/sshconnect.c b/sshconnect.c
index e37bb085661e0f74c960bbe31227cdbca59290ef..6eff397d694e009276167425a42e873fa569fdaa 100644 (file)
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.293 2018/02/07 22:52:45 dtucker Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.294 2018/02/10 09:25:35 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1458,8 +1458,8 @@ ssh_local_cmd(const char *args)
 }
 
 void
-maybe_add_key_to_agent(char *authfile, struct sshkey *private, char *comment,
-    char *passphrase)
+maybe_add_key_to_agent(char *authfile, const struct sshkey *private,
+    char *comment, char *passphrase)
 {
        int auth_sock = -1, r;
 

diff --git a/sshconnect.h b/sshconnect.h
index b5029e2347e059a8f9e394a793386317ee537056..dd648b096e9eecc7246e58bc3d1ed2b3bce4fd9b 100644 (file)
--- a/sshconnect.h
+++ b/sshconnect.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.h,v 1.31 2017/09/12 06:32:07 djm Exp $ */
+/* $OpenBSD: sshconnect.h,v 1.32 2018/02/10 09:25:35 djm Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -57,7 +57,7 @@ void   ssh_userauth2(const char *, const char *, char *, Sensitive *);
 void    ssh_put_password(char *);
 int     ssh_local_cmd(const char *);
 
-void    maybe_add_key_to_agent(char *, struct sshkey *, char *, char *);
+void    maybe_add_key_to_agent(char *, const struct sshkey *, char *, char *);
 
 /*
  * Macros to raise/lower permissions.