cleanup

[mech_eap.orig] / util_cksum.c

diff --git a/util_cksum.c b/util_cksum.c
index 4852127..80d57d8 100644 (file)
--- a/util_cksum.c
+++ b/util_cksum.c
@@ -75,7 +75,8 @@ gssEapChecksum(krb5_context context,
     if (verify)
         *valid = FALSE;
 
-    code = krb5_c_crypto_length(context, KRB_KEYTYPE(key), KRB5_CRYPTO_TYPE_CHECKSUM, &k5_checksumlen);
+    code = krb5_c_crypto_length(context, KRB_KEY_TYPE(key),
+                                KRB5_CRYPTO_TYPE_CHECKSUM, &k5_checksumlen);
     if (code != 0)
         return code;
 
@@ -102,7 +103,7 @@ gssEapChecksum(krb5_context context,
 
     /* Data */
     for (j = 0; j < iov_count; j++) {
-        kiov[i].flags = gssEapTranslateCryptoFlag(iov[j].type);
+        kiov[i].flags = gssEapMapCryptoFlag(iov[j].type);
         kiov[i].data.length = iov[j].buffer.length;
         kiov[i].data.data = (char *)iov[j].buffer.value;
         i++;
@@ -168,3 +169,48 @@ gssEapVerify(krb5_context context,
     return gssEapChecksum(context, type, rrc, key,
                           sign_usage, iov, iov_count, 1, valid);
 }
+
+#if 0
+OM_uint32
+gssEapEncodeGssChannelBindings(OM_uint32 *minor,
+                               gss_channel_bindings_t chanBindings,
+                               gss_buffer_t encodedBindings)
+{
+    OM_uint32 major, tmpMinor;
+    size_t length;
+    unsigned char *p;
+
+    if (chanBindings != GSS_C_NO_CHANNEL_BINDINGS) {
+        length = 24;
+        length += chanBindings->initiator_address.length;
+        length += chanBindings->acceptor_address.length;
+        length += chanBindings->application_data.length;
+
+        encodedBindings->value = GSSEAP_MALLOC(length);
+        if (encodedBindings->value == NULL) {
+            *minor = ENOMEM;
+            return GSS_S_FAILURE;
+        }
+
+        encodedBindings->length = length;
+        p = (unsigned char *)encodedBindings->value;
+
+        store_uint32_be(chanBindings->initiator_addrtype, p);
+        store_buffer(&chanBindings->initiator_address, p + 4, 0);
+        p += 4 + chanBindings->initiator_address.length;
+
+        store_uint32_be(chanBindings->acceptor_addrtype, p);
+        store_buffer(&chanBindings->acceptor_address, p + 4, 0);
+        p += 4 + chanBindings->acceptor_address.length;
+
+        store_buffer(&chanBindings->application_data, p, 1);
+        p += chanBindings->application_data.length;
+    } else {
+        encodedBindings->length = 0;
+        encodedBindings->value = NULL;
+    }
+
+    *minor = 0;
+    return GSS_S_COMPLETE;
+}
+#endif