From 88d5d5c4b458761fd77acdb72f09253413ac03e5 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Sat, 31 Mar 2012 21:37:56 -0400 Subject: auth-krb: Nove oid packet check to gensec_util. This is clearly a utiliy function generic to gensec. Also the 3 callers had identical implementations. Provide a generic implementation for all of them and avoid duplicating the code everywhere. Signed-off-by: Andreas Schneider --- source3/librpc/crypto/gse.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'source3/librpc/crypto') diff --git a/source3/librpc/crypto/gse.c b/source3/librpc/crypto/gse.c index e2a84c19b5..b14829b6cc 100644 --- a/source3/librpc/crypto/gse.c +++ b/source3/librpc/crypto/gse.c @@ -802,26 +802,6 @@ static NTSTATUS gensec_gse_server_start(struct gensec_security *gensec_security) return NT_STATUS_OK; } -/** - * Check if the packet is one for this mechansim - * - * @param gensec_security GENSEC state - * @param in The request, as a DATA_BLOB - * @return Error, INVALID_PARAMETER if it's not a packet for us - * or NT_STATUS_OK if the packet is ok. - */ - -static NTSTATUS gensec_gse_magic(struct gensec_security *gensec_security, - const DATA_BLOB *in) -{ - if (gensec_gssapi_check_oid(in, GENSEC_OID_KERBEROS5)) { - return NT_STATUS_OK; - } else { - return NT_STATUS_INVALID_PARAMETER; - } -} - - /** * Next state function for the GSE GENSEC mechanism * @@ -1163,7 +1143,7 @@ const struct gensec_security_ops gensec_gse_krb5_security_ops = { .oid = gensec_gse_krb5_oids, .client_start = gensec_gse_client_start, .server_start = gensec_gse_server_start, - .magic = gensec_gse_magic, + .magic = gensec_magic_check_krb5_oid, .update = gensec_gse_update, .session_key = gensec_gse_session_key, .session_info = gensec_gse_session_info, -- cgit