diff options
author | Damien Miller <djm@mindrot.org> | 2000-06-22 21:32:31 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-06-22 21:32:31 +1000 |
commit | 6536c7d3c9d0e794c5c85d4f1746b958d7e04343 (patch) | |
tree | 9551d0d84924d6a206130fb575df5d90f1cc7a28 /auth2.c | |
parent | 099f505f9526311e48f828e95d90d488fe237219 (diff) |
- OpenBSD CVS Updates:
- markus@cvs.openbsd.org 2000/06/18 18:50:11
[auth2.c compat.c compat.h sshconnect2.c]
make userauth+pubkey interop with ssh.com-2.2.0
- markus@cvs.openbsd.org 2000/06/18 20:56:17
[dsa.c]
mem leak + be more paranoid in dsa_verify.
- markus@cvs.openbsd.org 2000/06/18 21:29:50
[key.c]
cleanup fingerprinting, less hardcoded sizes
- markus@cvs.openbsd.org 2000/06/19 19:39:45
[atomicio.c auth-options.c auth-passwd.c auth-rh-rsa.c auth-rhosts.c]
[auth-rsa.c auth-skey.c authfd.c authfd.h authfile.c bufaux.c bufaux.h]
[buffer.c buffer.h canohost.c channels.c channels.h cipher.c cipher.h]
[clientloop.c compat.c compat.h compress.c compress.h crc32.c crc32.h]
[deattack.c dispatch.c dsa.c fingerprint.c fingerprint.h getput.h hmac.c]
[kex.c log-client.c log-server.c login.c match.c mpaux.c mpaux.h nchan.c]
[nchan.h packet.c packet.h pty.c pty.h readconf.c readconf.h readpass.c]
[rsa.c rsa.h scp.c servconf.c servconf.h ssh-add.c ssh-keygen.c ssh.c]
[ssh.h tildexpand.c ttymodes.c ttymodes.h uidswap.c xmalloc.c xmalloc.h]
OpenBSD tag
- markus@cvs.openbsd.org 2000/06/21 10:46:10
sshconnect2.c missing free; nuke old comment
Diffstat (limited to 'auth2.c')
-rw-r--r-- | auth2.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -27,7 +27,7 @@ | |||
27 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 27 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
28 | */ | 28 | */ |
29 | #include "includes.h" | 29 | #include "includes.h" |
30 | RCSID("$OpenBSD: auth2.c,v 1.10 2000/06/18 04:05:02 markus Exp $"); | 30 | RCSID("$OpenBSD: auth2.c,v 1.11 2000/06/19 00:50:11 markus Exp $"); |
31 | 31 | ||
32 | #include <openssl/dsa.h> | 32 | #include <openssl/dsa.h> |
33 | #include <openssl/rsa.h> | 33 | #include <openssl/rsa.h> |
@@ -302,8 +302,11 @@ ssh2_auth_pubkey(struct passwd *pw, char *service) | |||
302 | sig = packet_get_string(&slen); | 302 | sig = packet_get_string(&slen); |
303 | packet_done(); | 303 | packet_done(); |
304 | buffer_init(&b); | 304 | buffer_init(&b); |
305 | buffer_append(&b, session_id2, session_id2_len); | 305 | if (datafellows & SSH_COMPAT_SESSIONID_ENCODING) { |
306 | 306 | buffer_put_string(&b, session_id2, session_id2_len); | |
307 | } else { | ||
308 | buffer_append(&b, session_id2, session_id2_len); | ||
309 | } | ||
307 | /* reconstruct packet */ | 310 | /* reconstruct packet */ |
308 | buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); | 311 | buffer_put_char(&b, SSH2_MSG_USERAUTH_REQUEST); |
309 | buffer_put_cstring(&b, pw->pw_name); | 312 | buffer_put_cstring(&b, pw->pw_name); |