oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

rename token structure in consistency with rest of GSS-API

Browse Source 
From: Luke Howard <lukeh@PADL.COM>


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12690 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-08-28 10:41:36 +00:00
parent bdf7544c1b
commit d432d068e5
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/gssapi/arcfour.c
View File

@@ -139,7 +139,7 @@ _gssapi_get_mic_arcfour(OM_uint32 * minor_status,
gss_buffer_t message_token, gss_buffer_t message_token,
krb5_keyblock *key) krb5_keyblock *key)
{ {
gss_arcfour_mic_token *token; gss_arcfour_mic_token token;
krb5_error_code ret; krb5_error_code ret;
int32_t seq_number; int32_t seq_number;
size_t len, total_len; size_t len, total_len;
@@ -157,7 +157,7 @@ _gssapi_get_mic_arcfour(OM_uint32 * minor_status,
p = _gssapi_make_mech_header(message_token->value, p = _gssapi_make_mech_header(message_token->value,
len, len,
GSS_KRB5_MECHANISM); GSS_KRB5_MECHANISM);
token = (gss_arcfour_mic_token *)p; token = (gss_arcfour_mic_token)p;
token->TOK_ID[0] = 0x01; token->TOK_ID[0] = 0x01;
token->TOK_ID[1] = 0x01; token->TOK_ID[1] = 0x01;
@@ -321,7 +321,7 @@ _gssapi_wrap_arcfour(OM_uint32 * minor_status,
{ {
u_char Klocaldata[16], k6_data[16], *p; u_char Klocaldata[16], k6_data[16], *p;
size_t len, total_len, datalen; size_t len, total_len, datalen;
gss_arcfour_wrap_token *token; gss_arcfour_wrap_token token;
krb5_keyblock Klocal; krb5_keyblock Klocal;
krb5_error_code ret; krb5_error_code ret;
int32_t seq_number; int32_t seq_number;
@@ -340,7 +340,7 @@ _gssapi_wrap_arcfour(OM_uint32 * minor_status,
p = _gssapi_make_mech_header(output_message_buffer->value, p = _gssapi_make_mech_header(output_message_buffer->value,
len, len,
GSS_KRB5_MECHANISM); GSS_KRB5_MECHANISM);
token = (gss_arcfour_wrap_token *)p; token = (gss_arcfour_wrap_token)p;
token->TOK_ID[0] = 0x02; token->TOK_ID[0] = 0x02;
token->TOK_ID[1] = 0x01; token->TOK_ID[1] = 0x01;
@@ -463,7 +463,7 @@ OM_uint32 _gssapi_unwrap_arcfour(OM_uint32 *minor_status,
OM_uint32 omret; OM_uint32 omret;
char k6_data[16], SND_SEQ[8], Confounder[8]; char k6_data[16], SND_SEQ[8], Confounder[8];
char cksum_data[8]; char cksum_data[8];
gss_arcfour_wrap_token *token; gss_arcfour_wrap_token token;
u_char *p; u_char *p;
int cmp; int cmp;
int conf_flag; int conf_flag;
@@ -480,7 +480,7 @@ OM_uint32 _gssapi_unwrap_arcfour(OM_uint32 *minor_status,
GSS_KRB5_MECHANISM); GSS_KRB5_MECHANISM);
if (omret) if (omret)
return omret; return omret;
token = (gss_arcfour_wrap_token *)p; token = (gss_arcfour_wrap_token)p;
datalen = input_message_buffer->length - datalen = input_message_buffer->length -
(p - ((u_char *)input_message_buffer->value)) - (p - ((u_char *)input_message_buffer->value)) -

4
lib/gssapi/arcfour.h
View File

@@ -42,7 +42,7 @@ typedef struct gss_arcfour_mic_token {
u_char Filler[4]; u_char Filler[4];
u_char SND_SEQ[8]; u_char SND_SEQ[8];
u_char SGN_CKSUM[8]; u_char SGN_CKSUM[8];
} gss_arcfour_mic_token; } gss_arcfour_mic_token_desc, *gss_arcfour_mic_token;
typedef struct gss_arcfour_wrap_token { typedef struct gss_arcfour_wrap_token {
u_char TOK_ID[2]; /* 02 01 */ u_char TOK_ID[2]; /* 02 01 */
@@ -52,7 +52,7 @@ typedef struct gss_arcfour_wrap_token {
u_char SND_SEQ[8]; u_char SND_SEQ[8];
u_char SGN_CKSUM[8]; u_char SGN_CKSUM[8];
u_char Confounder[8]; u_char Confounder[8];
} gss_arcfour_wrap_token; } gss_arcfour_wrap_token_desc, *gss_arcfour_wrap_token;
OM_uint32 _gssapi_wrap_arcfour(OM_uint32 *minor_status, OM_uint32 _gssapi_wrap_arcfour(OM_uint32 *minor_status,
const gss_ctx_id_t context_handle, const gss_ctx_id_t context_handle,

12
lib/gssapi/krb5/arcfour.c
View File

@@ -139,7 +139,7 @@ _gssapi_get_mic_arcfour(OM_uint32 * minor_status,
gss_buffer_t message_token, gss_buffer_t message_token,
krb5_keyblock *key) krb5_keyblock *key)
{ {
gss_arcfour_mic_token *token; gss_arcfour_mic_token token;
krb5_error_code ret; krb5_error_code ret;
int32_t seq_number; int32_t seq_number;
size_t len, total_len; size_t len, total_len;
@@ -157,7 +157,7 @@ _gssapi_get_mic_arcfour(OM_uint32 * minor_status,
p = _gssapi_make_mech_header(message_token->value, p = _gssapi_make_mech_header(message_token->value,
len, len,
GSS_KRB5_MECHANISM); GSS_KRB5_MECHANISM);
token = (gss_arcfour_mic_token *)p; token = (gss_arcfour_mic_token)p;
token->TOK_ID[0] = 0x01; token->TOK_ID[0] = 0x01;
token->TOK_ID[1] = 0x01; token->TOK_ID[1] = 0x01;
@@ -321,7 +321,7 @@ _gssapi_wrap_arcfour(OM_uint32 * minor_status,
{ {
u_char Klocaldata[16], k6_data[16], *p; u_char Klocaldata[16], k6_data[16], *p;
size_t len, total_len, datalen; size_t len, total_len, datalen;
gss_arcfour_wrap_token *token; gss_arcfour_wrap_token token;
krb5_keyblock Klocal; krb5_keyblock Klocal;
krb5_error_code ret; krb5_error_code ret;
int32_t seq_number; int32_t seq_number;
@@ -340,7 +340,7 @@ _gssapi_wrap_arcfour(OM_uint32 * minor_status,
p = _gssapi_make_mech_header(output_message_buffer->value, p = _gssapi_make_mech_header(output_message_buffer->value,
len, len,
GSS_KRB5_MECHANISM); GSS_KRB5_MECHANISM);
token = (gss_arcfour_wrap_token *)p; token = (gss_arcfour_wrap_token)p;
token->TOK_ID[0] = 0x02; token->TOK_ID[0] = 0x02;
token->TOK_ID[1] = 0x01; token->TOK_ID[1] = 0x01;
@@ -463,7 +463,7 @@ OM_uint32 _gssapi_unwrap_arcfour(OM_uint32 *minor_status,
OM_uint32 omret; OM_uint32 omret;
char k6_data[16], SND_SEQ[8], Confounder[8]; char k6_data[16], SND_SEQ[8], Confounder[8];
char cksum_data[8]; char cksum_data[8];
gss_arcfour_wrap_token *token; gss_arcfour_wrap_token token;
u_char *p; u_char *p;
int cmp; int cmp;
int conf_flag; int conf_flag;
@@ -480,7 +480,7 @@ OM_uint32 _gssapi_unwrap_arcfour(OM_uint32 *minor_status,
GSS_KRB5_MECHANISM); GSS_KRB5_MECHANISM);
if (omret) if (omret)
return omret; return omret;
token = (gss_arcfour_wrap_token *)p; token = (gss_arcfour_wrap_token)p;
datalen = input_message_buffer->length - datalen = input_message_buffer->length -
(p - ((u_char *)input_message_buffer->value)) - (p - ((u_char *)input_message_buffer->value)) -

4
lib/gssapi/krb5/arcfour.h
View File

@@ -42,7 +42,7 @@ typedef struct gss_arcfour_mic_token {
u_char Filler[4]; u_char Filler[4];
u_char SND_SEQ[8]; u_char SND_SEQ[8];
u_char SGN_CKSUM[8]; u_char SGN_CKSUM[8];
} gss_arcfour_mic_token; } gss_arcfour_mic_token_desc, *gss_arcfour_mic_token;
typedef struct gss_arcfour_wrap_token { typedef struct gss_arcfour_wrap_token {
u_char TOK_ID[2]; /* 02 01 */ u_char TOK_ID[2]; /* 02 01 */
@@ -52,7 +52,7 @@ typedef struct gss_arcfour_wrap_token {
u_char SND_SEQ[8]; u_char SND_SEQ[8];
u_char SGN_CKSUM[8]; u_char SGN_CKSUM[8];
u_char Confounder[8]; u_char Confounder[8];
} gss_arcfour_wrap_token; } gss_arcfour_wrap_token_desc, *gss_arcfour_wrap_token;
OM_uint32 _gssapi_wrap_arcfour(OM_uint32 *minor_status, OM_uint32 _gssapi_wrap_arcfour(OM_uint32 *minor_status,
const gss_ctx_id_t context_handle, const gss_ctx_id_t context_handle,