summaryrefslogtreecommitdiff
path: root/ssh-gss.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2009-12-29 21:40:29 +0000
committerColin Watson <cjwatson@debian.org>2009-12-29 21:40:29 +0000
commita25ec0b132c44c9e341e08464ff830de06b81126 (patch)
treee20842d80f9e25cb6cf09525abea63f7bf655dd7 /ssh-gss.h
parent1b816ea846aca3ee89e7995373ace609e9518424 (diff)
parent70847d299887abb96f8703ca99db6d817b78960e (diff)
import openssh-4.7p1-gsskex-20070927.patch
Diffstat (limited to 'ssh-gss.h')
-rw-r--r--ssh-gss.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/ssh-gss.h b/ssh-gss.h
index ca8da70a2..4e9e357b5 100644
--- a/ssh-gss.h
+++ b/ssh-gss.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-gss.h,v 1.9 2006/08/18 14:40:34 djm Exp $ */ 1/* $OpenBSD: ssh-gss.h,v 1.10 2007/06/12 08:20:00 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. 3 * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
4 * 4 *
@@ -117,7 +117,6 @@ void ssh_gssapi_supported_oids(gss_OID_set *);
117ssh_gssapi_mech *ssh_gssapi_get_ctype(Gssctxt *); 117ssh_gssapi_mech *ssh_gssapi_get_ctype(Gssctxt *);
118 118
119OM_uint32 ssh_gssapi_import_name(Gssctxt *, const char *); 119OM_uint32 ssh_gssapi_import_name(Gssctxt *, const char *);
120OM_uint32 ssh_gssapi_acquire_cred(Gssctxt *);
121OM_uint32 ssh_gssapi_init_ctx(Gssctxt *, int, 120OM_uint32 ssh_gssapi_init_ctx(Gssctxt *, int,
122 gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *); 121 gss_buffer_desc *, gss_buffer_desc *, OM_uint32 *);
123OM_uint32 ssh_gssapi_accept_ctx(Gssctxt *, 122OM_uint32 ssh_gssapi_accept_ctx(Gssctxt *,
@@ -128,7 +127,6 @@ char *ssh_gssapi_last_error(Gssctxt *, OM_uint32 *, OM_uint32 *);
128void ssh_gssapi_build_ctx(Gssctxt **); 127void ssh_gssapi_build_ctx(Gssctxt **);
129void ssh_gssapi_delete_ctx(Gssctxt **); 128void ssh_gssapi_delete_ctx(Gssctxt **);
130OM_uint32 ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t); 129OM_uint32 ssh_gssapi_sign(Gssctxt *, gss_buffer_t, gss_buffer_t);
131OM_uint32 ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
132void ssh_gssapi_buildmic(Buffer *, const char *, const char *, const char *); 130void ssh_gssapi_buildmic(Buffer *, const char *, const char *, const char *);
133int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *); 131int ssh_gssapi_check_mechanism(Gssctxt **, gss_OID, const char *);
134 132
@@ -138,6 +136,7 @@ char *ssh_gssapi_client_mechanisms(const char *host);
138char *ssh_gssapi_kex_mechs(gss_OID_set, ssh_gssapi_check_fn *, const char *); 136char *ssh_gssapi_kex_mechs(gss_OID_set, ssh_gssapi_check_fn *, const char *);
139gss_OID ssh_gssapi_id_kex(Gssctxt *, char *, int); 137gss_OID ssh_gssapi_id_kex(Gssctxt *, char *, int);
140int ssh_gssapi_server_check_mech(Gssctxt **,gss_OID, const char *); 138int ssh_gssapi_server_check_mech(Gssctxt **,gss_OID, const char *);
139OM_uint32 ssh_gssapi_server_ctx(Gssctxt **, gss_OID);
141int ssh_gssapi_userok(char *name); 140int ssh_gssapi_userok(char *name);
142OM_uint32 ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t); 141OM_uint32 ssh_gssapi_checkmic(Gssctxt *, gss_buffer_t, gss_buffer_t);
143void ssh_gssapi_do_child(char ***, u_int *); 142void ssh_gssapi_do_child(char ***, u_int *);