diff options
author | Colin Watson <cjwatson@debian.org> | 2014-03-20 00:32:39 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-03-20 00:34:16 +0000 |
commit | 2ee2de47fd0f684f54218d31b4ec83930e69c18e (patch) | |
tree | 86848a7668424b392d48791a0e41e05f9df7b62b /ssh-gss.h | |
parent | c9947303ad3c432b1cadfbeb1d95a7cd38662d66 (diff) | |
parent | 9cbb60f5e4932634db04c330c88abc49cc5567bd (diff) |
Merge 6.6p1.
* New upstream release (http://www.openssh.com/txt/release-6.6).
Diffstat (limited to 'ssh-gss.h')
-rw-r--r-- | ssh-gss.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-gss.h,v 1.10 2007/06/12 08:20:00 djm Exp $ */ | 1 | /* $OpenBSD: ssh-gss.h,v 1.11 2014/02/26 20:28:44 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. | 3 | * Copyright (c) 2001-2009 Simon Wilkinson. All rights reserved. |
4 | * | 4 | * |
@@ -121,6 +121,8 @@ void ssh_gssapi_set_oid_data(Gssctxt *, void *, size_t); | |||
121 | void ssh_gssapi_set_oid(Gssctxt *, gss_OID); | 121 | void ssh_gssapi_set_oid(Gssctxt *, gss_OID); |
122 | void ssh_gssapi_supported_oids(gss_OID_set *); | 122 | void ssh_gssapi_supported_oids(gss_OID_set *); |
123 | ssh_gssapi_mech *ssh_gssapi_get_ctype(Gssctxt *); | 123 | ssh_gssapi_mech *ssh_gssapi_get_ctype(Gssctxt *); |
124 | void ssh_gssapi_prepare_supported_oids(void); | ||
125 | OM_uint32 ssh_gssapi_test_oid_supported(OM_uint32 *, gss_OID, int *); | ||
124 | 126 | ||
125 | OM_uint32 ssh_gssapi_import_name(Gssctxt *, const char *); | 127 | OM_uint32 ssh_gssapi_import_name(Gssctxt *, const char *); |
126 | OM_uint32 ssh_gssapi_init_ctx(Gssctxt *, int, | 128 | OM_uint32 ssh_gssapi_init_ctx(Gssctxt *, int, |