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

gssapi/krb5: use GSS_IOV_BUFFER_FLAG_ALLOCATE constants

Browse Source 
GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATE is deprecated as indicated in gssapi.h, use
GSS_IOV_BUFFER_FLAG_ALLOCATE instead
This commit is contained in:
Luke Howard
2020-07-12 14:20:44 +10:00
parent 4b543b727a
commit 62d913a551
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/gssapi/krb5/arcfour.c
View File

@@ -976,7 +976,7 @@ _gssapi_wrap_iov_arcfour(OM_uint32 *minor_status,
header_len -= data_len; header_len -= data_len;
} }
if (GSS_IOV_BUFFER_FLAGS(header->type) & GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATE) { if (GSS_IOV_BUFFER_FLAGS(header->type) & GSS_IOV_BUFFER_FLAG_ALLOCATE) {
major_status = _gk_allocate_buffer(minor_status, header, major_status = _gk_allocate_buffer(minor_status, header,
header_len); header_len);
if (major_status != GSS_S_COMPLETE) if (major_status != GSS_S_COMPLETE)
@@ -990,7 +990,7 @@ _gssapi_wrap_iov_arcfour(OM_uint32 *minor_status,
} }
if (padding) { if (padding) {
if (GSS_IOV_BUFFER_FLAGS(padding->type) & GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATE) { if (GSS_IOV_BUFFER_FLAGS(padding->type) & GSS_IOV_BUFFER_FLAG_ALLOCATE) {
major_status = _gk_allocate_buffer(minor_status, padding, 1); major_status = _gk_allocate_buffer(minor_status, padding, 1);
if (major_status != GSS_S_COMPLETE) if (major_status != GSS_S_COMPLETE)
goto failure; goto failure;

6
lib/gssapi/test_context.c
View File

@@ -451,7 +451,7 @@ wrapunwrap_iov(gss_ctx_id_t cctx, gss_ctx_id_t sctx, int flags, gss_OID mechoid)
memset(iov, 0, sizeof(iov)); memset(iov, 0, sizeof(iov));
iov[0].type = GSS_IOV_BUFFER_TYPE_HEADER | GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATE; iov[0].type = GSS_IOV_BUFFER_TYPE_HEADER | GSS_IOV_BUFFER_FLAG_ALLOCATE;
if (header.length != 0) { if (header.length != 0) {
iov[1].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY; iov[1].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY;
@@ -481,7 +481,7 @@ wrapunwrap_iov(gss_ctx_id_t cctx, gss_ctx_id_t sctx, int flags, gss_OID mechoid)
if (dce_style_flag) { if (dce_style_flag) {
iov[4].type = GSS_IOV_BUFFER_TYPE_EMPTY; iov[4].type = GSS_IOV_BUFFER_TYPE_EMPTY;
} else { } else {
iov[4].type = GSS_IOV_BUFFER_TYPE_PADDING | GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATE; iov[4].type = GSS_IOV_BUFFER_TYPE_PADDING | GSS_IOV_BUFFER_FLAG_ALLOCATE;
} }
iov[4].buffer.length = 0; iov[4].buffer.length = 0;
iov[4].buffer.value = 0; iov[4].buffer.value = 0;
@@ -490,7 +490,7 @@ wrapunwrap_iov(gss_ctx_id_t cctx, gss_ctx_id_t sctx, int flags, gss_OID mechoid)
} else if (flags & USE_HEADER_ONLY) { } else if (flags & USE_HEADER_ONLY) {
iov[5].type = GSS_IOV_BUFFER_TYPE_EMPTY; iov[5].type = GSS_IOV_BUFFER_TYPE_EMPTY;
} else { } else {
iov[5].type = GSS_IOV_BUFFER_TYPE_TRAILER | GSS_IOV_BUFFER_TYPE_FLAG_ALLOCATE; iov[5].type = GSS_IOV_BUFFER_TYPE_TRAILER | GSS_IOV_BUFFER_FLAG_ALLOCATE;
} }
iov[5].buffer.length = 0; iov[5].buffer.length = 0;
iov[5].buffer.value = 0; iov[5].buffer.value = 0;