projects
/
cyrus-sasl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5e40cd9
)
cleanup
author
Luke Howard
<lukeh@padl.com>
Mon, 27 Sep 2010 11:14:14 +0000
(13:14 +0200)
committer
Luke Howard
<lukeh@padl.com>
Mon, 27 Sep 2010 11:14:14 +0000
(13:14 +0200)
plugins/gs2.c
patch
|
blob
|
history
diff --git
a/plugins/gs2.c
b/plugins/gs2.c
index
15eeadc
..
98039d8
100644
(file)
--- a/
plugins/gs2.c
+++ b/
plugins/gs2.c
@@
-120,7
+120,7
@@
typedef struct context {
gss_OID mechanism;
int gs2_flags;
char *cbindingname;
gss_OID mechanism;
int gs2_flags;
char *cbindingname;
- struct gss_channel_bindings_struct bindings;
+ struct gss_channel_bindings_struct
gss_c
bindings;
sasl_secret_t *password;
unsigned int free_password;
OM_uint32 lifetime;
sasl_secret_t *password;
unsigned int free_password;
OM_uint32 lifetime;
@@
-250,7
+250,7
@@
sasl_gs2_free_context_contents(context_t *text)
text->mechanism = GSS_C_NO_OID;
}
text->mechanism = GSS_C_NO_OID;
}
- gss_release_buffer(&min_stat, &text->bindings.application_data);
+ gss_release_buffer(&min_stat, &text->
gss_c
bindings.application_data);
if (text->out_buf != NULL) {
text->utils->free(text->out_buf);
if (text->out_buf != NULL) {
text->utils->free(text->out_buf);
@@
-415,7
+415,7
@@
gs2_server_mech_step(void *conn_context,
? (gss_cred_id_t)params->gss_creds
: text->server_creds,
&input_token,
? (gss_cred_id_t)params->gss_creds
: text->server_creds,
&input_token,
- &text->bindings,
+ &text->
gss_c
bindings,
&text->client_name,
&actual_mech,
&output_token,
&text->client_name,
&actual_mech,
&output_token,
@@
-828,7
+828,7
@@
static int gs2_client_mech_step(void *conn_context,
(gss_OID)text->mechanism,
req_flags,
GSS_C_INDEFINITE,
(gss_OID)text->mechanism,
req_flags,
GSS_C_INDEFINITE,
- &text->bindings,
+ &text->
gss_c
bindings,
serverinlen ? &input_token : GSS_C_NO_BUFFER,
NULL,
&output_token,
serverinlen ? &input_token : GSS_C_NO_BUFFER,
NULL,
&output_token,
@@
-1018,11
+1018,11
@@
gs2_save_cbindings(context_t *text,
gss_buffer_t header,
const sasl_channel_binding_t *cbinding)
{
gss_buffer_t header,
const sasl_channel_binding_t *cbinding)
{
- gss_buffer_t gss_
bindings = &text->
bindings.application_data;
+ gss_buffer_t gss_
cbindings = &text->gss_c
bindings.application_data;
size_t len;
unsigned char *p;
size_t len;
unsigned char *p;
- assert(gss_bindings->value == NULL);
+ assert(gss_
c
bindings->value == NULL);
/*
* The application-data field MUST be set to the gs2-header, excluding
/*
* The application-data field MUST be set to the gs2-header, excluding
@@
-1039,12
+1039,12
@@
gs2_save_cbindings(context_t *text,
len += cbinding->len;
}
len += cbinding->len;
}
- gss_bindings->length = len;
- gss_bindings->value = text->utils->malloc(len);
- if (gss_bindings->value == NULL)
+ gss_
c
bindings->length = len;
+ gss_
c
bindings->value = text->utils->malloc(len);
+ if (gss_
c
bindings->value == NULL)
return SASL_NOMEM;
return SASL_NOMEM;
- p = (unsigned char *)gss_bindings->value;
+ p = (unsigned char *)gss_
c
bindings->value;
if (text->gs2_flags & GS2_NONSTD_FLAG) {
memcpy(p, (unsigned char *)header->value + 2, header->length - 2);
p += header->length - 2;
if (text->gs2_flags & GS2_NONSTD_FLAG) {
memcpy(p, (unsigned char *)header->value + 2, header->length - 2);
p += header->length - 2;