diff options
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | cli.c | 4 | ||||
-rw-r--r-- | cli.h | 3 | ||||
-rw-r--r-- | readpass.c | 2 | ||||
-rw-r--r-- | ssh.h | 2 |
5 files changed, 7 insertions, 5 deletions
@@ -6,6 +6,7 @@ | |||
6 | - (djm) Avoid a warning in bsd-bindresvport.c | 6 | - (djm) Avoid a warning in bsd-bindresvport.c |
7 | - (djm) Try to avoid adding -I/usr/include to CPPFLAGS during SSL tests. This | 7 | - (djm) Try to avoid adding -I/usr/include to CPPFLAGS during SSL tests. This |
8 | can cause weird segfaults errors on Solaris | 8 | can cause weird segfaults errors on Solaris |
9 | - (djm) Avoid warning in PAM code by making read_passphrase arguments const | ||
9 | 10 | ||
10 | 20010115 | 11 | 20010115 |
11 | - (bal) sftp-server.c change to use chmod() if fchmod() does not exist. | 12 | - (bal) sftp-server.c change to use chmod() if fchmod() does not exist. |
@@ -129,7 +129,7 @@ cli_read(char* buf, int size, int echo) | |||
129 | } | 129 | } |
130 | 130 | ||
131 | static int | 131 | static int |
132 | cli_write(char* buf, int size) | 132 | cli_write(const char* buf, int size) |
133 | { | 133 | { |
134 | int i, len, pos, ret = 0; | 134 | int i, len, pos, ret = 0; |
135 | char *output, *p; | 135 | char *output, *p; |
@@ -161,7 +161,7 @@ cli_write(char* buf, int size) | |||
161 | * buffer is storing the response. | 161 | * buffer is storing the response. |
162 | */ | 162 | */ |
163 | char* | 163 | char* |
164 | cli_read_passphrase(char* prompt, int from_stdin, int echo_enable) | 164 | cli_read_passphrase(const char* prompt, int from_stdin, int echo_enable) |
165 | { | 165 | { |
166 | char buf[BUFSIZ]; | 166 | char buf[BUFSIZ]; |
167 | char* p; | 167 | char* p; |
@@ -9,7 +9,8 @@ | |||
9 | * of response depending on arg. Tries to ensure that no other userland | 9 | * of response depending on arg. Tries to ensure that no other userland |
10 | * buffer is storing the response. | 10 | * buffer is storing the response. |
11 | */ | 11 | */ |
12 | char* cli_read_passphrase(char* prompt, int from_stdin, int echo_enable); | 12 | char* cli_read_passphrase(const char* prompt, int from_stdin, |
13 | int echo_enable); | ||
13 | char* cli_prompt(char* prompt, int echo_enable); | 14 | char* cli_prompt(char* prompt, int echo_enable); |
14 | void cli_mesg(char* mesg); | 15 | void cli_mesg(char* mesg); |
15 | 16 | ||
diff --git a/readpass.c b/readpass.c index f3a7dcbed..64281edd6 100644 --- a/readpass.c +++ b/readpass.c | |||
@@ -49,7 +49,7 @@ RCSID("$OpenBSD: readpass.c,v 1.12 2000/10/11 20:14:39 markus Exp $"); | |||
49 | * compatibility with existing code. | 49 | * compatibility with existing code. |
50 | */ | 50 | */ |
51 | char * | 51 | char * |
52 | read_passphrase(char *prompt, int from_stdin) | 52 | read_passphrase(const char *prompt, int from_stdin) |
53 | { | 53 | { |
54 | return cli_read_passphrase(prompt, from_stdin, 0); | 54 | return cli_read_passphrase(prompt, from_stdin, 0); |
55 | } | 55 | } |
@@ -418,7 +418,7 @@ int auth_rsa_challenge_dialog(RSA *pk); | |||
418 | * passphrase (allocated with xmalloc). Exits if EOF is encountered. If | 418 | * passphrase (allocated with xmalloc). Exits if EOF is encountered. If |
419 | * from_stdin is true, the passphrase will be read from stdin instead. | 419 | * from_stdin is true, the passphrase will be read from stdin instead. |
420 | */ | 420 | */ |
421 | char *read_passphrase(char *prompt, int from_stdin); | 421 | char *read_passphrase(const char *prompt, int from_stdin); |
422 | 422 | ||
423 | 423 | ||
424 | /*------------ Definitions for logging. -----------------------*/ | 424 | /*------------ Definitions for logging. -----------------------*/ |