diff options
author | Damien Miller <djm@mindrot.org> | 2000-10-16 12:14:42 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-10-16 12:14:42 +1100 |
commit | 50a41ed079629fdcd9a1d2a781b73170422fc73a (patch) | |
tree | dbac99a364edff124412c16f079975a2e89a0389 /sshconnect2.c | |
parent | 5993935f76e66c957f02efaa8fc0c8ff8a3f92c9 (diff) |
- (djm) Sync with OpenBSD:
- markus@cvs.openbsd.org 2000/10/14 04:01:15
[cipher.c]
debug3
- markus@cvs.openbsd.org 2000/10/14 04:07:23
[scp.c]
remove spaces from arguments; from djm@mindrot.org
- markus@cvs.openbsd.org 2000/10/14 06:09:46
[ssh.1]
Cipher is for SSH-1 only
- markus@cvs.openbsd.org 2000/10/14 06:12:09
[servconf.c servconf.h serverloop.c session.c sshd.8]
AllowTcpForwarding; from naddy@
- markus@cvs.openbsd.org 2000/10/14 06:16:56
[auth2.c compat.c compat.h sshconnect2.c version.h]
OpenSSH_2.3; note that is is not complete, but the version number
needs to be changed for interoperability reasons
- markus@cvs.openbsd.org 2000/10/14 06:19:45
[auth-rsa.c]
do not send RSA challenge if key is not allowed by key-options; from
eivind@ThinkSec.com
- markus@cvs.openbsd.org 2000/10/15 08:14:01
[rijndael.c session.c]
typos; from stevesk@sweden.hp.com
- markus@cvs.openbsd.org 2000/10/15 08:18:31
[rijndael.c]
typo
- Copy manpages back over from OpenBSD - too tedious to wade through diffs
Diffstat (limited to 'sshconnect2.c')
-rw-r--r-- | sshconnect2.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sshconnect2.c b/sshconnect2.c index ca459f62c..1f3b5a261 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: sshconnect2.c,v 1.25 2000/10/12 09:59:19 markus Exp $"); | 26 | RCSID("$OpenBSD: sshconnect2.c,v 1.26 2000/10/14 12:16:56 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/bn.h> | 28 | #include <openssl/bn.h> |
29 | #include <openssl/rsa.h> | 29 | #include <openssl/rsa.h> |
@@ -657,12 +657,12 @@ sign_and_send_pubkey(Authctxt *authctxt, Key *k, sign_cb_fn *sign_callback) | |||
657 | 657 | ||
658 | /* data to be signed */ | 658 | /* data to be signed */ |
659 | buffer_init(&b); | 659 | buffer_init(&b); |
660 | if (datafellows & SSH_COMPAT_SESSIONID_ENCODING) { | 660 | if (datafellows & SSH_OLD_SESSIONID) { |
661 | buffer_put_string(&b, session_id2, session_id2_len); | ||
662 | skip = buffer_len(&b); | ||
663 | } else { | ||
664 | buffer_append(&b, session_id2, session_id2_len); | 661 | buffer_append(&b, session_id2, session_id2_len); |
665 | skip = session_id2_len; | 662 | skip = session_id2_len; |
663 | } else { | ||
664 | buffer_put_string(&b, session_id2, session_id2_len); | ||
665 | skip = buffer_len(&b); | ||
666 | } | 666 | } |
667 | buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); | 667 | buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); |
668 | buffer_put_cstring(&b, authctxt->server_user); | 668 | buffer_put_cstring(&b, authctxt->server_user); |