cleanup

diff --git a/mech_eap/accept_sec_context.c b/mech_eap/accept_sec_context.c
index cefb5a9..ecd5e1c 100644 (file)
--- a/mech_eap/accept_sec_context.c
+++ b/mech_eap/accept_sec_context.c
@@ -433,13 +433,11 @@ gss_accept_sec_context(OM_uint32 *minor,
     OM_uint32 tmpMajor, tmpMinor;
     gss_ctx_id_t ctx = *context_handle;
     struct gss_eap_acceptor_sm *sm = NULL;
-    gss_buffer_desc innerInputToken, innerOutputToken;
+    gss_buffer_desc innerInputToken = GSS_C_EMPTY_BUFFER;
+    gss_buffer_desc innerOutputToken = GSS_C_EMPTY_BUFFER;
 
     *minor = 0;
 
-    innerOutputToken.length = 0;
-    innerOutputToken.value = NULL;
-
     output_token->length = 0;
     output_token->value = NULL;
 

diff --git a/mech_eap/export_sec_context.c b/mech_eap/export_sec_context.c
index ca35a4f..b98bba9 100644 (file)
--- a/mech_eap/export_sec_context.c
+++ b/mech_eap/export_sec_context.c
@@ -53,19 +53,12 @@ gssEapExportSecContext(OM_uint32 *minor,
 {
     OM_uint32 major, tmpMinor;
     size_t length;
-    gss_buffer_desc initiatorName, acceptorName;
-    gss_buffer_desc partialCtx, key;
+    gss_buffer_desc initiatorName = GSS_C_EMPTY_BUFFER;
+    gss_buffer_desc acceptorName = GSS_C_EMPTY_BUFFER;
+    gss_buffer_desc partialCtx = GSS_C_EMPTY_BUFFER;
+    gss_buffer_desc key;
     unsigned char *p;
 
-    initiatorName.length = 0;
-    initiatorName.value = NULL;
-
-    acceptorName.length = 0;
-    acceptorName.value = NULL;
-
-    partialCtx.length = 0;
-    partialCtx.value = NULL;
-
     if ((CTX_IS_INITIATOR(ctx) && !CTX_IS_ESTABLISHED(ctx)) ||
         ctx->mechanismUsed == GSS_C_NO_OID)
         return GSS_S_NO_CONTEXT;

diff --git a/mech_eap/init_sec_context.c b/mech_eap/init_sec_context.c
index 252c468..e42f822 100644 (file)
--- a/mech_eap/init_sec_context.c
+++ b/mech_eap/init_sec_context.c
@@ -294,10 +294,7 @@ eapGssSmInitAuthenticate(OM_uint32 *minor,
     OM_uint32 tmpMajor, tmpMinor;
     time_t now;
     int initialContextToken = 0, code;
-    gss_buffer_desc respBuf;
-
-    respBuf.length = 0;
-    respBuf.value = NULL;
+    gss_buffer_desc respBuf = GSS_C_EMPTY_BUFFER;
 
     initialContextToken = (inputToken == GSS_C_NO_BUFFER ||
                            inputToken->length == 0);
@@ -545,13 +542,11 @@ gss_init_sec_context(OM_uint32 *minor,
     OM_uint32 tmpMajor, tmpMinor;
     gss_ctx_id_t ctx = *context_handle;
     struct gss_eap_initiator_sm *sm = NULL;
-    gss_buffer_desc innerInputToken, innerOutputToken;
+    gss_buffer_desc innerInputToken;
+    gss_buffer_desc innerOutputToken = GSS_C_EMPTY_BUFFER;
 
     *minor = 0;
 
-    innerOutputToken.length = 0;
-    innerOutputToken.value = NULL;
-
     output_token->length = 0;
     output_token->value = NULL;