+20010609
+ - OpenBSD CVS Sync
+ - markus@cvs.openbsd.org 2001/05/30 12:55:13
+ [auth-options.c auth2.c channels.c channels.h clientloop.c nchan.c
+ packet.c serverloop.c session.c ssh.c ssh1.h]
+ channel layer cleanup: merge header files and split .c files
+
20010606
- - OpenBSD CVS Sync
- - markus@cvs.openbsd.org 2001/05/17 21:34:15
- [ssh.1]
+ - OpenBSD CVS Sync
+ - markus@cvs.openbsd.org 2001/05/17 21:34:15
+ [ssh.1]
no spaces in PreferredAuthentications;
meixner@rbg.informatik.tu-darmstadt.de
- markus@cvs.openbsd.org 2001/05/18 14:13:29
- stevesk@cvs.openbsd.org 2001/05/19 19:57:09
[channels.c]
typo in error message
- - markus@cvs.openbsd.org 2001/05/20 17:20:36
+ - markus@cvs.openbsd.org 2001/05/20 17:20:36
[auth-rsa.c auth.c auth.h auth2.c servconf.c servconf.h sshd.8
sshd_config]
configurable authorized_keys{,2} location; originally from peter@;
*/
#include "includes.h"
-RCSID("$OpenBSD: auth-options.c,v 1.16 2001/03/18 12:07:52 markus Exp $");
+RCSID("$OpenBSD: auth-options.c,v 1.17 2001/05/30 12:55:06 markus Exp $");
#include "packet.h"
#include "xmalloc.h"
#include "match.h"
#include "log.h"
#include "canohost.h"
-#include "channels.h"
+#include "channel.h"
#include "auth-options.h"
#include "servconf.h"
*/
#include "includes.h"
-RCSID("$OpenBSD: auth2.c,v 1.58 2001/05/20 17:20:35 markus Exp $");
+RCSID("$OpenBSD: auth2.c,v 1.59 2001/05/30 12:55:06 markus Exp $");
#include <openssl/evp.h>
#include "log.h"
#include "servconf.h"
#include "compat.h"
-#include "channels.h"
+#include "channel.h"
#include "bufaux.h"
#include "auth.h"
#include "session.h"
*/
#include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.72 2001/05/24 18:57:53 stevesk Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.73 2001/05/30 12:55:10 markus Exp $");
#include "ssh.h"
#include "ssh1.h"
#include "packet.h"
#include "buffer.h"
#include "compat.h"
-#include "channels.h"
+#include "channel.h"
#include "dispatch.h"
#include "buffer.h"
#include "bufaux.h"
*/
#include "includes.h"
-RCSID("$OpenBSD: packet.c,v 1.62 2001/05/28 23:58:35 markus Exp $");
+RCSID("$OpenBSD: packet.c,v 1.63 2001/05/30 12:55:11 markus Exp $");
#include "xmalloc.h"
#include "buffer.h"
#include "compress.h"
#include "deattack.h"
-#include "channels.h"
+#include "channel.h"
#include "compat.h"
#include "ssh1.h"
packet_set_protocol_flags(u_int protocol_flags)
{
remote_protocol_flags = protocol_flags;
- channel_set_options((protocol_flags & SSH_PROTOFLAG_HOST_IN_FWD_OPEN) != 0);
}
/* Returns the remote protocol flags set earlier by the above function. */
*/
#include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.65 2001/05/08 19:17:31 markus Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.66 2001/05/30 12:55:12 markus Exp $");
#include "xmalloc.h"
#include "packet.h"
#include "log.h"
#include "servconf.h"
#include "sshpty.h"
-#include "channels.h"
+#include "channel.h"
#include "compat.h"
#include "ssh1.h"
#include "ssh2.h"
*/
#include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.76 2001/05/19 00:36:40 djm Exp $");
+RCSID("$OpenBSD: session.c,v 1.77 2001/05/30 12:55:13 markus Exp $");
#include "ssh.h"
#include "ssh1.h"
#include "mpaux.h"
#include "uidswap.h"
#include "compat.h"
-#include "channels.h"
-#include "nchan.h"
+#include "channel.h"
#include "bufaux.h"
#include "auth.h"
#include "auth-options.h"
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.120 2001/05/28 08:04:39 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.121 2001/05/30 12:55:13 markus Exp $");
#include <openssl/evp.h>
#include <openssl/err.h>
#include "packet.h"
#include "buffer.h"
#include "uidswap.h"
-#include "channels.h"
+#include "channel.h"
#include "key.h"
#include "authfd.h"
#include "authfile.h"
-/* $OpenBSD: ssh1.h,v 1.2 2001/01/29 01:58:18 niklas Exp $ */
+/* $OpenBSD: ssh1.h,v 1.3 2001/05/30 12:55:13 markus Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
#define SSH_CMSG_HAVE_KERBEROS_TGT 44 /* credentials (s) */
#define SSH_CMSG_HAVE_AFS_TOKEN 65 /* token (s) */
+/* protocol version 1.5 overloads some version 1.3 message types */
+#define SSH_MSG_CHANNEL_INPUT_EOF SSH_MSG_CHANNEL_CLOSE
+#define SSH_MSG_CHANNEL_OUTPUT_CLOSE SSH_MSG_CHANNEL_CLOSE_CONFIRMATION
+
/*
* Authentication methods. New types can be added, but old types should not
* be removed for compatibility. The maximum allowed value is 31.
/* Protocol flags. These are bit masks. */
#define SSH_PROTOFLAG_SCREEN_NUMBER 1 /* X11 forwarding includes screen */
#define SSH_PROTOFLAG_HOST_IN_FWD_OPEN 2 /* forwarding opens contain host */
-