| gss-genr.c (149749) | gss-genr.c (157016) |
|---|---|
| 1/* $OpenBSD: gss-genr.c,v 1.4 2005/07/17 07:17:55 djm Exp $ */ | 1/* $OpenBSD: gss-genr.c,v 1.6 2005/10/13 22:24:31 stevesk Exp $ */ |
| 2 3/* 4 * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: 9 * 1. Redistributions of source code must retain the above copyright --- 15 unchanged lines hidden (view full) --- 25 */ 26 27#include "includes.h" 28 29#ifdef GSSAPI 30 31#include "xmalloc.h" 32#include "bufaux.h" | 2 3/* 4 * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: 9 * 1. Redistributions of source code must retain the above copyright --- 15 unchanged lines hidden (view full) --- 25 */ 26 27#include "includes.h" 28 29#ifdef GSSAPI 30 31#include "xmalloc.h" 32#include "bufaux.h" |
| 33#include "compat.h" | |
| 34#include "log.h" | 33#include "log.h" |
| 35#include "monitor_wrap.h" | |
| 36#include "ssh2.h" 37 38#include "ssh-gss.h" 39 40extern u_char *session_id2; 41extern u_int session_id2_len; 42 43/* Check that the OID in a data stream matches that in the context */ --- 221 unchanged lines hidden (view full) --- 265 buffer_put_string(b, session_id2, session_id2_len); 266 buffer_put_char(b, SSH2_MSG_USERAUTH_REQUEST); 267 buffer_put_cstring(b, user); 268 buffer_put_cstring(b, service); 269 buffer_put_cstring(b, context); 270} 271 272OM_uint32 | 34#include "ssh2.h" 35 36#include "ssh-gss.h" 37 38extern u_char *session_id2; 39extern u_int session_id2_len; 40 41/* Check that the OID in a data stream matches that in the context */ --- 221 unchanged lines hidden (view full) --- 263 buffer_put_string(b, session_id2, session_id2_len); 264 buffer_put_char(b, SSH2_MSG_USERAUTH_REQUEST); 265 buffer_put_cstring(b, user); 266 buffer_put_cstring(b, service); 267 buffer_put_cstring(b, context); 268} 269 270OM_uint32 |
| 273ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID oid) { | 271ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID oid) 272{ |
| 274 if (*ctx) 275 ssh_gssapi_delete_ctx(ctx); 276 ssh_gssapi_build_ctx(ctx); 277 ssh_gssapi_set_oid(*ctx, oid); 278 return (ssh_gssapi_acquire_cred(*ctx)); 279} 280 281#endif /* GSSAPI */ | 273 if (*ctx) 274 ssh_gssapi_delete_ctx(ctx); 275 ssh_gssapi_build_ctx(ctx); 276 ssh_gssapi_set_oid(*ctx, oid); 277 return (ssh_gssapi_acquire_cred(*ctx)); 278} 279 280#endif /* GSSAPI */ |