Deleted Added
sdiff udiff text old ( 157016 ) new ( 162852 )
full compact
auth2-gss.c (157016) auth2-gss.c (162852)
1/* $OpenBSD: auth2-gss.c,v 1.12 2005/10/13 22:24:31 stevesk Exp $ */
1/* $OpenBSD: auth2-gss.c,v 1.15 2006/08/03 03:34:41 deraadt 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

--- 13 unchanged lines hidden (view full) ---

23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include "includes.h"
28
29#ifdef GSSAPI
30
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

--- 13 unchanged lines hidden (view full) ---

23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */
26
27#include "includes.h"
28
29#ifdef GSSAPI
30
31#include <sys/types.h>
32
33#include <stdarg.h>
34
35#include "xmalloc.h"
36#include "key.h"
37#include "hostfile.h"
31#include "auth.h"
32#include "ssh2.h"
38#include "auth.h"
39#include "ssh2.h"
33#include "xmalloc.h"
34#include "log.h"
35#include "dispatch.h"
40#include "log.h"
41#include "dispatch.h"
42#include "buffer.h"
36#include "servconf.h"
37#include "packet.h"
43#include "servconf.h"
44#include "packet.h"
45#include "ssh-gss.h"
38#include "monitor_wrap.h"
39
46#include "monitor_wrap.h"
47
40#include "ssh-gss.h"
41
42extern ServerOptions options;
43
44static void input_gssapi_token(int type, u_int32_t plen, void *ctxt);
45static void input_gssapi_mic(int type, u_int32_t plen, void *ctxt);
46static void input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt);
47static void input_gssapi_errtok(int, u_int32_t, void *);
48
49/*

--- 45 unchanged lines hidden (view full) ---

95 gss_release_oid_set(&ms, &supported);
96
97 if (!present) {
98 xfree(doid);
99 return (0);
100 }
101
102 if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, &goid)))) {
48extern ServerOptions options;
49
50static void input_gssapi_token(int type, u_int32_t plen, void *ctxt);
51static void input_gssapi_mic(int type, u_int32_t plen, void *ctxt);
52static void input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt);
53static void input_gssapi_errtok(int, u_int32_t, void *);
54
55/*

--- 45 unchanged lines hidden (view full) ---

101 gss_release_oid_set(&ms, &supported);
102
103 if (!present) {
104 xfree(doid);
105 return (0);
106 }
107
108 if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt, &goid)))) {
109 if (ctxt != NULL)
110 ssh_gssapi_delete_ctx(&ctxt);
103 xfree(doid);
104 return (0);
105 }
106
107 authctxt->methoddata = (void *)ctxt;
108
109 packet_start(SSH2_MSG_USERAUTH_GSSAPI_RESPONSE);
110

--- 183 unchanged lines hidden --- 		111 xfree(doid);
112 return (0);
113 }
114
115 authctxt->methoddata = (void *)ctxt;
116
117 packet_start(SSH2_MSG_USERAUTH_GSSAPI_RESPONSE);
118

--- 183 unchanged lines hidden ---