svn rev #24885: trunk/src/lib/gssapi/mechglue/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24885
Commit By: ghudson
Log Message:
ticket: 6890

Handle null OID values in gss_oid_equal().



Changed Files:
U   trunk/src/lib/gssapi/mechglue/g_oid_ops.c
Modified: trunk/src/lib/gssapi/mechglue/g_oid_ops.c
===================================================================
--- trunk/src/lib/gssapi/mechglue/g_oid_ops.c	2011-04-16 17:30:38 UTC (rev 24884)
+++ trunk/src/lib/gssapi/mechglue/g_oid_ops.c	2011-04-16 18:10:23 UTC (rev 24885)
@@ -108,5 +108,8 @@
     gss_const_OID first_oid,
     gss_const_OID second_oid)
 {
+    /* GSS_C_NO_OID doesn't match itself, per draft-josefsson-gss-capsulate. */
+    if (first_oid == GSS_C_NO_OID || second_oid == GSS_C_NO_OID)
+	return 0;
     return g_OID_equal(first_oid, second_oid);
 }