Merge branch 'master' of ssh://moonshot.suchdamage.org:822/srv/git/moonshot

[mech_eap.git] / unwrap_iov.c

diff --git a/unwrap_iov.c b/unwrap_iov.c
index a5a2c2f..6c4dde1 100644 (file)
--- a/unwrap_iov.c
+++ b/unwrap_iov.c
@@ -53,6 +53,10 @@
  * or implied warranty.
  */
 
+/*
+ * Message protection services: unwrap with scatter-gather API.
+ */
+
 #include "gssapiP_eap.h"
 
 /*
@@ -94,8 +98,10 @@ unwrapToken(OM_uint32 *minor,
     assert(header != NULL);
 
     padding = gssEapLocateIov(iov, iov_count, GSS_IOV_BUFFER_TYPE_PADDING);
-    if (padding != NULL && padding->buffer.length != 0)
+    if (padding != NULL && padding->buffer.length != 0) {
+        *minor = GSSEAP_BAD_PADDING_IOV;
         return GSS_S_DEFECTIVE_TOKEN;
+    }
 
     trailer = gssEapLocateIov(iov, iov_count, GSS_IOV_BUFFER_TYPE_TRAILER);
 
@@ -115,11 +121,15 @@ unwrapToken(OM_uint32 *minor,
 
     ptr = (unsigned char *)header->buffer.value;
 
-    if (header->buffer.length < 16)
+    if (header->buffer.length < 16) {
+        *minor = GSSEAP_TOK_TRUNC;
         return GSS_S_DEFECTIVE_TOKEN;
+    }
 
-    if ((ptr[2] & flags) != flags)
+    if ((ptr[2] & flags) != flags) {
+        *minor = GSSEAP_BAD_DIRECTION;
         return GSS_S_BAD_SIG;
+    }
 
     if (toktype == TOK_TYPE_WRAP) {
         unsigned int krbTrailerLen;
@@ -184,7 +194,7 @@ unwrapToken(OM_uint32 *minor,
                 || althdr[2] != ptr[2]
                 || althdr[3] != ptr[3]
                 || memcmp(althdr + 8, ptr + 8, 8) != 0) {
-                *minor = 0;
+                *minor = GSSEAP_BAD_WRAP_TOKEN;
                 return GSS_S_BAD_SIG;
             }
         } else {
@@ -239,7 +249,7 @@ unwrapToken(OM_uint32 *minor,
     return code;
 
 defective:
-    *minor = 0;
+    *minor = GSSEAP_BAD_WRAP_TOKEN;
 
     return GSS_S_DEFECTIVE_TOKEN;
 }
@@ -405,8 +415,8 @@ unwrapStream(OM_uint32 *minor,
     if (stream->buffer.length < theader->buffer.length +
         tpadding->buffer.length +
         ttrailer->buffer.length) {
-        code = GSSEAP_WRONG_SIZE;
         major = GSS_S_DEFECTIVE_TOKEN;
+        code = GSSEAP_TOK_TRUNC;
         goto cleanup;
     }
 
@@ -462,8 +472,10 @@ gssEapUnwrapOrVerifyMIC(OM_uint32 *minor,
 {
     OM_uint32 major;
 
-    if (ctx->encryptionType == ENCTYPE_NULL)
+    if (ctx->encryptionType == ENCTYPE_NULL) {
+        *minor = GSSEAP_KEY_UNAVAILABLE;
         return GSS_S_UNAVAILABLE;
+    }
 
     if (gssEapLocateIov(iov, iov_count, GSS_IOV_BUFFER_TYPE_STREAM) != NULL) {
         major = unwrapStream(minor, ctx, conf_state, qop_state,
@@ -496,8 +508,8 @@ gss_unwrap_iov(OM_uint32 *minor,
     GSSEAP_MUTEX_LOCK(&ctx->mutex);
 
     if (!CTX_IS_ESTABLISHED(ctx)) {
-        *minor = GSSEAP_CONTEXT_INCOMPLETE;
         major = GSS_S_NO_CONTEXT;
+        *minor = GSSEAP_CONTEXT_INCOMPLETE;
         goto cleanup;
     }