fix uninitialised return code in encodeExtensions

[mech_eap.orig] / util_crypt.c

diff --git a/util_crypt.c b/util_crypt.c
index f35939b..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"
 
 /*
@@ -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);
 
@@ -220,7 +224,7 @@ gssEapEncrypt(krb5_context context, int dce_style, size_t ec,
     }
 
     code = mapIov(context, dce_style, ec, rrc,
-                  KRB_KEYTYPE(key), iov, iov_count,
+                  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);
@@ -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);
 
@@ -260,7 +264,7 @@ gssEapDecrypt(krb5_context context, int dce_style, size_t ec,
     }
 
     code = mapIov(context, dce_style, ec, rrc,
-                  KRB_KEYTYPE(key), iov, iov_count,
+                  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);