diff options
| author | Andreas Schneider <asn@samba.org> | 2012-05-21 18:25:28 +0200 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2012-05-23 17:51:51 +0300 |
| commit | 2b144531f1a760514f217012e9dab01359b7a0d7 (patch) | |
| tree | 0c9285cd0e52efff36d3bf700cbc9ccd918bcde1 /source3 | |
| parent | 0a6e568344adb66e5f20ce61f106d791886fcb35 (diff) | |
| download | samba-2b144531f1a760514f217012e9dab01359b7a0d7.tar.gz samba-2b144531f1a760514f217012e9dab01359b7a0d7.tar.bz2 samba-2b144531f1a760514f217012e9dab01359b7a0d7.zip | |
gse: Use the smb_gss_oid_equal wrapper.
Signed-off-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/smb_krb5.h | 1 | ||||
| -rw-r--r-- | source3/librpc/crypto/gse.c | 23 |
2 files changed, 4 insertions, 20 deletions
diff --git a/source3/include/smb_krb5.h b/source3/include/smb_krb5.h index 1f66212321..743b67ff49 100644 --- a/source3/include/smb_krb5.h +++ b/source3/include/smb_krb5.h @@ -1 +1,2 @@ #include "lib/krb5_wrap/krb5_samba.h" +#include "lib/krb5_wrap/gss_samba.h" diff --git a/source3/librpc/crypto/gse.c b/source3/librpc/crypto/gse.c index fba942bd64..11a545727b 100644 --- a/source3/librpc/crypto/gse.c +++ b/source3/librpc/crypto/gse.c @@ -57,24 +57,6 @@ struct gse_context { gss_OID ret_mech; }; -#ifndef HAVE_GSS_OID_EQUAL - -static bool gss_oid_equal(const gss_OID o1, const gss_OID o2) -{ - if (o1 == o2) { - return true; - } - if ((o1 == NULL && o2 != NULL) || (o1 != NULL && o2 == NULL)) { - return false; - } - if (o1->length != o2->length) { - return false; - } - return memcmp(o1->elements, o2->elements, o1->length) == false; -} - -#endif - /* free non talloc dependent contexts */ static int gse_context_destructor(void *ptr) { @@ -126,7 +108,8 @@ static int gse_context_destructor(void *ptr) * this code to EAP or other GSS mechanisms determines an * implementation-dependent way of releasing any dynamically * allocated OID */ - SMB_ASSERT(gss_oid_equal(&gse_ctx->gss_mech, GSS_C_NO_OID) || gss_oid_equal(&gse_ctx->gss_mech, gss_mech_krb5)); + SMB_ASSERT(smb_gss_oid_equal(&gse_ctx->gss_mech, GSS_C_NO_OID) || + smb_gss_oid_equal(&gse_ctx->gss_mech, gss_mech_krb5)); return 0; } @@ -994,7 +977,7 @@ static bool gensec_gse_have_feature(struct gensec_security *gensec_security, } if (feature & GENSEC_FEATURE_SESSION_KEY) { /* Only for GSE/Krb5 */ - if (gss_oid_equal(gse_ctx->ret_mech, gss_mech_krb5)) { + if (smb_gss_oid_equal(gse_ctx->ret_mech, gss_mech_krb5)) { return true; } } |