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 /session.c | |
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 'session.c')
-rw-r--r-- | session.c | 17 |
1 files changed, 16 insertions, 1 deletions
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.42 2000/10/27 07:32:18 markus Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.43 2000/11/06 23:04:56 markus Exp $"); |
37 | 37 | ||
38 | #include "xmalloc.h" | 38 | #include "xmalloc.h" |
39 | #include "ssh.h" | 39 | #include "ssh.h" |
@@ -1735,6 +1735,19 @@ session_exec_req(Session *s) | |||
1735 | return 1; | 1735 | return 1; |
1736 | } | 1736 | } |
1737 | 1737 | ||
1738 | int | ||
1739 | session_auth_agent_req(Session *s) | ||
1740 | { | ||
1741 | static int called = 0; | ||
1742 | packet_done(); | ||
1743 | if (called) { | ||
1744 | return 0; | ||
1745 | } else { | ||
1746 | called = 1; | ||
1747 | return auth_input_request_forwarding(s->pw); | ||
1748 | } | ||
1749 | } | ||
1750 | |||
1738 | void | 1751 | void |
1739 | session_input_channel_req(int id, void *arg) | 1752 | session_input_channel_req(int id, void *arg) |
1740 | { | 1753 | { |
@@ -1771,6 +1784,8 @@ session_input_channel_req(int id, void *arg) | |||
1771 | success = session_pty_req(s); | 1784 | success = session_pty_req(s); |
1772 | } else if (strcmp(rtype, "x11-req") == 0) { | 1785 | } else if (strcmp(rtype, "x11-req") == 0) { |
1773 | success = session_x11_req(s); | 1786 | success = session_x11_req(s); |
1787 | } else if (strcmp(rtype, "auth-agent-req@openssh.com") == 0) { | ||
1788 | success = session_auth_agent_req(s); | ||
1774 | } else if (strcmp(rtype, "subsystem") == 0) { | 1789 | } else if (strcmp(rtype, "subsystem") == 0) { |
1775 | success = session_subsystem_req(s); | 1790 | success = session_subsystem_req(s); |
1776 | } | 1791 | } |