summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2011-04-16 18:10:23 +0000
committerGreg Hudson <ghudson@mit.edu>2011-04-16 18:10:23 +0000
commitc532a052aa946d3349fac8b7998fea2d1ea91f98 (patch)
treecff04965cd7554a5f19e3e4d685546cf8e823e02 /src
parent973b9a998b8d3259ce53c12368da976bf0db532a (diff)
downloadkrb5-c532a052aa946d3349fac8b7998fea2d1ea91f98.tar.gz
krb5-c532a052aa946d3349fac8b7998fea2d1ea91f98.tar.xz
krb5-c532a052aa946d3349fac8b7998fea2d1ea91f98.zip
Handle null OID values in gss_oid_equal()
ticket: 6890 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24885 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
-rw-r--r--src/lib/gssapi/mechglue/g_oid_ops.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/gssapi/mechglue/g_oid_ops.c b/src/lib/gssapi/mechglue/g_oid_ops.c
index d750368ea..e0be538cc 100644
--- a/src/lib/gssapi/mechglue/g_oid_ops.c
+++ b/src/lib/gssapi/mechglue/g_oid_ops.c
@@ -108,5 +108,8 @@ gss_oid_equal(
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);
}