diff options
author | Damien Miller <djm@mindrot.org> | 2000-11-13 22:57:25 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-11-13 22:57:25 +1100 |
commit | 0bc1bd814e3c2b5e92d6f595930051960d17f47f (patch) | |
tree | 176c7dc2844ecc2c1de0f72d221449556ffa5209 /channels.h | |
parent | 559d383037b0872fcde4e6c40188b649c574be74 (diff) |
- (djm) Merge OpenBSD changes:
- markus@cvs.openbsd.org 2000/11/06 16:04:56
[channels.c channels.h clientloop.c nchan.c serverloop.c]
[session.c ssh.c]
agent forwarding and -R for ssh2, based on work from
jhuuskon@messi.uku.fi
- markus@cvs.openbsd.org 2000/11/06 16:13:27
[ssh.c sshconnect.c sshd.c]
do not disabled rhosts(rsa) if server port > 1024; from
pekkas@netcore.fi
- markus@cvs.openbsd.org 2000/11/06 16:16:35
[sshconnect.c]
downgrade client to 1.3 if server is 1.4; help from mdb@juniper.net
- markus@cvs.openbsd.org 2000/11/09 18:04:40
[auth1.c]
typo; from mouring@pconline.com
- markus@cvs.openbsd.org 2000/11/12 12:03:28
[ssh-agent.c]
off-by-one when removing a key from the agent
- markus@cvs.openbsd.org 2000/11/12 12:50:39
[auth-rh-rsa.c auth2.c authfd.c authfd.h]
[authfile.c hostfile.c kex.c kex.h key.c key.h myproposal.h]
[readconf.c readconf.h rsa.c rsa.h servconf.c servconf.h ssh-add.c]
[ssh-agent.c ssh-keygen.1 ssh-keygen.c ssh.1 ssh.c ssh_config]
[sshconnect1.c sshconnect2.c sshd.8 sshd.c sshd_config ssh-dss.c]
[ssh-dss.h ssh-rsa.c ssh-rsa.h dsa.c dsa.h]
add support for RSA to SSH2. please test.
there are now 3 types of keys: RSA1 is used by ssh-1 only,
RSA and DSA are used by SSH2.
you can use 'ssh-keygen -t rsa -f ssh2_rsa_file' to generate RSA
keys for SSH2 and use the RSA keys for hostkeys or for user keys.
SSH2 RSA or DSA keys are added to .ssh/authorised_keys2 as before.
- (djm) Fix up Makefile and Redhat init script to create RSA host keys
- (djm) Change to interim version
Diffstat (limited to 'channels.h')
-rw-r--r-- | channels.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/channels.h b/channels.h index 00526860c..8f5e987fc 100644 --- a/channels.h +++ b/channels.h | |||
@@ -32,7 +32,7 @@ | |||
32 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 32 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
33 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 33 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
34 | */ | 34 | */ |
35 | /* RCSID("$OpenBSD: channels.h,v 1.22 2000/10/27 07:48:22 markus Exp $"); */ | 35 | /* RCSID("$OpenBSD: channels.h,v 1.23 2000/11/06 23:04:56 markus Exp $"); */ |
36 | 36 | ||
37 | #ifndef CHANNELS_H | 37 | #ifndef CHANNELS_H |
38 | #define CHANNELS_H | 38 | #define CHANNELS_H |
@@ -49,7 +49,8 @@ | |||
49 | #define SSH_CHANNEL_INPUT_DRAINING 8 /* sending remaining data to conn */ | 49 | #define SSH_CHANNEL_INPUT_DRAINING 8 /* sending remaining data to conn */ |
50 | #define SSH_CHANNEL_OUTPUT_DRAINING 9 /* sending remaining data to app */ | 50 | #define SSH_CHANNEL_OUTPUT_DRAINING 9 /* sending remaining data to app */ |
51 | #define SSH_CHANNEL_LARVAL 10 /* larval session */ | 51 | #define SSH_CHANNEL_LARVAL 10 /* larval session */ |
52 | #define SSH_CHANNEL_MAX_TYPE 11 | 52 | #define SSH_CHANNEL_RPORT_LISTENER 11 /* Listening to a R-style port */ |
53 | #define SSH_CHANNEL_MAX_TYPE 12 | ||
53 | 54 | ||
54 | /* | 55 | /* |
55 | * Data structure for channel data. This is iniailized in channel_allocate | 56 | * Data structure for channel data. This is iniailized in channel_allocate |
@@ -147,7 +148,6 @@ void channel_input_open_confirmation(int type, int plen, void *ctxt); | |||
147 | void channel_input_open_failure(int type, int plen, void *ctxt); | 148 | void channel_input_open_failure(int type, int plen, void *ctxt); |
148 | void channel_input_port_open(int type, int plen, void *ctxt); | 149 | void channel_input_port_open(int type, int plen, void *ctxt); |
149 | void channel_input_window_adjust(int type, int plen, void *ctxt); | 150 | void channel_input_window_adjust(int type, int plen, void *ctxt); |
150 | void channel_input_open(int type, int plen, void *ctxt); | ||
151 | 151 | ||
152 | /* Sets specific protocol options. */ | 152 | /* Sets specific protocol options. */ |
153 | void channel_set_options(int hostname_in_open); | 153 | void channel_set_options(int hostname_in_open); |
@@ -202,12 +202,15 @@ char *channel_open_message(void); | |||
202 | 202 | ||
203 | /* | 203 | /* |
204 | * Initiate forwarding of connections to local port "port" through the secure | 204 | * Initiate forwarding of connections to local port "port" through the secure |
205 | * channel to host:port from remote side. This never returns if there was an | 205 | * channel to host:port from remote side. |
206 | * error. | ||
207 | */ | 206 | */ |
208 | void | 207 | void |
209 | channel_request_local_forwarding(u_short port, const char *host, | 208 | channel_request_local_forwarding(u_short listen_port, |
210 | u_short remote_port, int gateway_ports); | 209 | const char *host_to_connect, u_short port_to_connect, int gateway_ports); |
210 | void | ||
211 | channel_request_forwarding(const char *listen_address, u_short listen_port, | ||
212 | const char *host_to_connect, u_short port_to_connect, int gateway_ports, | ||
213 | int remote_fwd); | ||
211 | 214 | ||
212 | /* | 215 | /* |
213 | * Initiate forwarding of connections to port "port" on remote host through | 216 | * Initiate forwarding of connections to port "port" on remote host through |
@@ -288,6 +291,7 @@ void auth_input_open_request(int type, int plen, void *ctxt); | |||
288 | 291 | ||
289 | /* XXX */ | 292 | /* XXX */ |
290 | int channel_connect_to(const char *host, u_short host_port); | 293 | int channel_connect_to(const char *host, u_short host_port); |
294 | int channel_connect_by_listen_adress(u_short listen_port); | ||
291 | int x11_connect_display(void); | 295 | int x11_connect_display(void); |
292 | 296 | ||
293 | #endif | 297 | #endif |