projects
/
mech_eap.orig
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use GSSEAP_ASSERT macro instead of assert
[mech_eap.orig]
/
mech_eap
/
unwrap_iov.c
diff --git
a/mech_eap/unwrap_iov.c
b/mech_eap/unwrap_iov.c
index
19bafc6
..
6291172
100644
(file)
--- a/
mech_eap/unwrap_iov.c
+++ b/
mech_eap/unwrap_iov.c
@@
-103,7
+103,7
@@
unwrapToken(OM_uint32 *minor,
*qop_state = GSS_C_QOP_DEFAULT;
header = gssEapLocateIov(iov, iov_count, GSS_IOV_BUFFER_TYPE_HEADER);
*qop_state = GSS_C_QOP_DEFAULT;
header = gssEapLocateIov(iov, iov_count, GSS_IOV_BUFFER_TYPE_HEADER);
-
assert
(header != NULL);
+
GSSEAP_ASSERT
(header != NULL);
padding = gssEapLocateIov(iov, iov_count, GSS_IOV_BUFFER_TYPE_PADDING);
if (padding != NULL && padding->buffer.length != 0) {
padding = gssEapLocateIov(iov, iov_count, GSS_IOV_BUFFER_TYPE_PADDING);
if (padding != NULL && padding->buffer.length != 0) {
@@
-319,7
+319,7
@@
unwrapStream(OM_uint32 *minor,
unsigned char *ptr;
OM_uint32 code = 0, major = GSS_S_FAILURE;
krb5_context krbContext;
unsigned char *ptr;
OM_uint32 code = 0, major = GSS_S_FAILURE;
krb5_context krbContext;
- int conf_req_flag
, toktype2
;
+ int conf_req_flag;
int i = 0, j;
gss_iov_buffer_desc *tiov = NULL;
gss_iov_buffer_t stream, data = NULL;
int i = 0, j;
gss_iov_buffer_desc *tiov = NULL;
gss_iov_buffer_t stream, data = NULL;
@@
-330,7
+330,7
@@
unwrapStream(OM_uint32 *minor,
GSSEAP_KRB_INIT(&krbContext);
GSSEAP_KRB_INIT(&krbContext);
-
assert
(toktype == TOK_TYPE_WRAP);
+
GSSEAP_ASSERT
(toktype == TOK_TYPE_WRAP);
if (toktype != TOK_TYPE_WRAP) {
code = GSSEAP_WRONG_TOK_ID;
if (toktype != TOK_TYPE_WRAP) {
code = GSSEAP_WRONG_TOK_ID;
@@
-338,7
+338,7
@@
unwrapStream(OM_uint32 *minor,
}
stream = gssEapLocateIov(iov, iov_count, GSS_IOV_BUFFER_TYPE_STREAM);
}
stream = gssEapLocateIov(iov, iov_count, GSS_IOV_BUFFER_TYPE_STREAM);
-
assert
(stream != NULL);
+
GSSEAP_ASSERT
(stream != NULL);
if (stream->buffer.length < 16) {
major = GSS_S_DEFECTIVE_TOKEN;
if (stream->buffer.length < 16) {
major = GSS_S_DEFECTIVE_TOKEN;
@@
-346,8
+346,7
@@
unwrapStream(OM_uint32 *minor,
}
ptr = (unsigned char *)stream->buffer.value;
}
ptr = (unsigned char *)stream->buffer.value;
- toktype2 = load_uint16_be(ptr);
- ptr += 2;
+ ptr += 2; /* skip token type */
tiov = (gss_iov_buffer_desc *)GSSEAP_CALLOC((size_t)iov_count + 2,
sizeof(gss_iov_buffer_desc));
tiov = (gss_iov_buffer_desc *)GSSEAP_CALLOC((size_t)iov_count + 2,
sizeof(gss_iov_buffer_desc));
@@
-459,7
+458,7
@@
unwrapStream(OM_uint32 *minor,
tdata->buffer.length = stream->buffer.length - ttrailer->buffer.length -
tpadding->buffer.length - theader->buffer.length;
tdata->buffer.length = stream->buffer.length - ttrailer->buffer.length -
tpadding->buffer.length - theader->buffer.length;
-
assert
(data != NULL);
+
GSSEAP_ASSERT
(data != NULL);
if (data->type & GSS_IOV_BUFFER_FLAG_ALLOCATE) {
code = gssEapAllocIov(tdata, tdata->buffer.length);
if (data->type & GSS_IOV_BUFFER_FLAG_ALLOCATE) {
code = gssEapAllocIov(tdata, tdata->buffer.length);
@@
-474,7
+473,7
@@
unwrapStream(OM_uint32 *minor,
theader->buffer.length;
}
theader->buffer.length;
}
-
assert
(i <= iov_count + 2);
+
GSSEAP_ASSERT
(i <= iov_count + 2);
major = unwrapToken(&code, ctx, KRB_CRYPTO_CONTEXT(ctx),
conf_state, qop_state, tiov, i, toktype);
major = unwrapToken(&code, ctx, KRB_CRYPTO_CONTEXT(ctx),
conf_state, qop_state, tiov, i, toktype);
@@
-529,7
+528,7
@@
gssEapUnwrapOrVerifyMIC(OM_uint32 *minor,
return major;
}
return major;
}
-OM_uint32
+OM_uint32
GSSAPI_CALLCONV
gss_unwrap_iov(OM_uint32 *minor,
gss_ctx_id_t ctx,
int *conf_state,
gss_unwrap_iov(OM_uint32 *minor,
gss_ctx_id_t ctx,
int *conf_state,