diff --git a/lib/gssapi/krb5/creds.c b/lib/gssapi/krb5/creds.c index c0d29828f..efb0a23ad 100644 --- a/lib/gssapi/krb5/creds.c +++ b/lib/gssapi/krb5/creds.c @@ -38,11 +38,12 @@ _gsskrb5_export_cred(OM_uint32 *minor_status, gss_cred_id_t cred_handle, gss_buffer_t cred_token) { + OM_uint32 major_status; gsskrb5_cred handle = (gsskrb5_cred)cred_handle; krb5_context context; krb5_error_code ret; krb5_storage *sp; - krb5_data data, mech; + krb5_data data; const char *type; char *str; @@ -141,15 +142,11 @@ _gsskrb5_export_cred(OM_uint32 *minor_status, return GSS_S_FAILURE; } - mech.data = GSS_KRB5_MECHANISM->elements; - mech.length = GSS_KRB5_MECHANISM->length; - - ret = krb5_store_data(sp, mech); - if (ret) { + major_status = _gss_mg_store_oid(minor_status, sp, GSS_KRB5_MECHANISM); + if (major_status != GSS_S_COMPLETE) { krb5_data_free(&data); krb5_storage_free(sp); - *minor_status = ret; - return GSS_S_FAILURE; + return major_status; } ret = krb5_store_data(sp, data); diff --git a/lib/gssapi/mech/gss_cred.c b/lib/gssapi/mech/gss_cred.c index ee2853222..aa3965531 100644 --- a/lib/gssapi/mech/gss_cred.c +++ b/lib/gssapi/mech/gss_cred.c @@ -35,47 +35,35 @@ #include static OM_uint32 -export_oid_set(OM_uint32 *minor_status, - gss_const_OID mech, - gss_const_OID_set oids, - krb5_storage *sp) +store_mech_oid_and_oid_set(OM_uint32 *minor_status, + krb5_storage *sp, + gss_const_OID mech, + gss_const_OID_set oids) { - krb5_error_code ret; - krb5_data data; + OM_uint32 ret; size_t i, len; - data.length = mech->length; - data.data = mech->elements; - - ret = krb5_store_data(sp, data); + ret = _gss_mg_store_oid(minor_status, sp, mech); if (ret) - goto out; + return ret; for (i = 0, len = 0; i < oids->count; i++) len += 4 + oids->elements[i].length; - ret = krb5_store_uint32(sp, len); - if (ret) - goto out; + *minor_status = krb5_store_uint32(sp, len); + if (*minor_status) + return GSS_S_FAILURE; for (i = 0; i < oids->count; i++) { - data.length = oids->elements[i].length; - data.data = oids->elements[i].elements; - - ret = krb5_store_data(sp, data); + ret = _gss_mg_store_oid(minor_status, sp, &oids->elements[i]); if (ret) - goto out; + return ret; } - ret = krb5_storage_to_data(sp, &data); - if (ret) - goto out; - -out: - *minor_status = ret; - return ret ? GSS_S_FAILURE : GSS_S_COMPLETE; + return GSS_S_COMPLETE; } + /* * format: any number of: * mech-len: int32 @@ -144,8 +132,9 @@ gss_export_cred(OM_uint32 * minor_status, } if (cred->gc_neg_mechs != GSS_C_NO_OID_SET) { - major = export_oid_set(minor_status, GSS_SPNEGO_MECHANISM, - cred->gc_neg_mechs, sp); + major = store_mech_oid_and_oid_set(minor_status, sp, + GSS_SPNEGO_MECHANISM, + cred->gc_neg_mechs); if (major != GSS_S_COMPLETE) { krb5_storage_free(sp); return major; @@ -179,7 +168,6 @@ import_oid_set(OM_uint32 *minor_status, gss_OID_set *oids) { OM_uint32 major, junk; - krb5_error_code ret; krb5_storage *sp = NULL; *oids = GSS_C_NO_OID_SET; @@ -199,27 +187,17 @@ import_oid_set(OM_uint32 *minor_status, } while (1) { - gss_OID_desc oid; - krb5_data data; + gss_OID oid; - ret = krb5_ret_data(sp, &data); - if (ret == HEIM_ERR_EOF) + major = _gss_mg_ret_oid(minor_status, sp, &oid); + if (*minor_status == HEIM_ERR_EOF) break; - else if (ret) { - *minor_status = ret; - major = GSS_S_FAILURE; + else if (major) goto out; - } - oid.elements = data.data; - oid.length = (OM_uint32)data.length; - - major = gss_add_oid_set_member(minor_status, &oid, oids); - if (major != GSS_S_COMPLETE) { - krb5_data_free(&data); + major = gss_add_oid_set_member(minor_status, oid, oids); + if (major != GSS_S_COMPLETE) goto out; - } - krb5_data_free(&data); } major = GSS_S_COMPLETE; @@ -239,11 +217,9 @@ gss_import_cred(OM_uint32 * minor_status, gss_cred_id_t * cred_handle) { gssapi_mech_interface m; - krb5_error_code ret; struct _gss_cred *cred; krb5_storage *sp = NULL; OM_uint32 major, junk; - krb5_data data; *cred_handle = GSS_C_NO_CREDENTIAL; @@ -271,21 +247,15 @@ gss_import_cred(OM_uint32 * minor_status, struct _gss_mechanism_cred *mc; gss_buffer_desc buffer; gss_cred_id_t mcred; - gss_OID_desc oid; + gss_OID oid; - ret = krb5_ret_data(sp, &data); - if (ret == HEIM_ERR_EOF) { + major = _gss_mg_ret_oid(minor_status, sp, &oid); + if (*minor_status == HEIM_ERR_EOF) break; - } else if (ret) { - *minor_status = ret; - major = GSS_S_FAILURE; + else if (major != GSS_S_COMPLETE) goto out; - } - oid.elements = data.data; - oid.length = (OM_uint32)data.length; - m = __gss_get_mechanism(&oid); - krb5_data_free(&data); + m = __gss_get_mechanism(oid); if (!m) { *minor_status = 0; major = GSS_S_BAD_MECH; @@ -299,19 +269,18 @@ gss_import_cred(OM_uint32 * minor_status, goto out; } - ret = krb5_ret_data(sp, &data); - if (ret) { - *minor_status = ret; - major = GSS_S_FAILURE; + major = _gss_mg_ret_buffer(minor_status, sp, &buffer); + if (major != GSS_S_COMPLETE) + goto out; + + if (buffer.value == NULL) { + major = GSS_S_DEFECTIVE_TOKEN; goto out; } - buffer.value = data.data; - buffer.length = data.length; - if (gss_oid_equal(&m->gm_mech_oid, GSS_SPNEGO_MECHANISM)) { major = import_oid_set(minor_status, &buffer, &cred->gc_neg_mechs); - krb5_data_free(&data); + gss_release_buffer(&junk, &buffer); if (major != GSS_S_COMPLETE) goto out; else @@ -320,12 +289,11 @@ gss_import_cred(OM_uint32 * minor_status, major = m->gm_import_cred(minor_status, &buffer, &mcred); - krb5_data_free(&data); - if (major) { + gss_release_buffer(&junk, &buffer); + if (major != GSS_S_COMPLETE) goto out; - } - mc = malloc(sizeof(struct _gss_mechanism_cred)); + mc = calloc(1, sizeof(struct _gss_mechanism_cred)); if (mc == NULL) { *minor_status = EINVAL; major = GSS_S_FAILURE; diff --git a/lib/gssapi/mech/gss_export_sec_context.c b/lib/gssapi/mech/gss_export_sec_context.c index b3e85bbd1..05a05f508 100644 --- a/lib/gssapi/mech/gss_export_sec_context.c +++ b/lib/gssapi/mech/gss_export_sec_context.c @@ -86,12 +86,10 @@ gss_export_sec_context(OM_uint32 *minor_status, *minor_status = kret; goto failure; } - kret = krb5_store_datalen(sp, ctx->gc_input.value, - ctx->gc_input.length); - if (kret) { - *minor_status = kret; + major_status = _gss_mg_store_buffer(minor_status, sp, + &ctx->gc_input); + if (major_status != GSS_S_COMPLETE) goto failure; - } } else if (ctx->gc_ctx == GSS_C_NO_CONTEXT) { gss_delete_sec_context(&tmp_minor, context_handle, GSS_C_NO_BUFFER); @@ -109,18 +107,14 @@ gss_export_sec_context(OM_uint32 *minor_status, goto failure; } - kret = krb5_store_datalen(sp, m->gm_mech_oid.elements, - m->gm_mech_oid.length); - if (kret) { - *minor_status = kret; + major_status = _gss_mg_store_oid(minor_status, sp, + &m->gm_mech_oid); + if (major_status != GSS_S_COMPLETE) goto failure; - } - kret = krb5_store_datalen(sp, buf.value, buf.length); - if (kret) { - *minor_status = kret; + major_status = _gss_mg_store_buffer(minor_status, sp, &buf); + if (major_status != GSS_S_COMPLETE) goto failure; - } } kret = krb5_storage_to_data(sp, &data); diff --git a/lib/gssapi/mech/gss_import_sec_context.c b/lib/gssapi/mech/gss_import_sec_context.c index 502db9bf5..0acae8533 100644 --- a/lib/gssapi/mech/gss_import_sec_context.c +++ b/lib/gssapi/mech/gss_import_sec_context.c @@ -35,11 +35,9 @@ gss_import_sec_context(OM_uint32 *minor_status, { OM_uint32 ret = GSS_S_FAILURE, tmp_minor; krb5_storage *sp; - krb5_data data; gssapi_mech_interface m; struct _gss_context *ctx = NULL; - gss_OID_desc mech_oid; - gss_buffer_desc buf; + gss_buffer_desc buf = GSS_C_EMPTY_BUFFER; unsigned char verflags; _gss_mg_log(10, "gss-isc called"); @@ -85,42 +83,51 @@ gss_import_sec_context(OM_uint32 *minor_status, if (krb5_ret_uint32(sp, &target_len)) goto failure; - if (krb5_ret_data(sp, &data)) + ret = _gss_mg_ret_buffer(minor_status, sp, &buf); + if (ret != GSS_S_COMPLETE) goto failure; - ctx->gc_input.value = calloc(target_len, 1); + ctx->gc_input.value = calloc(target_len, 1); if (ctx->gc_input.value == NULL) goto failure; ctx->gc_target_len = target_len; - ctx->gc_input.length = data.length; - memcpy(ctx->gc_input.value, data.data, data.length); + ctx->gc_input.length = buf.length; + if (buf.value) + memcpy(ctx->gc_input.value, buf.value, buf.length); - krb5_data_free(&data); + gss_release_buffer(&tmp_minor, &buf); } if (verflags & EXPORT_CONTEXT_FLAG_MECH_CTX) { - if (krb5_ret_data(sp, &data)) + gss_OID mech_oid; + + ret = _gss_mg_ret_oid(minor_status, sp, &mech_oid); + if (ret != GSS_S_COMPLETE) goto failure; - mech_oid.length = data.length; - mech_oid.elements = data.data; - m = __gss_get_mechanism(&mech_oid); - krb5_data_free(&data); + if (mech_oid == GSS_C_NO_OID) { + ret = GSS_S_BAD_MECH; + goto failure; + } + + m = __gss_get_mechanism(mech_oid); if (m == NULL) { ret = GSS_S_DEFECTIVE_TOKEN; goto failure; } ctx->gc_mech = m; - if (krb5_ret_data(sp, &data)) - goto failure; + ret = _gss_mg_ret_buffer(minor_status, sp, &buf); + if (ret != GSS_S_COMPLETE) + goto failure; - buf.length = data.length; - buf.value = data.data; + if (buf.value == NULL) { + ret = GSS_S_DEFECTIVE_TOKEN; + goto failure; + } ret = m->gm_import_sec_context(minor_status, &buf, &ctx->gc_ctx); - _gss_secure_release_buffer(&tmp_minor, &buf); if (ret != GSS_S_COMPLETE) { _gss_mg_error(m, *minor_status); goto failure; @@ -135,5 +142,6 @@ gss_import_sec_context(OM_uint32 *minor_status, failure: free(ctx); krb5_storage_free(sp); + _gss_secure_release_buffer(&tmp_minor, &buf); return ret; } diff --git a/lib/gssapi/mech/gss_utils.c b/lib/gssapi/mech/gss_utils.c index e12b3bd2f..bb7e61939 100644 --- a/lib/gssapi/mech/gss_utils.c +++ b/lib/gssapi/mech/gss_utils.c @@ -236,3 +236,89 @@ _gss_mg_decode_be_uint16(const void *ptr, uint16_t *n) const uint8_t *p = ptr; *n = (p[0] << 24) | (p[1] << 16); } + +OM_uint32 +_gss_mg_ret_oid(OM_uint32 *minor, + krb5_storage *sp, + gss_OID *oidp) +{ + krb5_data data; + gss_OID_desc oid; + OM_uint32 major; + + *minor = 0; + *oidp = GSS_C_NO_OID; + + *minor = krb5_ret_data(sp, &data); + if (*minor) + return GSS_S_FAILURE; + + if (data.length) { + oid.length = data.length; + oid.elements = data.data; + + major = _gss_intern_oid(minor, &oid, oidp); + } else + major = GSS_S_COMPLETE; + + krb5_data_free(&data); + + return major; +} + +OM_uint32 +_gss_mg_store_oid(OM_uint32 *minor, + krb5_storage *sp, + gss_const_OID oid) +{ + krb5_data data; + + if (oid) { + data.length = oid->length; + data.data = oid->elements; + } else + krb5_data_zero(&data); + + *minor = krb5_store_data(sp, data); + + return *minor ? GSS_S_FAILURE : GSS_S_COMPLETE; +} + +OM_uint32 +_gss_mg_ret_buffer(OM_uint32 *minor, + krb5_storage *sp, + gss_buffer_t buffer) +{ + krb5_data data; + + _mg_buffer_zero(buffer); + + *minor = krb5_ret_data(sp, &data); + if (*minor == 0) { + if (data.length) { + buffer->length = data.length; + buffer->value = data.data; + } else + krb5_data_free(&data); + } + + return *minor ? GSS_S_FAILURE : GSS_S_COMPLETE; +} + +OM_uint32 +_gss_mg_store_buffer(OM_uint32 *minor, + krb5_storage *sp, + gss_const_buffer_t buffer) +{ + krb5_data data; + + if (buffer) { + data.length = buffer->length; + data.data = buffer->value; + } else + krb5_data_zero(&data); + + *minor = krb5_store_data(sp, data); + + return *minor ? GSS_S_FAILURE : GSS_S_COMPLETE; +} diff --git a/lib/gssapi/mech/utils.h b/lib/gssapi/mech/utils.h index 31104f2e3..208a59cc8 100644 --- a/lib/gssapi/mech/utils.h +++ b/lib/gssapi/mech/utils.h @@ -53,3 +53,30 @@ _gss_mg_import_rfc4121_context(OM_uint32 *minor, int32_t rfc3961_enctype, gss_const_buffer_t session_key, gss_ctx_id_t *rfc4121_context_handle); + +#include + +/* + * Note: functions below support zero-length OIDs and buffers and will + * return NULL values. Callers should handle accordingly. + */ + +OM_uint32 +_gss_mg_ret_oid(OM_uint32 *minor, + krb5_storage *sp, + gss_OID *oidp); + +OM_uint32 +_gss_mg_store_oid(OM_uint32 *minor, + krb5_storage *sp, + gss_const_OID oid); + +OM_uint32 +_gss_mg_ret_buffer(OM_uint32 *minor, + krb5_storage *sp, + gss_buffer_t buffer); + +OM_uint32 +_gss_mg_store_buffer(OM_uint32 *minor, + krb5_storage *sp, + gss_const_buffer_t buffer); diff --git a/lib/gssapi/spnego/context_storage.c b/lib/gssapi/spnego/context_storage.c index 914f7546e..3628488e9 100644 --- a/lib/gssapi/spnego/context_storage.c +++ b/lib/gssapi/spnego/context_storage.c @@ -56,16 +56,6 @@ ret_negoex_auth_mech(krb5_storage *sp, struct negoex_auth_mech **mechp); static krb5_error_code store_negoex_auth_mech(krb5_storage *sp, struct negoex_auth_mech *mech); -static krb5_error_code -ret_gss_oid(krb5_storage *sp, gss_OID *oidp); -static krb5_error_code -store_gss_oid(krb5_storage *sp, gss_OID oid); - -static krb5_error_code -ret_gss_buffer(krb5_storage *sp, gss_buffer_t buffer); -static krb5_error_code -store_gss_buffer(krb5_storage *sp, gss_const_buffer_t buffer); - static uint16_t spnego_flags_to_int(struct spnego_flags flags); static struct spnego_flags @@ -148,16 +138,16 @@ ret_spnego_context(krb5_storage *sp, gssspnego_ctx *ctxp) ctx->flags = int_to_spnego_flags(spnego_flags); if (sc_flags & SC_MECH_TYPES) - CHECK(ret, ret_gss_buffer(sp, &ctx->NegTokenInit_mech_types)); + CHECK(major, _gss_mg_ret_buffer(&minor, sp, &ctx->NegTokenInit_mech_types)); if (sc_flags & SC_PREFERRED_MECH_TYPE) - CHECK(ret, ret_gss_oid(sp, &ctx->preferred_mech_type)); + CHECK(major, _gss_mg_ret_oid(&minor, sp, &ctx->preferred_mech_type)); if (sc_flags & SC_SELECTED_MECH_TYPE) - CHECK(ret, ret_gss_oid(sp, &ctx->selected_mech_type)); + CHECK(major, _gss_mg_ret_oid(&minor, sp, &ctx->selected_mech_type)); if (sc_flags & SC_NEGOTIATED_MECH_TYPE) - CHECK(ret, ret_gss_oid(sp, &ctx->negotiated_mech_type)); + CHECK(major, _gss_mg_ret_oid(&minor, sp, &ctx->negotiated_mech_type)); if (sc_flags & SC_NEGOTIATED_CTX_ID) { - CHECK(ret, ret_gss_buffer(sp, &buf)); + CHECK(major, _gss_mg_ret_buffer(&minor, sp, &buf)); CHECK(major, gss_import_sec_context(&minor, &buf, &ctx->negotiated_ctx_id)); gss_release_buffer(&minor, &buf); @@ -171,14 +161,14 @@ ret_spnego_context(krb5_storage *sp, gssspnego_ctx *ctxp) ctx->mech_time_rec = GSS_C_INDEFINITE; if (sc_flags & SC_MECH_SRC_NAME) { - CHECK(ret, ret_gss_buffer(sp, &buf)); + CHECK(major, _gss_mg_ret_buffer(&minor, sp, &buf)); CHECK(major, gss_import_name(&minor, &buf, GSS_C_NT_EXPORT_NAME, &ctx->mech_src_name)); gss_release_buffer(&minor, &buf); } if (sc_flags & SC_TARGET_NAME) { - CHECK(ret, ret_gss_buffer(sp, &buf)); + CHECK(major, _gss_mg_ret_buffer(&minor, sp, &buf)); CHECK(major, gss_import_name(&minor, &buf, GSS_C_NT_EXPORT_NAME, &ctx->target_name)); gss_release_buffer(&minor, &buf); @@ -273,17 +263,17 @@ store_spnego_context(krb5_storage *sp, gssspnego_ctx ctx) CHECK(ret, krb5_store_uint16(sp, spnego_flags)); if (sc_flags & SC_MECH_TYPES) - CHECK(ret, store_gss_buffer(sp, &ctx->NegTokenInit_mech_types)); + CHECK(major, _gss_mg_store_buffer(&minor, sp, &ctx->NegTokenInit_mech_types)); if (sc_flags & SC_PREFERRED_MECH_TYPE) - CHECK(ret, store_gss_oid(sp, ctx->preferred_mech_type)); + CHECK(major, _gss_mg_store_oid(&minor, sp, ctx->preferred_mech_type)); if (sc_flags & SC_SELECTED_MECH_TYPE) - CHECK(ret, store_gss_oid(sp, ctx->selected_mech_type)); + CHECK(major, _gss_mg_store_oid(&minor, sp, ctx->selected_mech_type)); if (sc_flags & SC_NEGOTIATED_MECH_TYPE) - CHECK(ret, store_gss_oid(sp, ctx->negotiated_mech_type)); + CHECK(major, _gss_mg_store_oid(&minor, sp, ctx->negotiated_mech_type)); if (sc_flags & SC_NEGOTIATED_CTX_ID) { CHECK(major, gss_export_sec_context(&minor, &ctx->negotiated_ctx_id, &buf)); - CHECK(ret, store_gss_buffer(sp, &buf)); + CHECK(major, _gss_mg_store_buffer(&minor, sp, &buf)); gss_release_buffer(&minor, &buf); } if (sc_flags & SC_MECH_FLAGS) @@ -292,13 +282,13 @@ store_spnego_context(krb5_storage *sp, gssspnego_ctx ctx) CHECK(ret, krb5_store_uint32(sp, ctx->mech_time_rec)); if (sc_flags & SC_MECH_SRC_NAME) { CHECK(major, gss_export_name(&minor, ctx->mech_src_name, &buf)); - CHECK(ret, store_gss_buffer(sp, &buf)); + CHECK(major, _gss_mg_store_buffer(&minor, sp, &buf)); gss_release_buffer(&minor, &buf); } if (sc_flags & SC_TARGET_NAME) { CHECK(major, gss_export_name(&minor, ctx->target_name, &buf)); - CHECK(ret, store_gss_buffer(sp, &buf)); + CHECK(major, _gss_mg_store_buffer(&minor, sp, &buf)); gss_release_buffer(&minor, &buf); } @@ -372,7 +362,7 @@ ret_negoex_auth_mech(krb5_storage *sp, struct negoex_auth_mech **mechp) mech->verified_checksum = 1; if (snc_flags & SNC_OID) - CHECK(ret, ret_gss_oid(sp, &mech->oid)); + CHECK(major, _gss_mg_ret_oid(&minor, sp, &mech->oid)); if (krb5_storage_read(sp, mech->scheme, GUID_LENGTH) != GUID_LENGTH) { ret = KRB5_BAD_MSIZE; @@ -380,14 +370,14 @@ ret_negoex_auth_mech(krb5_storage *sp, struct negoex_auth_mech **mechp) } if (snc_flags & SNC_MECH_CONTEXT) { - CHECK(ret, ret_gss_buffer(sp, &buf)); + CHECK(major, _gss_mg_ret_buffer(&minor, sp, &buf)); CHECK(major, gss_import_sec_context(&minor, &buf, &mech->mech_context)); gss_release_buffer(&minor, &buf); } if (snc_flags & SNC_METADATA) - CHECK(ret, ret_gss_buffer(sp, &mech->metadata)); + CHECK(major, _gss_mg_ret_buffer(&minor, sp, &mech->metadata)); *mechp = mech; @@ -428,19 +418,19 @@ store_negoex_auth_mech(krb5_storage *sp, struct negoex_auth_mech *mech) CHECK(ret, krb5_store_uint8(sp, negoex_flags)); if (snc_flags & SNC_OID) - CHECK(ret, store_gss_oid(sp, mech->oid)); + CHECK(major, _gss_mg_store_oid(&minor, sp, mech->oid)); CHECK(ret, krb5_store_bytes(sp, mech->scheme, GUID_LENGTH)); if (snc_flags & SNC_MECH_CONTEXT) { CHECK(major, gss_export_sec_context(&minor, &mech->mech_context, &buf)); - CHECK(ret, store_gss_buffer(sp, &buf)); + CHECK(major, _gss_mg_store_buffer(&minor, sp, &buf)); gss_release_buffer(&minor, &buf); } if (snc_flags & SNC_METADATA) - CHECK(ret, store_gss_buffer(sp, &mech->metadata)); + CHECK(major, _gss_mg_store_buffer(&minor, sp, &mech->metadata)); fail: if (ret == 0 && GSS_ERROR(major)) @@ -450,84 +440,6 @@ fail: return ret; } -static krb5_error_code -ret_gss_oid(krb5_storage *sp, gss_OID *oidp) -{ - krb5_data data; - krb5_error_code ret; - gss_OID_desc oid; - OM_uint32 major, minor; - - *oidp = GSS_C_NO_OID; - - ret = krb5_ret_data(sp, &data); - if (ret) - return ret; - - if (data.length) { - oid.length = data.length; - oid.elements = data.data; - - major = _gss_intern_oid(&minor, &oid, oidp); - } else - major = GSS_S_COMPLETE; - - krb5_data_free(&data); - - return GSS_ERROR(major) ? ENOMEM : 0; -} - -static krb5_error_code -store_gss_oid(krb5_storage *sp, gss_OID oid) -{ - krb5_data data; - - krb5_data_zero(&data); - - if (oid) { - data.length = oid->length; - data.data = oid->elements; - } - - return krb5_store_data(sp, data); -} - -static krb5_error_code -ret_gss_buffer(krb5_storage *sp, gss_buffer_t buffer) -{ - krb5_error_code ret; - krb5_data data; - - _mg_buffer_zero(buffer); - - ret = krb5_ret_data(sp, &data); - if (ret) - return ret; - - if (data.length) { - buffer->length = data.length; - buffer->value = data.data; - } else - krb5_data_free(&data); - - return 0; -} - -static krb5_error_code -store_gss_buffer(krb5_storage *sp, gss_const_buffer_t buffer) -{ - krb5_data data; - - krb5_data_zero(&data); - - if (buffer) { - data.length = buffer->length; - data.data = buffer->value; - } - - return krb5_store_data(sp, data); -} - static uint16_t spnego_flags_to_int(struct spnego_flags flags) {