diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | auth.c | 4 | ||||
-rw-r--r-- | auth1.c | 6 | ||||
-rw-r--r-- | auth2.c | 4 | ||||
-rw-r--r-- | cipher.c | 4 | ||||
-rw-r--r-- | cipher.h | 4 | ||||
-rw-r--r-- | key.c | 6 | ||||
-rw-r--r-- | session.c | 4 | ||||
-rw-r--r-- | ssh.c | 4 | ||||
-rw-r--r-- | sshconnect1.c | 4 |
10 files changed, 25 insertions, 21 deletions
@@ -4,6 +4,10 @@ | |||
4 | - markus@cvs.openbsd.org 2004/07/28 08:56:22 | 4 | - markus@cvs.openbsd.org 2004/07/28 08:56:22 |
5 | [sshd.c] | 5 | [sshd.c] |
6 | call setsid() _before_ re-exec | 6 | call setsid() _before_ re-exec |
7 | - markus@cvs.openbsd.org 2004/07/28 09:40:29 | ||
8 | [auth.c auth1.c auth2.c cipher.c cipher.h key.c session.c ssh.c | ||
9 | sshconnect1.c] | ||
10 | more s/illegal/invalid/ | ||
7 | 11 | ||
8 | 20040720 | 12 | 20040720 |
9 | - (djm) OpenBSD CVS Sync | 13 | - (djm) OpenBSD CVS Sync |
@@ -1571,4 +1575,4 @@ | |||
1571 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1575 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1572 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1576 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1573 | 1577 | ||
1574 | $Id: ChangeLog,v 1.3490 2004/08/12 12:36:51 dtucker Exp $ | 1578 | $Id: ChangeLog,v 1.3491 2004/08/12 12:40:24 dtucker Exp $ |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth.c,v 1.55 2004/07/21 08:56:12 markus Exp $"); | 26 | RCSID("$OpenBSD: auth.c,v 1.56 2004/07/28 09:40:29 markus Exp $"); |
27 | 27 | ||
28 | #ifdef HAVE_LOGIN_H | 28 | #ifdef HAVE_LOGIN_H |
29 | #include <login.h> | 29 | #include <login.h> |
@@ -233,7 +233,7 @@ auth_log(Authctxt *authctxt, int authenticated, char *method, char *info) | |||
233 | authlog("%s %s for %s%.100s from %.200s port %d%s", | 233 | authlog("%s %s for %s%.100s from %.200s port %d%s", |
234 | authmsg, | 234 | authmsg, |
235 | method, | 235 | method, |
236 | authctxt->valid ? "" : "illegal user ", | 236 | authctxt->valid ? "" : "invalid user ", |
237 | authctxt->user, | 237 | authctxt->user, |
238 | get_remote_ipaddr(), | 238 | get_remote_ipaddr(), |
239 | get_remote_port(), | 239 | get_remote_port(), |
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: auth1.c,v 1.58 2004/07/21 10:33:31 djm Exp $"); | 13 | RCSID("$OpenBSD: auth1.c,v 1.59 2004/07/28 09:40:29 markus Exp $"); |
14 | 14 | ||
15 | #include "xmalloc.h" | 15 | #include "xmalloc.h" |
16 | #include "rsa.h" | 16 | #include "rsa.h" |
@@ -71,7 +71,7 @@ do_authloop(Authctxt *authctxt) | |||
71 | int prev, type = 0; | 71 | int prev, type = 0; |
72 | 72 | ||
73 | debug("Attempting authentication for %s%.100s.", | 73 | debug("Attempting authentication for %s%.100s.", |
74 | authctxt->valid ? "" : "illegal user ", authctxt->user); | 74 | authctxt->valid ? "" : "invalid user ", authctxt->user); |
75 | 75 | ||
76 | /* If the user has no password, accept authentication immediately. */ | 76 | /* If the user has no password, accept authentication immediately. */ |
77 | if (options.password_authentication && | 77 | if (options.password_authentication && |
@@ -302,7 +302,7 @@ do_authentication(Authctxt *authctxt) | |||
302 | if ((authctxt->pw = PRIVSEP(getpwnamallow(user))) != NULL) | 302 | if ((authctxt->pw = PRIVSEP(getpwnamallow(user))) != NULL) |
303 | authctxt->valid = 1; | 303 | authctxt->valid = 1; |
304 | else { | 304 | else { |
305 | debug("do_authentication: illegal user %s", user); | 305 | debug("do_authentication: invalid user %s", user); |
306 | authctxt->pw = fakepw(); | 306 | authctxt->pw = fakepw(); |
307 | } | 307 | } |
308 | 308 | ||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth2.c,v 1.106 2004/07/21 10:33:31 djm Exp $"); | 26 | RCSID("$OpenBSD: auth2.c,v 1.107 2004/07/28 09:40:29 markus Exp $"); |
27 | 27 | ||
28 | #include "ssh2.h" | 28 | #include "ssh2.h" |
29 | #include "xmalloc.h" | 29 | #include "xmalloc.h" |
@@ -159,7 +159,7 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt) | |||
159 | PRIVSEP(start_pam(authctxt)); | 159 | PRIVSEP(start_pam(authctxt)); |
160 | #endif | 160 | #endif |
161 | } else { | 161 | } else { |
162 | logit("input_userauth_request: illegal user %s", user); | 162 | logit("input_userauth_request: invalid user %s", user); |
163 | authctxt->pw = fakepw(); | 163 | authctxt->pw = fakepw(); |
164 | #ifdef USE_PAM | 164 | #ifdef USE_PAM |
165 | if (options.use_pam) | 165 | if (options.use_pam) |
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: cipher.c,v 1.70 2004/07/11 17:48:47 deraadt Exp $"); | 38 | RCSID("$OpenBSD: cipher.c,v 1.71 2004/07/28 09:40:29 markus Exp $"); |
39 | 39 | ||
40 | #include "xmalloc.h" | 40 | #include "xmalloc.h" |
41 | #include "log.h" | 41 | #include "log.h" |
@@ -106,7 +106,7 @@ struct Cipher { | |||
106 | #if defined(EVP_CTRL_SET_ACSS_MODE) | 106 | #if defined(EVP_CTRL_SET_ACSS_MODE) |
107 | { "acss@openssh.org", SSH_CIPHER_SSH2, 16, 5, EVP_acss }, | 107 | { "acss@openssh.org", SSH_CIPHER_SSH2, 16, 5, EVP_acss }, |
108 | #endif | 108 | #endif |
109 | { NULL, SSH_CIPHER_ILLEGAL, 0, 0, NULL } | 109 | { NULL, SSH_CIPHER_INVALID, 0, 0, NULL } |
110 | }; | 110 | }; |
111 | 111 | ||
112 | /*--*/ | 112 | /*--*/ |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cipher.h,v 1.34 2003/11/10 16:23:41 jakob Exp $ */ | 1 | /* $OpenBSD: cipher.h,v 1.35 2004/07/28 09:40:29 markus Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -43,7 +43,7 @@ | |||
43 | * be removed for compatibility. The maximum allowed value is 31. | 43 | * be removed for compatibility. The maximum allowed value is 31. |
44 | */ | 44 | */ |
45 | #define SSH_CIPHER_SSH2 -3 | 45 | #define SSH_CIPHER_SSH2 -3 |
46 | #define SSH_CIPHER_ILLEGAL -2 /* No valid cipher selected. */ | 46 | #define SSH_CIPHER_INVALID -2 /* No valid cipher selected. */ |
47 | #define SSH_CIPHER_NOT_SET -1 /* None selected (invalid number). */ | 47 | #define SSH_CIPHER_NOT_SET -1 /* None selected (invalid number). */ |
48 | #define SSH_CIPHER_NONE 0 /* no encryption */ | 48 | #define SSH_CIPHER_NONE 0 /* no encryption */ |
49 | #define SSH_CIPHER_IDEA 1 /* IDEA CFB */ | 49 | #define SSH_CIPHER_IDEA 1 /* IDEA CFB */ |
@@ -32,7 +32,7 @@ | |||
32 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 32 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
33 | */ | 33 | */ |
34 | #include "includes.h" | 34 | #include "includes.h" |
35 | RCSID("$OpenBSD: key.c,v 1.55 2003/11/10 16:23:41 jakob Exp $"); | 35 | RCSID("$OpenBSD: key.c,v 1.56 2004/07/28 09:40:29 markus Exp $"); |
36 | 36 | ||
37 | #include <openssl/evp.h> | 37 | #include <openssl/evp.h> |
38 | 38 | ||
@@ -782,7 +782,7 @@ key_sign( | |||
782 | return ssh_rsa_sign(key, sigp, lenp, data, datalen); | 782 | return ssh_rsa_sign(key, sigp, lenp, data, datalen); |
783 | break; | 783 | break; |
784 | default: | 784 | default: |
785 | error("key_sign: illegal key type %d", key->type); | 785 | error("key_sign: invalid key type %d", key->type); |
786 | return -1; | 786 | return -1; |
787 | break; | 787 | break; |
788 | } | 788 | } |
@@ -809,7 +809,7 @@ key_verify( | |||
809 | return ssh_rsa_verify(key, signature, signaturelen, data, datalen); | 809 | return ssh_rsa_verify(key, signature, signaturelen, data, datalen); |
810 | break; | 810 | break; |
811 | default: | 811 | default: |
812 | error("key_verify: illegal key type %d", key->type); | 812 | error("key_verify: invalid key type %d", key->type); |
813 | return -1; | 813 | return -1; |
814 | break; | 814 | break; |
815 | } | 815 | } |
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.179 2004/07/17 05:31:41 dtucker Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.180 2004/07/28 09:40:29 markus Exp $"); |
37 | 37 | ||
38 | #include "ssh.h" | 38 | #include "ssh.h" |
39 | #include "ssh1.h" | 39 | #include "ssh1.h" |
@@ -264,7 +264,7 @@ do_authenticated1(Authctxt *authctxt) | |||
264 | compression_level = packet_get_int(); | 264 | compression_level = packet_get_int(); |
265 | packet_check_eom(); | 265 | packet_check_eom(); |
266 | if (compression_level < 1 || compression_level > 9) { | 266 | if (compression_level < 1 || compression_level > 9) { |
267 | packet_send_debug("Received illegal compression level %d.", | 267 | packet_send_debug("Received invalid compression level %d.", |
268 | compression_level); | 268 | compression_level); |
269 | break; | 269 | break; |
270 | } | 270 | } |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.223 2004/07/11 17:48:47 deraadt Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.224 2004/07/28 09:40:29 markus Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -344,7 +344,7 @@ again: | |||
344 | if (ciphers_valid(optarg)) { | 344 | if (ciphers_valid(optarg)) { |
345 | /* SSH2 only */ | 345 | /* SSH2 only */ |
346 | options.ciphers = xstrdup(optarg); | 346 | options.ciphers = xstrdup(optarg); |
347 | options.cipher = SSH_CIPHER_ILLEGAL; | 347 | options.cipher = SSH_CIPHER_INVALID; |
348 | } else { | 348 | } else { |
349 | /* SSH1 only */ | 349 | /* SSH1 only */ |
350 | options.cipher = cipher_number(optarg); | 350 | options.cipher = cipher_number(optarg); |
diff --git a/sshconnect1.c b/sshconnect1.c index 61fecab14..6e2e31c02 100644 --- a/sshconnect1.c +++ b/sshconnect1.c | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "includes.h" | 15 | #include "includes.h" |
16 | RCSID("$OpenBSD: sshconnect1.c,v 1.59 2004/06/21 17:36:31 avsm Exp $"); | 16 | RCSID("$OpenBSD: sshconnect1.c,v 1.60 2004/07/28 09:40:29 markus Exp $"); |
17 | 17 | ||
18 | #include <openssl/bn.h> | 18 | #include <openssl/bn.h> |
19 | #include <openssl/md5.h> | 19 | #include <openssl/md5.h> |
@@ -598,7 +598,7 @@ ssh_kex(char *host, struct sockaddr *hostaddr) | |||
598 | if (options.cipher == SSH_CIPHER_NOT_SET) { | 598 | if (options.cipher == SSH_CIPHER_NOT_SET) { |
599 | if (cipher_mask_ssh1(1) & supported_ciphers & (1 << ssh_cipher_default)) | 599 | if (cipher_mask_ssh1(1) & supported_ciphers & (1 << ssh_cipher_default)) |
600 | options.cipher = ssh_cipher_default; | 600 | options.cipher = ssh_cipher_default; |
601 | } else if (options.cipher == SSH_CIPHER_ILLEGAL || | 601 | } else if (options.cipher == SSH_CIPHER_INVALID || |
602 | !(cipher_mask_ssh1(1) & (1 << options.cipher))) { | 602 | !(cipher_mask_ssh1(1) & (1 << options.cipher))) { |
603 | logit("No valid SSH1 cipher, using %.100s instead.", | 603 | logit("No valid SSH1 cipher, using %.100s instead.", |
604 | cipher_name(ssh_cipher_default)); | 604 | cipher_name(ssh_cipher_default)); |