tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- deraadt@cvs.openbsd.org 2003/08/24 17:36:52 

[monitor.c monitor_wrap.c sshconnect2.c]
     64 bit cleanups; markus ok
This commit is contained in:
Darren Tucker 2003-08-26 12:10:48 +10:00
parent 6b191a234c
commit 600ad8de76
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -19,6 +19,9 @@
- markus@cvs.openbsd.org 2003/08/22 20:55:06 - markus@cvs.openbsd.org 2003/08/22 20:55:06
[LICENCE] [LICENCE]
add Simon Wilkinson add Simon Wilkinson
- deraadt@cvs.openbsd.org 2003/08/24 17:36:52
[monitor.c monitor_wrap.c sshconnect2.c]
64 bit cleanups; markus ok
- (dtucker) [Makefile.in acconfig.h auth-krb5.c auth-pam.c auth-pam.h - (dtucker) [Makefile.in acconfig.h auth-krb5.c auth-pam.c auth-pam.h
configure.ac defines.h gss-serv-krb5.c session.c ssh-gss.h sshconnect1.c configure.ac defines.h gss-serv-krb5.c session.c ssh-gss.h sshconnect1.c
sshconnect2.c] Add Portable GSSAPI support, patch by Simon Wilkinson. sshconnect2.c] Add Portable GSSAPI support, patch by Simon Wilkinson.
@ -894,4 +897,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.2911 2003/08/26 02:09:53 dtucker Exp $ $Id: ChangeLog,v 1.2912 2003/08/26 02:10:48 dtucker Exp $

6
monitor.c
View File

@ -25,7 +25,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: monitor.c,v 1.46 2003/08/22 10:56:09 markus Exp $"); RCSID("$OpenBSD: monitor.c,v 1.47 2003/08/24 17:36:52 deraadt Exp $");
#include <openssl/dh.h> #include <openssl/dh.h>
@ -1817,8 +1817,10 @@ mm_answer_gss_accept_ctx(int socket, Buffer *m)
gss_buffer_desc out = GSS_C_EMPTY_BUFFER; gss_buffer_desc out = GSS_C_EMPTY_BUFFER;
OM_uint32 major,minor; OM_uint32 major,minor;
OM_uint32 flags = 0; /* GSI needs this */ OM_uint32 flags = 0; /* GSI needs this */
u_int len;
in.value = buffer_get_string(m, &in.length); in.value = buffer_get_string(m, &len);
in.length = len;
major = ssh_gssapi_accept_ctx(gsscontext, &in, &out, &flags); major = ssh_gssapi_accept_ctx(gsscontext, &in, &out, &flags);
xfree(in.value); xfree(in.value);

6
monitor_wrap.c
View File

@ -25,7 +25,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: monitor_wrap.c,v 1.29 2003/08/22 10:56:09 markus Exp $"); RCSID("$OpenBSD: monitor_wrap.c,v 1.30 2003/08/24 17:36:52 deraadt Exp $");
#include <openssl/bn.h> #include <openssl/bn.h>
#include <openssl/dh.h> #include <openssl/dh.h>
@ -1134,6 +1134,7 @@ mm_ssh_gssapi_accept_ctx(Gssctxt *ctx, gss_buffer_desc *in,
{ {
Buffer m; Buffer m;
OM_uint32 major; OM_uint32 major;
u_int len;
buffer_init(&m); buffer_init(&m);
buffer_put_string(&m, in->value, in->length); buffer_put_string(&m, in->value, in->length);
@ -1142,7 +1143,8 @@ mm_ssh_gssapi_accept_ctx(Gssctxt *ctx, gss_buffer_desc *in,
mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSTEP, &m); mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSTEP, &m);
major = buffer_get_int(&m); major = buffer_get_int(&m);
out->value = buffer_get_string(&m, &out->length); out->value = buffer_get_string(&m, &len);
out->length = len;
if (flags) if (flags)
*flags = buffer_get_int(&m); *flags = buffer_get_int(&m);

6
sshconnect2.c
View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshconnect2.c,v 1.122 2003/08/22 13:20:03 markus Exp $"); RCSID("$OpenBSD: sshconnect2.c,v 1.123 2003/08/24 17:36:52 deraadt Exp $");
#include "openbsd-compat/sys-queue.h" #include "openbsd-compat/sys-queue.h"
@ -647,12 +647,14 @@ input_gssapi_errtok(int type, u_int32_t plen, void *ctxt)
gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
gss_buffer_desc recv_tok; gss_buffer_desc recv_tok;
OM_uint32 status, ms; OM_uint32 status, ms;
u_int len;
if (authctxt == NULL) if (authctxt == NULL)
fatal("input_gssapi_response: no authentication context"); fatal("input_gssapi_response: no authentication context");
gssctxt = authctxt->methoddata; gssctxt = authctxt->methoddata;
recv_tok.value = packet_get_string(&recv_tok.length); recv_tok.value = packet_get_string(&len);
recv_tok.length = len;
packet_check_eom(); packet_check_eom();