tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

- stevesk@cvs.openbsd.org 2005/10/13 22:24:31

Browse Source 
[auth2-gss.c gss-genr.c gss-serv.c monitor.c]
     KNF; ok djm@
This commit is contained in:
Damien Miller 2005-11-05 15:07:05 +11:00
parent 20afc24363
commit 6fd6defbce
5 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -30,6 +30,9 @@
- stevesk@cvs.openbsd.org 2005/10/13 19:13:41 - stevesk@cvs.openbsd.org 2005/10/13 19:13:41
[dns.c] [dns.c]
unneeded #include, unused declaration, little knf; ok deraadt@ unneeded #include, unused declaration, little knf; ok deraadt@
- stevesk@cvs.openbsd.org 2005/10/13 22:24:31
[auth2-gss.c gss-genr.c gss-serv.c monitor.c]
KNF; ok djm@
20051102 20051102
- (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup(). - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup().
@ -3163,4 +3166,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3933 2005/11/05 04:06:38 djm Exp $ $Id: ChangeLog,v 1.3934 2005/11/05 04:07:05 djm Exp $

6
auth2-gss.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth2-gss.c,v 1.11 2005/10/13 14:03:01 stevesk Exp $ */ /* $OpenBSD: auth2-gss.c,v 1.12 2005/10/13 22:24:31 stevesk Exp $ */
/* /*
* Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@ -48,7 +48,7 @@ static void input_gssapi_errtok(int, u_int32_t, void *);
/* /*
* We only support those mechanisms that we know about (ie ones that we know * We only support those mechanisms that we know about (ie ones that we know
* how to check local user kuserok and the like * how to check local user kuserok and the like)
*/ */
static int static int
userauth_gssapi(Authctxt *authctxt) userauth_gssapi(Authctxt *authctxt)
@ -104,7 +104,7 @@ userauth_gssapi(Authctxt *authctxt)
return (0); return (0);
} }
authctxt->methoddata=(void *)ctxt; authctxt->methoddata = (void *)ctxt;
packet_start(SSH2_MSG_USERAUTH_GSSAPI_RESPONSE); packet_start(SSH2_MSG_USERAUTH_GSSAPI_RESPONSE);

5
gss-genr.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: gss-genr.c,v 1.5 2005/10/13 14:03:01 stevesk Exp $ */ /* $OpenBSD: gss-genr.c,v 1.6 2005/10/13 22:24:31 stevesk Exp $ */
/* /*
* Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@ -268,7 +268,8 @@ ssh_gssapi_buildmic(Buffer *b, const char *user, const char *service,
} }
OM_uint32 OM_uint32
ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID oid) { ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID oid)
{
if (*ctx) if (*ctx)
ssh_gssapi_delete_ctx(ctx); ssh_gssapi_delete_ctx(ctx);
ssh_gssapi_build_ctx(ctx); ssh_gssapi_build_ctx(ctx);

13
gss-serv.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: gss-serv.c,v 1.12 2005/10/13 19:08:08 stevesk Exp $ */ /* $OpenBSD: gss-serv.c,v 1.13 2005/10/13 22:24:31 stevesk Exp $ */
/* /*
* Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@ -134,14 +134,14 @@ ssh_gssapi_parse_ename(Gssctxt *ctx, gss_buffer_t ename, gss_buffer_t name)
OM_uint32 offset; OM_uint32 offset;
OM_uint32 oidl; OM_uint32 oidl;
tok=ename->value; tok = ename->value;
/* /*
* Check that ename is long enough for all of the fixed length * Check that ename is long enough for all of the fixed length
* header, and that the initial ID bytes are correct * header, and that the initial ID bytes are correct
*/ */
if (ename->length<6 || memcmp(tok,"\x04\x01", 2)!=0) if (ename->length < 6 || memcmp(tok, "\x04\x01", 2) != 0)
return GSS_S_FAILURE; return GSS_S_FAILURE;
/* /*
@ -160,7 +160,7 @@ ssh_gssapi_parse_ename(Gssctxt *ctx, gss_buffer_t ename, gss_buffer_t name)
*/ */
if (tok[4] != 0x06 || tok[5] != oidl || if (tok[4] != 0x06 || tok[5] != oidl ||
ename->length < oidl+6 || ename->length < oidl+6 ||
!ssh_gssapi_check_oid(ctx,tok+6,oidl)) !ssh_gssapi_check_oid(ctx, tok+6, oidl))
return GSS_S_FAILURE; return GSS_S_FAILURE;
offset = oidl+6; offset = oidl+6;
@ -175,7 +175,7 @@ ssh_gssapi_parse_ename(Gssctxt *ctx, gss_buffer_t ename, gss_buffer_t name)
return GSS_S_FAILURE; return GSS_S_FAILURE;
name->value = xmalloc(name->length+1); name->value = xmalloc(name->length+1);
memcpy(name->value,tok+offset,name->length); memcpy(name->value, tok+offset,name->length);
((char *)name->value)[name->length] = 0; ((char *)name->value)[name->length] = 0;
return GSS_S_COMPLETE; return GSS_S_COMPLETE;
@ -259,9 +259,8 @@ ssh_gssapi_do_child(char ***envp, u_int *envsizep)
if (gssapi_client.store.envvar != NULL && if (gssapi_client.store.envvar != NULL &&
gssapi_client.store.envval != NULL) { gssapi_client.store.envval != NULL) {
debug("Setting %s to %s", gssapi_client.store.envvar, debug("Setting %s to %s", gssapi_client.store.envvar,
gssapi_client.store.envval); gssapi_client.store.envval);
child_set_env(envp, envsizep, gssapi_client.store.envvar, child_set_env(envp, envsizep, gssapi_client.store.envvar,
gssapi_client.store.envval); gssapi_client.store.envval);
} }

10
monitor.c
View File

@ -25,7 +25,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: monitor.c,v 1.63 2005/03/10 22:01:05 deraadt Exp $"); RCSID("$OpenBSD: monitor.c,v 1.64 2005/10/13 22:24:31 stevesk Exp $");
#include <openssl/dh.h> #include <openssl/dh.h>
@ -1829,7 +1829,7 @@ mm_answer_gss_setup_ctx(int sock, Buffer *m)
buffer_clear(m); buffer_clear(m);
buffer_put_int(m, major); buffer_put_int(m, major);
mm_request_send(sock,MONITOR_ANS_GSSSETUP, m); mm_request_send(sock, MONITOR_ANS_GSSSETUP, m);
/* Now we have a context, enable the step */ /* Now we have a context, enable the step */
monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 1); monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 1);
@ -1842,7 +1842,7 @@ mm_answer_gss_accept_ctx(int sock, Buffer *m)
{ {
gss_buffer_desc in; gss_buffer_desc in;
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; u_int len;
@ -1859,7 +1859,7 @@ mm_answer_gss_accept_ctx(int sock, Buffer *m)
gss_release_buffer(&minor, &out); gss_release_buffer(&minor, &out);
if (major==GSS_S_COMPLETE) { if (major == GSS_S_COMPLETE) {
monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 0); monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 0);
monitor_permit(mon_dispatch, MONITOR_REQ_GSSUSEROK, 1); monitor_permit(mon_dispatch, MONITOR_REQ_GSSUSEROK, 1);
monitor_permit(mon_dispatch, MONITOR_REQ_GSSCHECKMIC, 1); monitor_permit(mon_dispatch, MONITOR_REQ_GSSCHECKMIC, 1);
@ -1908,7 +1908,7 @@ mm_answer_gss_userok(int sock, Buffer *m)
debug3("%s: sending result %d", __func__, authenticated); debug3("%s: sending result %d", __func__, authenticated);
mm_request_send(sock, MONITOR_ANS_GSSUSEROK, m); mm_request_send(sock, MONITOR_ANS_GSSUSEROK, m);
auth_method="gssapi-with-mic"; auth_method = "gssapi-with-mic";
/* Monitor loop will terminate if authenticated */ /* Monitor loop will terminate if authenticated */
return (authenticated); return (authenticated);