formatting cleanup

[mech_eap.git] / mech_eap / wrap_iov.c

diff --git a/mech_eap/wrap_iov.c b/mech_eap/wrap_iov.c
index 31450fc..9f6d4ec 100644 (file)
--- a/mech_eap/wrap_iov.c
+++ b/mech_eap/wrap_iov.c
@@ -126,7 +126,7 @@ gssEapWrapOrGetMIC(OM_uint32 *minor,
 
     gssEapIovMessageLength(iov, iov_count, &dataLen, &assocDataLen);
 
-    header = gssEapLocateIov(iov, iov_count, GSS_IOV_BUFFER_TYPE_HEADER);
+    header = gssEapLocateHeaderIov(iov, iov_count, toktype);
     if (header == NULL) {
         *minor = GSSEAP_MISSING_IOV;
         return GSS_S_FAILURE;
@@ -248,7 +248,7 @@ gssEapWrapOrGetMIC(OM_uint32 *minor,
         if (code != 0)
             goto cleanup;
 
-        assert(gssTrailerLen <= 0xFFFF);
+        GSSEAP_ASSERT(gssTrailerLen <= 0xFFFF);
 
         if (trailer == NULL) {
             rrc = gssTrailerLen;
@@ -297,7 +297,7 @@ gssEapWrapOrGetMIC(OM_uint32 *minor,
 
         code = gssEapSign(krbContext, ctx->checksumType, rrc,
                           KRB_CRYPTO_CONTEXT(ctx), keyUsage,
-                          iov, iov_count);
+                          iov, iov_count, toktype);
         if (code != 0)
             goto cleanup;
 
@@ -336,7 +336,7 @@ cleanup:
     return (code == 0) ? GSS_S_COMPLETE : GSS_S_FAILURE;
 }
 
-OM_uint32
+OM_uint32 GSSAPI_CALLCONV
 gss_wrap_iov(OM_uint32 *minor,
              gss_ctx_id_t ctx,
              int conf_req_flag,
@@ -377,3 +377,4 @@ cleanup:
 
     return major;
 }
+