oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Merge pull request #711 from nicowilliams/master

Browse Source 
Fix gss_krb5_copy_ccache() (broken by MEM:anon)
This commit is contained in:
Nico Williams
2020-05-13 21:57:25 -05:00
committed by GitHub
parent 001cf39374
commit 1243ea6a9a
2 changed files with 19 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gssapi/krb5/gsskrb5_locl.h
View File

@@ -117,7 +117,7 @@ extern HEIMDAL_MUTEX gssapi_keytab_mutex;
* Prototypes * Prototypes
*/ */
#include "gsskrb5-private.h" #include "krb5/gsskrb5-private.h"
#define GSSAPI_KRB5_INIT(ctx) do { \ #define GSSAPI_KRB5_INIT(ctx) do { \
krb5_error_code kret_gss_init; \ krb5_error_code kret_gss_init; \

70
lib/gssapi/mech/gss_krb5.c
View File

@@ -27,67 +27,33 @@
*/ */
#include "mech_locl.h" #include "mech_locl.h"
#include "krb5/gsskrb5_locl.h"
#include <krb5.h>
#include <roken.h>
GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
gss_krb5_copy_ccache(OM_uint32 *minor_status, gss_krb5_copy_ccache(OM_uint32 *minor_status,
gss_cred_id_t cred, gss_cred_id_t cred,
krb5_ccache out) krb5_ccache out)
{ {
gss_buffer_set_t data_set = GSS_C_NO_BUFFER_SET; gss_key_value_element_desc cred_store_kvs[1];
gss_key_value_set_desc cred_store;
krb5_context context; krb5_context context;
krb5_error_code kret; OM_uint32 major = GSS_S_FAILURE;
krb5_ccache id; char *fullname = NULL;
OM_uint32 ret;
char *str = NULL;
ret = gss_inquire_cred_by_oid(minor_status, GSSAPI_KRB5_INIT(&context);
cred, *minor_status = krb5_cc_get_full_name(context, out, &fullname);
GSS_KRB5_COPY_CCACHE_X, if (*minor_status == 0) {
&data_set); cred_store_kvs[0].key = "ccache";
if (ret) cred_store_kvs[0].value = fullname;
return ret; cred_store.count = 1;
cred_store.elements = cred_store_kvs;
if (data_set == GSS_C_NO_BUFFER_SET || data_set->count < 1) { major = gss_store_cred_into2(minor_status, cred, GSS_C_INITIATE,
gss_release_buffer_set(minor_status, &data_set); GSS_KRB5_MECHANISM,
*minor_status = EINVAL; GSS_C_STORE_CRED_OVERWRITE, &cred_store,
return GSS_S_FAILURE; NULL, NULL, NULL);
free(fullname);
} }
return major;
kret = krb5_init_context(&context);
if (kret) {
*minor_status = kret;
gss_release_buffer_set(minor_status, &data_set);
return GSS_S_FAILURE;
}
kret = asprintf(&str, "%.*s", (int)data_set->elements[0].length,
(char *)data_set->elements[0].value);
gss_release_buffer_set(minor_status, &data_set);
if (kret < 0 || str == NULL) {
*minor_status = ENOMEM;
return GSS_S_FAILURE;
}
kret = krb5_cc_resolve(context, str, &id);
free(str);
if (kret) {
*minor_status = kret;
return GSS_S_FAILURE;
}
kret = krb5_cc_copy_cache(context, id, out);
krb5_cc_close(context, id);
krb5_free_context(context);
if (kret) {
*minor_status = kret;
return GSS_S_FAILURE;
}
return ret;
} }
GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL