diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | auth-rhosts.c | 4 | ||||
-rw-r--r-- | auth-rsa.c | 4 | ||||
-rw-r--r-- | authfd.c | 4 | ||||
-rw-r--r-- | ssh-agent.c | 6 | ||||
-rw-r--r-- | sshconnect.c | 4 | ||||
-rw-r--r-- | sshd.c | 5 |
7 files changed, 18 insertions, 14 deletions
@@ -1,5 +1,10 @@ | |||
1 | 19991119 | 1 | 19991119 |
2 | - Merged PAM buffer overrun patch from Chip Salzenberg <chip@valinux.com> | 2 | - Merged PAM buffer overrun patch from Chip Salzenberg <chip@valinux.com> |
3 | - Merged OpenBSD CVS changes | ||
4 | - [auth-rhosts.c auth-rsa.c ssh-agent.c sshconnect.c sshd.c] | ||
5 | more %d vs. %s in fmt-strings | ||
6 | - [authfd.c] | ||
7 | Integers should not be printed with %s | ||
3 | 8 | ||
4 | 19991118 | 9 | 19991118 |
5 | - Merged OpenBSD CVS changes | 10 | - Merged OpenBSD CVS changes |
diff --git a/auth-rhosts.c b/auth-rhosts.c index 8f6655d4d..dc82849be 100644 --- a/auth-rhosts.c +++ b/auth-rhosts.c | |||
@@ -16,7 +16,7 @@ the login based on rhosts authentication. This file also processes | |||
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include "includes.h" | 18 | #include "includes.h" |
19 | RCSID("$Id: auth-rhosts.c,v 1.3 1999/11/15 04:25:10 damien Exp $"); | 19 | RCSID("$Id: auth-rhosts.c,v 1.4 1999/11/18 21:25:48 damien Exp $"); |
20 | 20 | ||
21 | #include "packet.h" | 21 | #include "packet.h" |
22 | #include "ssh.h" | 22 | #include "ssh.h" |
@@ -213,7 +213,7 @@ int auth_rhosts(struct passwd *pw, const char *client_user) | |||
213 | group or world writable. */ | 213 | group or world writable. */ |
214 | if (stat(pw->pw_dir, &st) < 0) | 214 | if (stat(pw->pw_dir, &st) < 0) |
215 | { | 215 | { |
216 | log("Rhosts authentication refused for %.100: no home directory %.200s", | 216 | log("Rhosts authentication refused for %.100s: no home directory %.200s", |
217 | pw->pw_name, pw->pw_dir); | 217 | pw->pw_name, pw->pw_dir); |
218 | packet_send_debug("Rhosts authentication refused for %.100: no home directory %.200s", | 218 | packet_send_debug("Rhosts authentication refused for %.100: no home directory %.200s", |
219 | pw->pw_name, pw->pw_dir); | 219 | pw->pw_name, pw->pw_dir); |
diff --git a/auth-rsa.c b/auth-rsa.c index 6041a3211..f2295078b 100644 --- a/auth-rsa.c +++ b/auth-rsa.c | |||
@@ -16,7 +16,7 @@ validity of the host key. | |||
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include "includes.h" | 18 | #include "includes.h" |
19 | RCSID("$Id: auth-rsa.c,v 1.7 1999/11/16 02:37:16 damien Exp $"); | 19 | RCSID("$Id: auth-rsa.c,v 1.8 1999/11/18 21:25:48 damien Exp $"); |
20 | 20 | ||
21 | #include "rsa.h" | 21 | #include "rsa.h" |
22 | #include "packet.h" | 22 | #include "packet.h" |
@@ -265,7 +265,7 @@ auth_rsa(struct passwd *pw, BIGNUM *client_n) | |||
265 | 265 | ||
266 | /* check the real bits */ | 266 | /* check the real bits */ |
267 | if (bits != BN_num_bits(n)) | 267 | if (bits != BN_num_bits(n)) |
268 | error("Warning: error in %s, line %d: keysize mismatch: " | 268 | error("Warning: error in %s, line %ld: keysize mismatch: " |
269 | "actual size %d vs. announced %d.", | 269 | "actual size %d vs. announced %d.", |
270 | file, linenum, BN_num_bits(n), bits); | 270 | file, linenum, BN_num_bits(n), bits); |
271 | 271 | ||
@@ -14,7 +14,7 @@ Functions for connecting the local authentication agent. | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "includes.h" | 16 | #include "includes.h" |
17 | RCSID("$Id: authfd.c,v 1.5 1999/11/17 06:29:08 damien Exp $"); | 17 | RCSID("$Id: authfd.c,v 1.6 1999/11/18 21:25:48 damien Exp $"); |
18 | 18 | ||
19 | #include "ssh.h" | 19 | #include "ssh.h" |
20 | #include "rsa.h" | 20 | #include "rsa.h" |
@@ -212,7 +212,7 @@ ssh_get_next_identity(AuthenticationConnection *auth, | |||
212 | *comment = buffer_get_string(&auth->identities, NULL); | 212 | *comment = buffer_get_string(&auth->identities, NULL); |
213 | 213 | ||
214 | if (bits != BN_num_bits(n)) | 214 | if (bits != BN_num_bits(n)) |
215 | error("Warning: keysize mismatch: actual %d, announced %s", | 215 | error("Warning: keysize mismatch: actual %d, announced %u", |
216 | BN_num_bits(n), bits); | 216 | BN_num_bits(n), bits); |
217 | 217 | ||
218 | /* Decrement the number of remaining entries. */ | 218 | /* Decrement the number of remaining entries. */ |
diff --git a/ssh-agent.c b/ssh-agent.c index 743cdb20d..296bb4c76 100644 --- a/ssh-agent.c +++ b/ssh-agent.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-agent.c,v 1.18 1999/11/15 20:53:24 markus Exp $ */ | 1 | /* $OpenBSD: ssh-agent.c,v 1.19 1999/11/18 14:00:49 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | 4 | ||
@@ -16,7 +16,7 @@ The authentication agent program. | |||
16 | */ | 16 | */ |
17 | 17 | ||
18 | #include "includes.h" | 18 | #include "includes.h" |
19 | RCSID("$OpenBSD: ssh-agent.c,v 1.18 1999/11/15 20:53:24 markus Exp $"); | 19 | RCSID("$OpenBSD: ssh-agent.c,v 1.19 1999/11/18 14:00:49 markus Exp $"); |
20 | 20 | ||
21 | #include "ssh.h" | 21 | #include "ssh.h" |
22 | #include "rsa.h" | 22 | #include "rsa.h" |
@@ -197,7 +197,7 @@ process_remove_identity(SocketEntry *e) | |||
197 | buffer_get_bignum(&e->input, n); | 197 | buffer_get_bignum(&e->input, n); |
198 | 198 | ||
199 | if (bits != BN_num_bits(n)) | 199 | if (bits != BN_num_bits(n)) |
200 | error("Warning: keysize mismatch: actual %d, announced %s", | 200 | error("Warning: keysize mismatch: actual %d, announced %d", |
201 | BN_num_bits(n), bits); | 201 | BN_num_bits(n), bits); |
202 | 202 | ||
203 | /* Check if we have the key. */ | 203 | /* Check if we have the key. */ |
diff --git a/sshconnect.c b/sshconnect.c index 74d41e62a..8b7737446 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -15,7 +15,7 @@ login (authentication) dialog. | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "includes.h" | 17 | #include "includes.h" |
18 | RCSID("$Id: sshconnect.c,v 1.11 1999/11/17 22:28:11 damien Exp $"); | 18 | RCSID("$Id: sshconnect.c,v 1.12 1999/11/18 21:25:48 damien Exp $"); |
19 | 19 | ||
20 | #ifdef HAVE_OPENSSL | 20 | #ifdef HAVE_OPENSSL |
21 | #include <openssl/bn.h> | 21 | #include <openssl/bn.h> |
@@ -1354,7 +1354,7 @@ void ssh_login(int host_key_valid, | |||
1354 | if (cipher_mask() & supported_ciphers & (1 << ssh_cipher_default)) | 1354 | if (cipher_mask() & supported_ciphers & (1 << ssh_cipher_default)) |
1355 | options.cipher = ssh_cipher_default; | 1355 | options.cipher = ssh_cipher_default; |
1356 | else { | 1356 | else { |
1357 | debug("Cipher %d not supported, using %.100s instead.", | 1357 | debug("Cipher %s not supported, using %.100s instead.", |
1358 | cipher_name(ssh_cipher_default), | 1358 | cipher_name(ssh_cipher_default), |
1359 | cipher_name(SSH_FALLBACK_CIPHER)); | 1359 | cipher_name(SSH_FALLBACK_CIPHER)); |
1360 | options.cipher = SSH_FALLBACK_CIPHER; | 1360 | options.cipher = SSH_FALLBACK_CIPHER; |
@@ -18,7 +18,7 @@ agent connections. | |||
18 | */ | 18 | */ |
19 | 19 | ||
20 | #include "includes.h" | 20 | #include "includes.h" |
21 | RCSID("$Id: sshd.c,v 1.24 1999/11/18 20:56:21 damien Exp $"); | 21 | RCSID("$Id: sshd.c,v 1.25 1999/11/18 21:25:48 damien Exp $"); |
22 | 22 | ||
23 | #include "xmalloc.h" | 23 | #include "xmalloc.h" |
24 | #include "rsa.h" | 24 | #include "rsa.h" |
@@ -1394,8 +1394,7 @@ do_authloop(struct passwd *pw) | |||
1394 | 1394 | ||
1395 | if (bits != BN_num_bits(client_host_key_n)) | 1395 | if (bits != BN_num_bits(client_host_key_n)) |
1396 | error("Warning: keysize mismatch for client_host_key: " | 1396 | error("Warning: keysize mismatch for client_host_key: " |
1397 | "actual %d, announced %s", BN_num_bits(client_host_key_n), bits); | 1397 | "actual %d, announced %d", BN_num_bits(client_host_key_n), bits); |
1398 | |||
1399 | packet_integrity_check(plen, (4 + ulen) + 4 + elen + nlen, type); | 1398 | packet_integrity_check(plen, (4 + ulen) + 4 + elen + nlen, type); |
1400 | 1399 | ||
1401 | authenticated = auth_rhosts_rsa(pw, client_user, | 1400 | authenticated = auth_rhosts_rsa(pw, client_user, |