sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

auth-krb: Make functions static.

Browse Source 
The remaining gssapi_parse functions were used exclusively in
gensec_krb5.  Move them there and make them static.

Signed-off-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Simo Sorce 2012-03-31 21:48:06 -04:00 committed by Andreas Schneider
parent d857e393ac
commit 3fd6deda7d
6 changed files with 73 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
auth/kerberos/gssapi_pac.c
View File

@ -22,7 +22,6 @@
#ifdef HAVE_KRB5
#include "libcli/auth/krb5_wrap.h"
#include "lib/util/asn1.h"
#if 0
/* FIXME - need proper configure/waf test

97
auth/kerberos/gssapi_parse.c
View File

@ -1,97 +0,0 @@
/*
Unix SMB/CIFS implementation.
simple GSSAPI wrappers
Copyright (C) Andrew Tridgell 2001
Copyright (C) Jim McDonough <jmcd@us.ibm.com> 2002
Copyright (C) Luke Howard 2003
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
#include "../lib/util/asn1.h"
#include "auth/gensec/gensec.h"
/*
generate a krb5 GSS-API wrapper packet given a ticket
*/
DATA_BLOB gensec_gssapi_gen_krb5_wrap(TALLOC_CTX *mem_ctx, const DATA_BLOB *ticket, const uint8_t tok_id[2])
{
struct asn1_data *data;
DATA_BLOB ret;
data = asn1_init(mem_ctx);
if (!data || !ticket->data) {
return data_blob(NULL,0);
}
asn1_push_tag(data, ASN1_APPLICATION(0));
asn1_write_OID(data, GENSEC_OID_KERBEROS5);
asn1_write(data, tok_id, 2);
asn1_write(data, ticket->data, ticket->length);
asn1_pop_tag(data);
if (data->has_error) {
DEBUG(1,("Failed to build krb5 wrapper at offset %d\n", (int)data->ofs));
asn1_free(data);
return data_blob(NULL,0);
}
ret = data_blob_talloc(mem_ctx, data->data, data->length);
asn1_free(data);
return ret;
}
/*
parse a krb5 GSS-API wrapper packet giving a ticket
*/
bool gensec_gssapi_parse_krb5_wrap(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, DATA_BLOB *ticket, uint8_t tok_id[2])
{
bool ret;
struct asn1_data *data = asn1_init(mem_ctx);
int data_remaining;
if (!data) {
return false;
}
asn1_load(data, *blob);
asn1_start_tag(data, ASN1_APPLICATION(0));
asn1_check_OID(data, GENSEC_OID_KERBEROS5);
data_remaining = asn1_tag_remaining(data);
if (data_remaining < 3) {
data->has_error = true;
} else {
asn1_read(data, tok_id, 2);
data_remaining -= 2;
*ticket = data_blob_talloc(mem_ctx, NULL, data_remaining);
asn1_read(data, ticket->data, ticket->length);
}
asn1_end_tag(data);
ret = !data->has_error;
asn1_free(data);
return ret;
}

4
auth/kerberos/wscript_build
View File

@ -1,3 +1,3 @@
bld.SAMBA_SUBSYSTEM('KRB5_PAC',
source='gssapi_pac.c kerberos_pac.c gssapi_parse.c',
deps='gssapi_krb5 krb5 ndr-krb5pac com_err asn1util')
source='gssapi_pac.c kerberos_pac.c',
deps='gssapi_krb5 krb5 ndr-krb5pac com_err')

4
libcli/auth/krb5_wrap.h
View File

@ -92,7 +92,3 @@ NTSTATUS gssapi_get_session_key(TALLOC_CTX *mem_ctx,
gss_ctx_id_t gssapi_context,
DATA_BLOB *session_key,
uint32_t *keytype);
DATA_BLOB gensec_gssapi_gen_krb5_wrap(TALLOC_CTX *mem_ctx, const DATA_BLOB *ticket, const uint8_t tok_id[2]);
bool gensec_gssapi_parse_krb5_wrap(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, DATA_BLOB *ticket, uint8_t tok_id[2]);

1
source3/Makefile.in
View File

@ -637,7 +637,6 @@ LIBMSRPC_OBJ = $(SCHANNEL_OBJ) \
librpc/crypto/gse_krb5.o \
librpc/crypto/gse.o \
../auth/kerberos/gssapi_pac.o \
../auth/kerberos/gssapi_parse.o \
librpc/rpc/rpc_common.o \
rpc_client/rpc_transport_np.o \
rpc_client/rpc_transport_sock.o \

71
source4/auth/gensec/gensec_krb5.c
View File

@ -39,6 +39,7 @@
#include "param/param.h"
#include "auth/auth_sam_reply.h"
#include "lib/util/util_net.h"
#include "../lib/util/asn1.h"
_PUBLIC_ NTSTATUS gensec_krb5_init(void);
@ -392,6 +393,76 @@ static NTSTATUS gensec_fake_gssapi_krb5_client_start(struct gensec_security *gen
return gensec_krb5_common_client_start(gensec_security, true);
}
/*
generate a krb5 GSS-API wrapper packet given a ticket
*/
static DATA_BLOB gensec_gssapi_gen_krb5_wrap(TALLOC_CTX *mem_ctx, const DATA_BLOB *ticket, const uint8_t tok_id[2])
{
struct asn1_data *data;
DATA_BLOB ret;
data = asn1_init(mem_ctx);
if (!data || !ticket->data) {
return data_blob(NULL,0);
}
asn1_push_tag(data, ASN1_APPLICATION(0));
asn1_write_OID(data, GENSEC_OID_KERBEROS5);
asn1_write(data, tok_id, 2);
asn1_write(data, ticket->data, ticket->length);
asn1_pop_tag(data);
if (data->has_error) {
DEBUG(1,("Failed to build krb5 wrapper at offset %d\n", (int)data->ofs));
asn1_free(data);
return data_blob(NULL,0);
}
ret = data_blob_talloc(mem_ctx, data->data, data->length);
asn1_free(data);
return ret;
}
/*
parse a krb5 GSS-API wrapper packet giving a ticket
*/
static bool gensec_gssapi_parse_krb5_wrap(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, DATA_BLOB *ticket, uint8_t tok_id[2])
{
bool ret;
struct asn1_data *data = asn1_init(mem_ctx);
int data_remaining;
if (!data) {
return false;
}
asn1_load(data, *blob);
asn1_start_tag(data, ASN1_APPLICATION(0));
asn1_check_OID(data, GENSEC_OID_KERBEROS5);
data_remaining = asn1_tag_remaining(data);
if (data_remaining < 3) {
data->has_error = true;
} else {
asn1_read(data, tok_id, 2);
data_remaining -= 2;
*ticket = data_blob_talloc(mem_ctx, NULL, data_remaining);
asn1_read(data, ticket->data, ticket->length);
}
asn1_end_tag(data);
ret = !data->has_error;
asn1_free(data);
return ret;
}
/**
* Next state function for the Krb5 GENSEC mechanism
*