From ce675e87b7444437e6a1f8259e0c6188d4fe1c93 Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Tue, 5 Oct 2010 11:29:36 +0200 Subject: [PATCH] s/1.3.6.1.4.1.5322.21/1.3.6.1.4.1.5322.22 --- mech_eap/set_cred_option.c | 8 ++++---- mech_eap/util_mech.c | 14 +++++++------- mech_eap/util_name.c | 4 ++-- mech_eap/util_shib.cpp | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/mech_eap/set_cred_option.c b/mech_eap/set_cred_option.c index a8114ef..1ece0fd 100644 --- a/mech_eap/set_cred_option.c +++ b/mech_eap/set_cred_option.c @@ -88,14 +88,14 @@ static struct { OM_uint32 (*setOption)(OM_uint32 *, gss_cred_id_t cred, const gss_OID, const gss_buffer_t); } setCredOps[] = { - /* 1.3.6.1.4.1.5322.21.3.3.1 */ + /* 1.3.6.1.4.1.5322.22.3.3.1 */ { - { 11, "\x2B\x06\x01\x04\x01\xA9\x4A\x15\x03\x03\x01" }, + { 11, "\x2B\x06\x01\x04\x01\xA9\x4A\x16\x03\x03\x01" }, setCredRadiusConfig, }, - /* 1.3.6.1.4.1.5322.21.3.3.2 */ + /* 1.3.6.1.4.1.5322.22.3.3.2 */ { - { 11, "\x2B\x06\x01\x04\x01\xA9\x4A\x15\x03\x03\x02" }, + { 11, "\x2B\x06\x01\x04\x01\xA9\x4A\x16\x03\x03\x02" }, setCredFlag, }, }; diff --git a/mech_eap/util_mech.c b/mech_eap/util_mech.c index a1f198b..717e09b 100644 --- a/mech_eap/util_mech.c +++ b/mech_eap/util_mech.c @@ -34,7 +34,7 @@ /* * 1.3.6.1.4.1.5322(padl) - * gssEap(21) + * gssEap(22) * mechanisms(1) * eap-aes128-cts-hmac-sha1-96(17) * eap-aes256-cts-hmac-sha1-96(18) @@ -55,12 +55,12 @@ * gss_inquire_name.) */ static gss_OID_desc gssEapMechOids[] = { - /* 1.3.6.1.4.1.5322.21.1 */ - { 9, "\x2B\x06\x01\x04\x01\xA9\x4A\x15\x01" }, - /* 1.3.6.1.4.1.5322.21.1.17 */ - { 10, "\x2B\x06\x01\x04\x01\xA9\x4A\x15\x01\x11" }, - /* 1.3.6.1.4.1.5322.21.1.18 */ - { 10, "\x2B\x06\x01\x04\x01\xA9\x4A\x15\x01\x12" } + /* 1.3.6.1.4.1.5322.22.1 */ + { 9, "\x2B\x06\x01\x04\x01\xA9\x4A\x16\x01" }, + /* 1.3.6.1.4.1.5322.22.1.17 */ + { 10, "\x2B\x06\x01\x04\x01\xA9\x4A\x16\x01\x11" }, + /* 1.3.6.1.4.1.5322.22.1.18 */ + { 10, "\x2B\x06\x01\x04\x01\xA9\x4A\x16\x01\x12" } }; gss_OID GSS_EAP_MECHANISM = &gssEapMechOids[0]; diff --git a/mech_eap/util_name.c b/mech_eap/util_name.c index 8fc348a..1845692 100644 --- a/mech_eap/util_name.c +++ b/mech_eap/util_name.c @@ -56,8 +56,8 @@ #include "gssapiP_eap.h" static gss_OID_desc gssEapNtPrincipalName = { - /* 1.3.6.1.4.1.5322.21.2.1 */ - 10, "\x2B\x06\x01\x04\x01\xA9\x4A\x15\x02\x01" + /* 1.3.6.1.4.1.5322.22.2.1 */ + 10, "\x2B\x06\x01\x04\x01\xA9\x4A\x16\x02\x01" }; gss_OID GSS_EAP_NT_PRINCIPAL_NAME = &gssEapNtPrincipalName; diff --git a/mech_eap/util_shib.cpp b/mech_eap/util_shib.cpp index f7cd1d0..c5790f5 100644 --- a/mech_eap/util_shib.cpp +++ b/mech_eap/util_shib.cpp @@ -157,9 +157,9 @@ gss_eap_shib_attr_provider::initFromGssContext(const gss_eap_attr_ctx *manager, return false; saml = static_cast - (manager->getProvider(ATTR_TYPE_SAML_ASSERTION)); + (m_manager->getProvider(ATTR_TYPE_SAML_ASSERTION)); radius = static_cast - (manager->getProvider(ATTR_TYPE_RADIUS)); + (m_manager->getProvider(ATTR_TYPE_RADIUS)); resolver = ShibbolethResolver::create(); -- 2.1.4