diff options
Diffstat (limited to 'source4/libcli/auth')
| -rw-r--r-- | source4/libcli/auth/gensec_krb5.c | 1 | ||||
| -rw-r--r-- | source4/libcli/auth/gensec_ntlmssp.c | 1 | ||||
| -rw-r--r-- | source4/libcli/auth/gssapi_parse.c | 5 | ||||
| -rw-r--r-- | source4/libcli/auth/kerberos_verify.c | 3 | ||||
| -rw-r--r-- | source4/libcli/auth/spnego.c | 1 | ||||
| -rw-r--r-- | source4/libcli/auth/spnego_parse.c | 13 |
6 files changed, 15 insertions, 9 deletions
diff --git a/source4/libcli/auth/gensec_krb5.c b/source4/libcli/auth/gensec_krb5.c index 0e374e8219..c3dd84135a 100644 --- a/source4/libcli/auth/gensec_krb5.c +++ b/source4/libcli/auth/gensec_krb5.c @@ -28,6 +28,7 @@ #include "libcli/auth/kerberos.h" #include "librpc/gen_ndr/ndr_krb5pac.h" #include "auth/auth.h" +#include "asn_1.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_AUTH diff --git a/source4/libcli/auth/gensec_ntlmssp.c b/source4/libcli/auth/gensec_ntlmssp.c index 4b1d5f3b02..8ab90ebcfb 100644 --- a/source4/libcli/auth/gensec_ntlmssp.c +++ b/source4/libcli/auth/gensec_ntlmssp.c @@ -23,6 +23,7 @@ #include "includes.h" #include "auth/auth.h" +#include "asn_1.h" struct gensec_ntlmssp_state { struct auth_context *auth_context; diff --git a/source4/libcli/auth/gssapi_parse.c b/source4/libcli/auth/gssapi_parse.c index 4a80e1d799..529799955d 100644 --- a/source4/libcli/auth/gssapi_parse.c +++ b/source4/libcli/auth/gssapi_parse.c @@ -23,13 +23,14 @@ */ #include "includes.h" +#include "asn_1.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 tok_id[2]) { - ASN1_DATA data; + struct asn1_data data; DATA_BLOB ret; ZERO_STRUCT(data); @@ -58,7 +59,7 @@ DATA_BLOB gensec_gssapi_gen_krb5_wrap(TALLOC_CTX *mem_ctx, const DATA_BLOB *tick BOOL gensec_gssapi_parse_krb5_wrap(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, DATA_BLOB *ticket, uint8 tok_id[2]) { BOOL ret; - ASN1_DATA data; + struct asn1_data data; int data_remaining; asn1_load(&data, *blob); diff --git a/source4/libcli/auth/kerberos_verify.c b/source4/libcli/auth/kerberos_verify.c index 8e598e2a66..6d87cf8d8b 100644 --- a/source4/libcli/auth/kerberos_verify.c +++ b/source4/libcli/auth/kerberos_verify.c @@ -25,6 +25,7 @@ #include "includes.h" #include "system/kerberos.h" #include "libcli/auth/kerberos.h" +#include "asn_1.h" #ifdef HAVE_KRB5 @@ -32,7 +33,7 @@ static DATA_BLOB unwrap_pac(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data) { DATA_BLOB out; DATA_BLOB pac_contents = data_blob(NULL, 0); - ASN1_DATA data; + struct asn1_data data; int data_type; if (!auth_data->length) { return data_blob(NULL, 0); diff --git a/source4/libcli/auth/spnego.c b/source4/libcli/auth/spnego.c index ef9763cad7..ab3aff32bb 100644 --- a/source4/libcli/auth/spnego.c +++ b/source4/libcli/auth/spnego.c @@ -24,6 +24,7 @@ #include "includes.h" #include "auth/auth.h" +#include "asn_1.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_AUTH diff --git a/source4/libcli/auth/spnego_parse.c b/source4/libcli/auth/spnego_parse.c index d6eacc4a6a..f9385ed96e 100644 --- a/source4/libcli/auth/spnego_parse.c +++ b/source4/libcli/auth/spnego_parse.c @@ -23,11 +23,12 @@ #include "includes.h" #include "auth/auth.h" +#include "asn_1.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_AUTH -static BOOL read_negTokenInit(ASN1_DATA *asn1, struct spnego_negTokenInit *token) +static BOOL read_negTokenInit(struct asn1_data *asn1, struct spnego_negTokenInit *token) { ZERO_STRUCTP(token); @@ -117,7 +118,7 @@ static BOOL read_negTokenInit(ASN1_DATA *asn1, struct spnego_negTokenInit *token return !asn1->has_error; } -static BOOL write_negTokenInit(ASN1_DATA *asn1, struct spnego_negTokenInit *token) +static BOOL write_negTokenInit(struct asn1_data *asn1, struct spnego_negTokenInit *token) { asn1_push_tag(asn1, ASN1_CONTEXT(0)); asn1_push_tag(asn1, ASN1_SEQUENCE(0)); @@ -180,7 +181,7 @@ static BOOL write_negTokenInit(ASN1_DATA *asn1, struct spnego_negTokenInit *toke return !asn1->has_error; } -static BOOL read_negTokenTarg(ASN1_DATA *asn1, struct spnego_negTokenTarg *token) +static BOOL read_negTokenTarg(struct asn1_data *asn1, struct spnego_negTokenTarg *token) { ZERO_STRUCTP(token); @@ -229,7 +230,7 @@ static BOOL read_negTokenTarg(ASN1_DATA *asn1, struct spnego_negTokenTarg *token return !asn1->has_error; } -static BOOL write_negTokenTarg(ASN1_DATA *asn1, struct spnego_negTokenTarg *token) +static BOOL write_negTokenTarg(struct asn1_data *asn1, struct spnego_negTokenTarg *token) { asn1_push_tag(asn1, ASN1_CONTEXT(1)); asn1_push_tag(asn1, ASN1_SEQUENCE(0)); @@ -268,7 +269,7 @@ static BOOL write_negTokenTarg(ASN1_DATA *asn1, struct spnego_negTokenTarg *toke ssize_t spnego_read_data(DATA_BLOB data, struct spnego_data *token) { - ASN1_DATA asn1; + struct asn1_data asn1; ssize_t ret = -1; uint8_t context; @@ -312,7 +313,7 @@ ssize_t spnego_read_data(DATA_BLOB data, struct spnego_data *token) ssize_t spnego_write_data(TALLOC_CTX *mem_ctx, DATA_BLOB *blob, struct spnego_data *spnego) { - ASN1_DATA asn1; + struct asn1_data asn1; ssize_t ret = -1; ZERO_STRUCT(asn1); |