From bfd72f9ed558003d5810cae9bc3c216543391e7c Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Wed, 16 Dec 2015 23:26:20 +1100 Subject: [PATCH] gssapi: correct OID for GSS_C_PEER_HAS_UPDATED_SPNEGO restore correct OID for GSS_C_PEER_HAS_UPDATED_SPNEGO, this should have no ABI implications, it's for internal use only. The current OID was incorrectly copied in commit dbeeb18a, it should belong to 1.3.6.1.4.1.5322.19 which is ... enterprise(1) padl(5322) gssKrb5Extensions(19). The OID we were camping on belongs to another party. --- lib/gssapi/mech/gss_oid.c | 4 ++-- lib/gssapi/oid.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/gssapi/mech/gss_oid.c b/lib/gssapi/mech/gss_oid.c index 8bd05a866..fe9686d53 100644 --- a/lib/gssapi/mech/gss_oid.c +++ b/lib/gssapi/mech/gss_oid.c @@ -139,8 +139,8 @@ gss_OID_desc GSSAPI_LIB_VARIABLE __gss_ntlm_mechanism_oid_desc = { 10, rk_UNCONS /* GSS_SPNEGO_MECHANISM - 1.3.6.1.5.5.2 */ gss_OID_desc GSSAPI_LIB_VARIABLE __gss_spnego_mechanism_oid_desc = { 6, rk_UNCONST("\x2b\x06\x01\x05\x05\x02") }; -/* GSS_C_PEER_HAS_UPDATED_SPNEGO - 1.3.6.1.4.1.9513.19.5 */ -gss_OID_desc GSSAPI_LIB_VARIABLE __gss_c_peer_has_updated_spnego_oid_desc = { 9, rk_UNCONST("\x2b\x06\x01\x04\x01\xca\x29\x13\x05") }; +/* GSS_C_PEER_HAS_UPDATED_SPNEGO - 1.3.6.1.4.1.5322.19.5 */ +gss_OID_desc GSSAPI_LIB_VARIABLE __gss_c_peer_has_updated_spnego_oid_desc = { 9, rk_UNCONST("\x2b\x06\x01\x04\x01\xa9\x4a\x13\x05") }; /* GSS_C_MA_MECH_CONCRETE - 1.3.6.1.5.5.13.1 */ gss_OID_desc GSSAPI_LIB_VARIABLE __gss_c_ma_mech_concrete_oid_desc = { 7, rk_UNCONST("\x2b\x06\x01\x05\x05\x0d\x01") }; diff --git a/lib/gssapi/oid.txt b/lib/gssapi/oid.txt index 9dd0addda..cd6c2fa04 100644 --- a/lib/gssapi/oid.txt +++ b/lib/gssapi/oid.txt @@ -67,7 +67,7 @@ oid base GSS_SPNEGO_MECHANISM 1.3.6.1.5.5.2 # /* From Luke Howard */ -oid base GSS_C_PEER_HAS_UPDATED_SPNEGO 1.3.6.1.4.1.9513.19.5 +oid base GSS_C_PEER_HAS_UPDATED_SPNEGO 1.3.6.1.4.1.5322.19.5 #/* # * OID mappings with name and short description and and slightly longer description