Enable libeap debugging iff GSSEAP_DEBUG defined

[mech_eap.orig] / util_crypt.c

diff --git a/util_crypt.c b/util_crypt.c
index 48f5a5e..62e880e 100644 (file)
--- a/util_crypt.c
+++ b/util_crypt.c
@@ -77,6 +77,10 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+/*
+ * Message protection services: cryptography helpers.
+ */
+
 #include "gssapiP_eap.h"
 
 /*
@@ -85,10 +89,10 @@
  * RRC is rotate count.
  */
 static krb5_error_code
-translateIov(krb5_context context, int dce_style, size_t ec, size_t rrc,
-             krb5_enctype enctype, gss_iov_buffer_desc *iov,
-             int iov_count, krb5_crypto_iov **pkiov,
-             size_t *pkiov_count)
+mapIov(krb5_context context, int dce_style, size_t ec, size_t rrc,
+       krb5_enctype enctype, gss_iov_buffer_desc *iov,
+       int iov_count, krb5_crypto_iov **pkiov,
+       size_t *pkiov_count)
 {
     gss_iov_buffer_t header;
     gss_iov_buffer_t trailer;
@@ -156,7 +160,7 @@ translateIov(krb5_context context, int dce_style, size_t ec, size_t rrc,
     i++;
 
     for (j = 0; j < iov_count; j++) {
-        kiov[i].flags = gssEapTranslateCryptoFlag(iov[j].type);
+        kiov[i].flags = gssEapMapCryptoFlag(iov[j].type);
         if (kiov[i].flags == KRB5_CRYPTO_TYPE_EMPTY)
             continue;
 
@@ -205,7 +209,7 @@ gssEapEncrypt(krb5_context context, int dce_style, size_t ec,
     krb5_crypto_iov *kiov;
 
     if (iv) {
-        code = krb5_c_block_size(context, KRB_KEYTYPE(key), &blocksize);
+        code = krb5_c_block_size(context, KRB_KEY_TYPE(key), &blocksize);
         if (code)
             return(code);
 
@@ -219,9 +223,9 @@ gssEapEncrypt(krb5_context context, int dce_style, size_t ec,
         pivd = NULL;
     }
 
-    code = translateIov(context, dce_style, ec, rrc,
-                        KRB_KEYTYPE(key), iov, iov_count,
-                        &kiov, &kiov_count);
+    code = mapIov(context, dce_style, ec, rrc,
+                  KRB_KEY_TYPE(key), iov, iov_count,
+                  &kiov, &kiov_count);
     if (code == 0) {
         code = krb5_c_encrypt_iov(context, key, usage, pivd, kiov, kiov_count);
         GSSEAP_FREE(kiov);
@@ -245,7 +249,7 @@ gssEapDecrypt(krb5_context context, int dce_style, size_t ec,
     krb5_crypto_iov *kiov;
 
     if (iv) {
-        code = krb5_c_block_size(context, KRB_KEYTYPE(key), &blocksize);
+        code = krb5_c_block_size(context, KRB_KEY_TYPE(key), &blocksize);
         if (code)
             return(code);
 
@@ -259,9 +263,9 @@ gssEapDecrypt(krb5_context context, int dce_style, size_t ec,
         pivd = NULL;
     }
 
-    code = translateIov(context, dce_style, ec, rrc,
-                        KRB_KEYTYPE(key), iov, iov_count,
-                        &kiov, &kiov_count);
+    code = mapIov(context, dce_style, ec, rrc,
+                  KRB_KEY_TYPE(key), iov, iov_count,
+                  &kiov, &kiov_count);
     if (code == 0) {
         code = krb5_c_decrypt_iov(context, key, usage, pivd, kiov, kiov_count);
         GSSEAP_FREE(kiov);
@@ -274,7 +278,7 @@ gssEapDecrypt(krb5_context context, int dce_style, size_t ec,
 }
 
 krb5_cryptotype
-gssEapTranslateCryptoFlag(OM_uint32 type)
+gssEapMapCryptoFlag(OM_uint32 type)
 {
     krb5_cryptotype ktype;
 
@@ -316,7 +320,7 @@ gssEapLocateIov(gss_iov_buffer_desc *iov, int iov_count, OM_uint32 type)
 }
 
 void
-gssEapIovMessageLnegth(gss_iov_buffer_desc *iov,
+gssEapIovMessageLength(gss_iov_buffer_desc *iov,
                        int iov_count,
                        size_t *data_length_p,
                        size_t *assoc_data_length_p)