- markus@cvs.openbsd.org 2004/07/28 09:40:29
[auth.c auth1.c auth2.c cipher.c cipher.h key.c session.c ssh.c
sshconnect1.c]
more s/illegal/invalid/
diff --git a/ChangeLog b/ChangeLog
index fbe2bba..3d03478 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
- markus@cvs.openbsd.org 2004/07/28 08:56:22
[sshd.c]
call setsid() _before_ re-exec
+ - markus@cvs.openbsd.org 2004/07/28 09:40:29
+ [auth.c auth1.c auth2.c cipher.c cipher.h key.c session.c ssh.c
+ sshconnect1.c]
+ more s/illegal/invalid/
20040720
- (djm) OpenBSD CVS Sync
@@ -1571,4 +1575,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3490 2004/08/12 12:36:51 dtucker Exp $
+$Id: ChangeLog,v 1.3491 2004/08/12 12:40:24 dtucker Exp $
diff --git a/auth.c b/auth.c
index 0bb7e28..0956b0b 100644
--- a/auth.c
+++ b/auth.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: auth.c,v 1.55 2004/07/21 08:56:12 markus Exp $");
+RCSID("$OpenBSD: auth.c,v 1.56 2004/07/28 09:40:29 markus Exp $");
#ifdef HAVE_LOGIN_H
#include <login.h>
@@ -233,7 +233,7 @@
authlog("%s %s for %s%.100s from %.200s port %d%s",
authmsg,
method,
- authctxt->valid ? "" : "illegal user ",
+ authctxt->valid ? "" : "invalid user ",
authctxt->user,
get_remote_ipaddr(),
get_remote_port(),
diff --git a/auth1.c b/auth1.c
index ea133b0..3f93b98 100644
--- a/auth1.c
+++ b/auth1.c
@@ -10,7 +10,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: auth1.c,v 1.58 2004/07/21 10:33:31 djm Exp $");
+RCSID("$OpenBSD: auth1.c,v 1.59 2004/07/28 09:40:29 markus Exp $");
#include "xmalloc.h"
#include "rsa.h"
@@ -71,7 +71,7 @@
int prev, type = 0;
debug("Attempting authentication for %s%.100s.",
- authctxt->valid ? "" : "illegal user ", authctxt->user);
+ authctxt->valid ? "" : "invalid user ", authctxt->user);
/* If the user has no password, accept authentication immediately. */
if (options.password_authentication &&
@@ -302,7 +302,7 @@
if ((authctxt->pw = PRIVSEP(getpwnamallow(user))) != NULL)
authctxt->valid = 1;
else {
- debug("do_authentication: illegal user %s", user);
+ debug("do_authentication: invalid user %s", user);
authctxt->pw = fakepw();
}
diff --git a/auth2.c b/auth2.c
index a8c8bd2..b983095 100644
--- a/auth2.c
+++ b/auth2.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: auth2.c,v 1.106 2004/07/21 10:33:31 djm Exp $");
+RCSID("$OpenBSD: auth2.c,v 1.107 2004/07/28 09:40:29 markus Exp $");
#include "ssh2.h"
#include "xmalloc.h"
@@ -159,7 +159,7 @@
PRIVSEP(start_pam(authctxt));
#endif
} else {
- logit("input_userauth_request: illegal user %s", user);
+ logit("input_userauth_request: invalid user %s", user);
authctxt->pw = fakepw();
#ifdef USE_PAM
if (options.use_pam)
diff --git a/cipher.c b/cipher.c
index 93f96be..075a4c5 100644
--- a/cipher.c
+++ b/cipher.c
@@ -35,7 +35,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: cipher.c,v 1.70 2004/07/11 17:48:47 deraadt Exp $");
+RCSID("$OpenBSD: cipher.c,v 1.71 2004/07/28 09:40:29 markus Exp $");
#include "xmalloc.h"
#include "log.h"
@@ -106,7 +106,7 @@
#if defined(EVP_CTRL_SET_ACSS_MODE)
{ "acss@openssh.org", SSH_CIPHER_SSH2, 16, 5, EVP_acss },
#endif
- { NULL, SSH_CIPHER_ILLEGAL, 0, 0, NULL }
+ { NULL, SSH_CIPHER_INVALID, 0, 0, NULL }
};
/*--*/
diff --git a/cipher.h b/cipher.h
index 74b3669..6bb5719 100644
--- a/cipher.h
+++ b/cipher.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cipher.h,v 1.34 2003/11/10 16:23:41 jakob Exp $ */
+/* $OpenBSD: cipher.h,v 1.35 2004/07/28 09:40:29 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -43,7 +43,7 @@
* be removed for compatibility. The maximum allowed value is 31.
*/
#define SSH_CIPHER_SSH2 -3
-#define SSH_CIPHER_ILLEGAL -2 /* No valid cipher selected. */
+#define SSH_CIPHER_INVALID -2 /* No valid cipher selected. */
#define SSH_CIPHER_NOT_SET -1 /* None selected (invalid number). */
#define SSH_CIPHER_NONE 0 /* no encryption */
#define SSH_CIPHER_IDEA 1 /* IDEA CFB */
diff --git a/key.c b/key.c
index 323e6ff..21b0869 100644
--- a/key.c
+++ b/key.c
@@ -32,7 +32,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "includes.h"
-RCSID("$OpenBSD: key.c,v 1.55 2003/11/10 16:23:41 jakob Exp $");
+RCSID("$OpenBSD: key.c,v 1.56 2004/07/28 09:40:29 markus Exp $");
#include <openssl/evp.h>
@@ -782,7 +782,7 @@
return ssh_rsa_sign(key, sigp, lenp, data, datalen);
break;
default:
- error("key_sign: illegal key type %d", key->type);
+ error("key_sign: invalid key type %d", key->type);
return -1;
break;
}
@@ -809,7 +809,7 @@
return ssh_rsa_verify(key, signature, signaturelen, data, datalen);
break;
default:
- error("key_verify: illegal key type %d", key->type);
+ error("key_verify: invalid key type %d", key->type);
return -1;
break;
}
diff --git a/session.c b/session.c
index 99b8439..ee4008a 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.179 2004/07/17 05:31:41 dtucker Exp $");
+RCSID("$OpenBSD: session.c,v 1.180 2004/07/28 09:40:29 markus Exp $");
#include "ssh.h"
#include "ssh1.h"
@@ -264,7 +264,7 @@
compression_level = packet_get_int();
packet_check_eom();
if (compression_level < 1 || compression_level > 9) {
- packet_send_debug("Received illegal compression level %d.",
+ packet_send_debug("Received invalid compression level %d.",
compression_level);
break;
}
diff --git a/ssh.c b/ssh.c
index 6dff591..edf8f2c 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.223 2004/07/11 17:48:47 deraadt Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.224 2004/07/28 09:40:29 markus Exp $");
#include <openssl/evp.h>
#include <openssl/err.h>
@@ -344,7 +344,7 @@
if (ciphers_valid(optarg)) {
/* SSH2 only */
options.ciphers = xstrdup(optarg);
- options.cipher = SSH_CIPHER_ILLEGAL;
+ options.cipher = SSH_CIPHER_INVALID;
} else {
/* SSH1 only */
options.cipher = cipher_number(optarg);
diff --git a/sshconnect1.c b/sshconnect1.c
index 61fecab..6e2e31c 100644
--- a/sshconnect1.c
+++ b/sshconnect1.c
@@ -13,7 +13,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshconnect1.c,v 1.59 2004/06/21 17:36:31 avsm Exp $");
+RCSID("$OpenBSD: sshconnect1.c,v 1.60 2004/07/28 09:40:29 markus Exp $");
#include <openssl/bn.h>
#include <openssl/md5.h>
@@ -598,7 +598,7 @@
if (options.cipher == SSH_CIPHER_NOT_SET) {
if (cipher_mask_ssh1(1) & supported_ciphers & (1 << ssh_cipher_default))
options.cipher = ssh_cipher_default;
- } else if (options.cipher == SSH_CIPHER_ILLEGAL ||
+ } else if (options.cipher == SSH_CIPHER_INVALID ||
!(cipher_mask_ssh1(1) & (1 << options.cipher))) {
logit("No valid SSH1 cipher, using %.100s instead.",
cipher_name(ssh_cipher_default));