add some function headers

diff --git a/accept_sec_context.c b/accept_sec_context.c
index 6aef48e..2b2d995 100644 (file)
--- a/accept_sec_context.c
+++ b/accept_sec_context.c
@@ -30,6 +30,11 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Establish a security context on the acceptor (server). These functions
+ * wrap around libradsec and (thus) talk to a RADIUS server or proxy.
+ */
+
 #include "gssapiP_eap.h"
 
 #ifdef GSSEAP_ENABLE_REAUTH

diff --git a/acquire_cred.c b/acquire_cred.c
index c85966e..ab5cb97 100644 (file)
--- a/acquire_cred.c
+++ b/acquire_cred.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Wrapper for acquiring a credential handle.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/acquire_cred_with_password.c b/acquire_cred_with_password.c
index f86d3ba..8d2e3c8 100644 (file)
--- a/acquire_cred_with_password.c
+++ b/acquire_cred_with_password.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Wrapper for acquiring a credential handle using a password.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/add_cred.c b/add_cred.c
index de50884..c831f4a 100644 (file)
--- a/add_cred.c
+++ b/add_cred.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Wrapper for acquiring a credential handle.
+ */
+
 #include "gssapiP_eap.h"
 
 /*

diff --git a/add_cred_with_password.c b/add_cred_with_password.c
index beaed83..ca2dd6e 100644 (file)
--- a/add_cred_with_password.c
+++ b/add_cred_with_password.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Wrapper for acquiring a credential handle using a password.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/canonicalize_name.c b/canonicalize_name.c
index 4862796..acfbbc3 100644 (file)
--- a/canonicalize_name.c
+++ b/canonicalize_name.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Function for canonicalizing a name; presently just duplicates it.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/compare_name.c b/compare_name.c
index 44fd57e..47c573e 100644 (file)
--- a/compare_name.c
+++ b/compare_name.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Compare two names.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/context_time.c b/context_time.c
index 707d29d..4b08d2e 100644 (file)
--- a/context_time.c
+++ b/context_time.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Determine remaining lifetime of a context handle.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/delete_name_attribute.c b/delete_name_attribute.c
index 868b1d5..61f7b43 100644 (file)
--- a/delete_name_attribute.c
+++ b/delete_name_attribute.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Wrapper for removing a name attribute.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/delete_sec_context.c b/delete_sec_context.c
index cb3e0eb..4f11148 100644 (file)
--- a/delete_sec_context.c
+++ b/delete_sec_context.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Release a context handle.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/display_name.c b/display_name.c
index 861cdee..21f48c6 100644 (file)
--- a/display_name.c
+++ b/display_name.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Wrapper for "displaying" (returning string representation of) a name.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/display_name_ext.c b/display_name_ext.c
index ea4b85a..ffc5ad8 100644 (file)
--- a/display_name_ext.c
+++ b/display_name_ext.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Parameterized version of gss_display_name(), currently unimplemented.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/display_status.c b/display_status.c
index bd19849..5033620 100644 (file)
--- a/display_status.c
+++ b/display_status.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Function for converting mechanism error codes to strings.
+ */
+
 #include "gssapiP_eap.h"
 
 static GSSEAP_THREAD_ONCE gssEapStatusInfoKeyOnce = GSSEAP_ONCE_INITIALIZER;

diff --git a/duplicate_name.c b/duplicate_name.c
index 6fd9e36..deb6420 100644 (file)
--- a/duplicate_name.c
+++ b/duplicate_name.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Duplicate a name.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/eap_mech.c b/eap_mech.c
index 4199fcd..c9b03b6 100644 (file)
--- a/eap_mech.c
+++ b/eap_mech.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Initialisation and finalise functions.
+ */
+
 #include "gssapiP_eap.h"
 
 static OM_uint32

diff --git a/export_name.c b/export_name.c
index 4e92e7e..901f7ed 100644 (file)
--- a/export_name.c
+++ b/export_name.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Serialise a name.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/export_name_composite.c b/export_name_composite.c
index dffff14..35c9bee 100644 (file)
--- a/export_name_composite.c
+++ b/export_name_composite.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Serialise a name and its attributes.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/export_sec_context.c b/export_sec_context.c
index 1f4e6fe..e476c34 100644 (file)
--- a/export_sec_context.c
+++ b/export_sec_context.c
@@ -30,11 +30,13 @@
  * SUCH DAMAGE.
  */
 
-#include "gssapiP_eap.h"
-
 /*
- * Export a partially established acceptor context.
+ * Serialise a security context. On the acceptor, this may be partially
+ * established.
  */
+
+#include "gssapiP_eap.h"
+
 static OM_uint32
 gssEapExportPartialContext(OM_uint32 *minor,
                            gss_ctx_id_t ctx,

diff --git a/get_mic.c b/get_mic.c
index 45c96ec..172e21a 100644 (file)
--- a/get_mic.c
+++ b/get_mic.c
@@ -30,12 +30,16 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Message protection services: make a message integerity check.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32
 gss_get_mic(OM_uint32 *minor,
             gss_ctx_id_t ctx,
-            gss_qop_t qop_req __attribute__((__unused__)),
+            gss_qop_t qop_req,
             gss_buffer_t message_buffer,
             gss_buffer_t message_token)
 {
@@ -47,6 +51,11 @@ gss_get_mic(OM_uint32 *minor,
         return GSS_S_NO_CONTEXT;
     }
 
+    if (qop_req != GSS_C_QOP_DEFAULT) {
+        *minor = GSSEAP_UNKNOWN_QOP;
+        return GSS_S_UNAVAILABLE;
+    }
+
     *minor = 0;
 
     message_token->value = NULL;

diff --git a/get_name_attribute.c b/get_name_attribute.c
index 4ac5a1b..dfaa0d5 100644 (file)
--- a/get_name_attribute.c
+++ b/get_name_attribute.c
@@ -32,6 +32,10 @@
 
 #include "gssapiP_eap.h"
 
+/*
+ * Wrapper for retrieving a naming attribute.
+ */
+
 OM_uint32
 gss_get_name_attribute(OM_uint32 *minor,
                        gss_name_t name,

diff --git a/import_name.c b/import_name.c
index bceefcd..d616fc0 100644 (file)
--- a/import_name.c
+++ b/import_name.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Deserialise a name.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/import_sec_context.c b/import_sec_context.c
index 084ca87..ea1072e 100644 (file)
--- a/import_sec_context.c
+++ b/import_sec_context.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Deserialise a context handle.
+ */
+
 #include "gssapiP_eap.h"
 
 #define UPDATE_REMAIN(n)    do {                \

diff --git a/indicate_mechs.c b/indicate_mechs.c
index 7f98a80..ecda509 100644 (file)
--- a/indicate_mechs.c
+++ b/indicate_mechs.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Enumerate the supported mechanism OIDs.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/init_sec_context.c b/init_sec_context.c
index a0cb7d9..d90f9e6 100644 (file)
--- a/init_sec_context.c
+++ b/init_sec_context.c
@@ -30,6 +30,11 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Establish a security context on the initiator (client). These functions
+ * wrap around libeap.
+ */
+
 #include "gssapiP_eap.h"
 
 #ifdef GSSEAP_ENABLE_REAUTH

diff --git a/inquire_attrs_for_mech.c b/inquire_attrs_for_mech.c
index 1d17a9d..dec08c8 100644 (file)
--- a/inquire_attrs_for_mech.c
+++ b/inquire_attrs_for_mech.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Enumerate the features supported by the GSS EAP mechanism.
+ */
+
 #include "gssapiP_eap.h"
 
 #define MA_ADD(ma, set)    do { \

diff --git a/inquire_context.c b/inquire_context.c
index 369ed0d..510826b 100644 (file)
--- a/inquire_context.c
+++ b/inquire_context.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Return context handle properties.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/inquire_cred.c b/inquire_cred.c
index 3f185c7..01c3b4a 100644 (file)
--- a/inquire_cred.c
+++ b/inquire_cred.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Return credential handle properties.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/inquire_cred_by_oid.c b/inquire_cred_by_oid.c
index 8212a1d..226f83f 100644 (file)
--- a/inquire_cred_by_oid.c
+++ b/inquire_cred_by_oid.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Return extended credential handle properties.
+ */
+
 #include "gssapiP_eap.h"
 
 static struct {

diff --git a/inquire_mech_for_saslname.c b/inquire_mech_for_saslname.c
index 9b7c5d9..536f3c7 100644 (file)
--- a/inquire_mech_for_saslname.c
+++ b/inquire_mech_for_saslname.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Map mechanism OID to a SASL mechanism name.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/inquire_mechs_for_name.c b/inquire_mechs_for_name.c
index 045d0d8..14def4e 100644 (file)
--- a/inquire_mechs_for_name.c
+++ b/inquire_mechs_for_name.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Determine mechanism OIDs supported by name.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/inquire_name.c b/inquire_name.c
index 1cd8f73..2cf3229 100644 (file)
--- a/inquire_name.c
+++ b/inquire_name.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Enumerate name attributes.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32 gss_inquire_name(OM_uint32 *minor,

diff --git a/inquire_names_for_mech.c b/inquire_names_for_mech.c
index 4ca60a3..7217e33 100644 (file)
--- a/inquire_names_for_mech.c
+++ b/inquire_names_for_mech.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Return supported name OID types.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/inquire_saslname_for_mech.c b/inquire_saslname_for_mech.c
index 64a33c3..a26dd17 100644 (file)
--- a/inquire_saslname_for_mech.c
+++ b/inquire_saslname_for_mech.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Map SASL mechanism name to a mechanism OID.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/inquire_sec_context_by_oid.c b/inquire_sec_context_by_oid.c
index e6437c1..cf74bea 100644 (file)
--- a/inquire_sec_context_by_oid.c
+++ b/inquire_sec_context_by_oid.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Return extended properties of a context handle.
+ */
+
 #include "gssapiP_eap.h"
 
 static OM_uint32

diff --git a/pseudo_random.c b/pseudo_random.c
index 3440055..3edd28a 100644 (file)
--- a/pseudo_random.c
+++ b/pseudo_random.c
@@ -53,6 +53,10 @@
  * or implied warranty.
  */
 
+/*
+ * PRF
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/release_cred.c b/release_cred.c
index 0dbcda7..3a429a0 100644 (file)
--- a/release_cred.c
+++ b/release_cred.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Release a credential handle.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/release_name.c b/release_name.c
index d85a81d..7491691 100644 (file)
--- a/release_name.c
+++ b/release_name.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Release a name.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/release_oid.c b/release_oid.c
index 8feeccd..947baa2 100644 (file)
--- a/release_oid.c
+++ b/release_oid.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Mark an internalized OID as not required to be released.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/set_cred_option.c b/set_cred_option.c
index 396012a..6f2be5a 100644 (file)
--- a/set_cred_option.c
+++ b/set_cred_option.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Set an extended property on a credential handle.
+ */
+
 #include "gssapiP_eap.h"
 
 static OM_uint32

diff --git a/set_name_attribute.c b/set_name_attribute.c
index 93d1c25..e2f635b 100644 (file)
--- a/set_name_attribute.c
+++ b/set_name_attribute.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Set an attribute on a name.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/set_sec_context_option.c b/set_sec_context_option.c
index 859582d..cfe0384 100644 (file)
--- a/set_sec_context_option.c
+++ b/set_sec_context_option.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Set an extended property on a context handle.
+ */
+
 #include "gssapiP_eap.h"
 
 static struct {

diff --git a/unwrap.c b/unwrap.c
index 911fd2b..f660017 100644 (file)
--- a/unwrap.c
+++ b/unwrap.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Message protection services: unwrap.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/unwrap_iov.c b/unwrap_iov.c
index fca9d64..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"
 
 /*

diff --git a/util.h b/util.h
index 7816393..910b5df 100644 (file)
--- a/util.h
+++ b/util.h
@@ -54,6 +54,10 @@
  *
  */
 
+/*
+ * Utility functions.
+ */
+
 #ifndef _UTIL_H_
 #define _UTIL_H_ 1
 

diff --git a/util_attr.cpp b/util_attr.cpp
index 14865fa..3d7d1f6 100644 (file)
--- a/util_attr.cpp
+++ b/util_attr.cpp
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Attribute provider mechanism.
+ */
+
 #include "gssapiP_eap.h"
 
 #include <typeinfo>

diff --git a/util_attr.h b/util_attr.h
index 0358936..9dd4787 100644 (file)
--- a/util_attr.h
+++ b/util_attr.h
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Attribute provider interface.
+ */
+
 #ifndef _UTIL_ATTR_H_
 #define _UTIL_ATTR_H_ 1
 

diff --git a/util_buffer.c b/util_buffer.c
index df1c0ac..a553882 100644 (file)
--- a/util_buffer.c
+++ b/util_buffer.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Buffer handling helpers.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/util_cksum.c b/util_cksum.c
index 80d57d8..9616e9c 100644 (file)
--- a/util_cksum.c
+++ b/util_cksum.c
@@ -51,6 +51,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+/*
+ * Message protection services: checksum helpers.
+ */
+
 #include "gssapiP_eap.h"
 
 static int

diff --git a/util_context.c b/util_context.c
index 95cfccf..d00965a 100644 (file)
--- a/util_context.c
+++ b/util_context.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Utility routines for context handles.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/util_cred.c b/util_cred.c
index b7b3f57..6878bc2 100644 (file)
--- a/util_cred.c
+++ b/util_cred.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Utility routines for credential handles.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/util_crypt.c b/util_crypt.c
index e8ebd9c..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"
 
 /*

diff --git a/util_exts.c b/util_exts.c
index 5fa8345..5cdbf1b 100644 (file)
--- a/util_exts.c
+++ b/util_exts.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Extension token support.
+ */
+
 #include "gssapiP_eap.h"
 
 static OM_uint32

diff --git a/util_krb.c b/util_krb.c
index a11f1f4..34d6cb6 100644 (file)
--- a/util_krb.c
+++ b/util_krb.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Kerberos 5 helpers.
+ */
+
 #include "gssapiP_eap.h"
 
 static GSSEAP_THREAD_ONCE krbContextKeyOnce = GSSEAP_ONCE_INITIALIZER;

diff --git a/util_lucid.c b/util_lucid.c
index 79c5ebc..469c84d 100644 (file)
--- a/util_lucid.c
+++ b/util_lucid.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * "Lucid" security context export routine (called by MIT Kerberos mechanism).
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/util_mech.c b/util_mech.c
index 62540ae..dd0c664 100644 (file)
--- a/util_mech.c
+++ b/util_mech.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * General mechanism utility routines.
+ */
+
 #include "gssapiP_eap.h"
 
 /*

diff --git a/util_name.c b/util_name.c
index 45cd26d..9bceb3b 100644 (file)
--- a/util_name.c
+++ b/util_name.c
@@ -53,6 +53,10 @@
  * or implied warranty.
  */
 
+/*
+ * Name utility routines.
+ */
+
 #include "gssapiP_eap.h"
 
 static gss_OID_desc gssEapNtPrincipalName = {

diff --git a/util_oid.c b/util_oid.c
index 0f10076..7c63785 100644 (file)
--- a/util_oid.c
+++ b/util_oid.c
@@ -54,6 +54,10 @@
  *
  */
 
+/*
+ * OID utility routines.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/util_ordering.c b/util_ordering.c
index 0ab8c28..9d74697 100644 (file)
--- a/util_ordering.c
+++ b/util_ordering.c
@@ -52,11 +52,7 @@
  */
 
 /*
- * $Id: util_ordering.c 23457 2009-12-08 00:04:48Z tlyu $
- */
-
-/*
- * functions to check sequence numbers for replay and sequencing
+ * Functions to check sequence numbers for replay and sequencing
  */
 
 #include "gssapiP_eap.h"

diff --git a/util_radius.cpp b/util_radius.cpp
index 3d8cb83..770579c 100644 (file)
--- a/util_radius.cpp
+++ b/util_radius.cpp
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * RADIUS attribute provider implementation.
+ */
+
 #include "gssapiP_eap.h"
 
 /* stuff that should be provided by libradsec/libfreeradius-radius */

diff --git a/util_radius.h b/util_radius.h
index 805f57e..d6e4cf5 100644 (file)
--- a/util_radius.h
+++ b/util_radius.h
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * RADIUS attribute provider.
+ */
+
 #ifndef _UTIL_RADIUS_H_
 #define _UTIL_RADIUS_H_ 1
 

diff --git a/util_reauth.c b/util_reauth.c
index 52b9976..141ee77 100644 (file)
--- a/util_reauth.c
+++ b/util_reauth.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Fast reauthentication support.
+ */
+
 #include "gssapiP_eap.h"
 
 #include <dlfcn.h>

diff --git a/util_reauth.h b/util_reauth.h
index 45c45df..96287d2 100644 (file)
--- a/util_reauth.h
+++ b/util_reauth.h
@@ -30,11 +30,16 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Fast reauthentication support.
+ */
+
 #include "gssapiP_eap.h"
 
 #ifndef _UTIL_REAUTH_H_
 #define _UTIL_REAUTH_H_ 1
 
+/* AD element containing serialised AVPs. */
 #define KRB5_AUTHDATA_RADIUS_AVP        513
 
 OM_uint32

diff --git a/util_saml.cpp b/util_saml.cpp
index b4afd21..7e61300 100644 (file)
--- a/util_saml.cpp
+++ b/util_saml.cpp
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * SAML attribute provider implementation.
+ */
+
 #include "gssapiP_eap.h"
 
 #include <sstream>

diff --git a/util_saml.h b/util_saml.h
index 25647db..6be1c08 100644 (file)
--- a/util_saml.h
+++ b/util_saml.h
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * SAML attribute provider.
+ */
+
 #ifndef _UTIL_SAML_H_
 #define _UTIL_SAML_H_ 1
 

diff --git a/util_shib.cpp b/util_shib.cpp
index 0c9744d..13d88f6 100644 (file)
--- a/util_shib.cpp
+++ b/util_shib.cpp
@@ -45,6 +45,10 @@
  * limitations under the License.
  */
 
+/*
+ * Local attribute provider implementation.
+ */
+
 #include <shibsp/exceptions.h>
 #include <shibsp/attribute/SimpleAttribute.h>
 

diff --git a/util_shib.h b/util_shib.h
index 6e53aec..8224547 100644 (file)
--- a/util_shib.h
+++ b/util_shib.h
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Local attribute provider.
+ */
+
 #ifndef _UTIL_SHIB_H_
 #define _UTIL_SHIB_H_ 1
 

diff --git a/util_token.c b/util_token.c
index 6642375..1ce51f9 100644 (file)
--- a/util_token.c
+++ b/util_token.c
@@ -51,6 +51,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+/*
+ * Utility routines for GSS tokens.
+ */
+
 #include "gssapiP_eap.h"
 
 /*

diff --git a/verify_mic.c b/verify_mic.c
index e06816c..5df6b52 100644 (file)
--- a/verify_mic.c
+++ b/verify_mic.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Message protection services: verify a message integrity check.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/wrap.c b/wrap.c
index 3be87d5..2dd9031 100644 (file)
--- a/wrap.c
+++ b/wrap.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Message protection services: wrap.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32

diff --git a/wrap_iov.c b/wrap_iov.c
index 9e6933d..3bf719c 100644 (file)
--- a/wrap_iov.c
+++ b/wrap_iov.c
@@ -53,6 +53,10 @@
  * or implied warranty.
  */
 
+/*
+ * Message protection services: wrap with scatter-gather API.
+ */
+
 #include "gssapiP_eap.h"
 
 unsigned char
@@ -335,6 +339,11 @@ gss_wrap_iov(OM_uint32 *minor,
         return GSS_S_NO_CONTEXT;
     }
 
+    if (qop_req != GSS_C_QOP_DEFAULT) {
+        *minor = GSSEAP_UNKNOWN_QOP;
+        return GSS_S_UNAVAILABLE;
+    }
+
     *minor = 0;
 
     GSSEAP_MUTEX_LOCK(&ctx->mutex);

diff --git a/wrap_iov_length.c b/wrap_iov_length.c
index b9bbfdc..56c2299 100644 (file)
--- a/wrap_iov_length.c
+++ b/wrap_iov_length.c
@@ -53,6 +53,10 @@
  * or implied warranty.
  */
 
+/*
+ * Message protection services: determine protected message size.
+ */
+
 #include "gssapiP_eap.h"
 
 #define INIT_IOV_DATA(_iov)     do { (_iov)->buffer.value = NULL;       \
@@ -77,11 +81,15 @@ gssEapWrapIovLength(OM_uint32 *minor,
     int dce_style;
     size_t ec;
 
-    if (qop_req != GSS_C_QOP_DEFAULT)
-        return GSS_S_FAILURE;
+    if (qop_req != GSS_C_QOP_DEFAULT) {
+        *minor = GSSEAP_UNKNOWN_QOP;
+        return GSS_S_UNAVAILABLE;
+    }
 
-    if (ctx->encryptionType == ENCTYPE_NULL)
+    if (ctx->encryptionType == ENCTYPE_NULL) {
+        *minor = GSSEAP_KEY_UNAVAILABLE;
         return GSS_S_UNAVAILABLE;
+    }
 
     GSSEAP_KRB_INIT(&krbContext);
 

diff --git a/wrap_size_limit.c b/wrap_size_limit.c
index 4e7a0da..82d97cb 100644 (file)
--- a/wrap_size_limit.c
+++ b/wrap_size_limit.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Message protection services: determine maximum input size.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32