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

prefix all sequence symbols with _, they are not part of the GSS-API api. By comment from Wynn Wilkes <wynnw@vintela.com>

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14989 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-04-27 17:51:27 +00:00
parent 758edc3a6b
commit d0443e2058
22 changed files with 100 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/gssapi/accept_sec_context.c
View File

@@ -521,14 +521,14 @@ gsskrb5_accept_sec_context
krb5_auth_getremoteseqnumber (gssapi_krb5_context,
(*context_handle)->auth_context,
&seq_number);
ret = gssapi_msg_order_create(minor_status,
ret = _gssapi_msg_order_create(minor_status,
&(*context_handle)->order,
gssapi_msg_order_f(flags),
_gssapi_msg_order_f(flags),
seq_number, 0, is_cfx);
if (ret)
goto failure;
if ((flags & GSS_C_MUTUAL_FLAG) == 0 && gssapi_msg_order_f(flags)) {
if ((flags & GSS_C_MUTUAL_FLAG) == 0 && _gssapi_msg_order_f(flags)) {
krb5_auth_con_setlocalseqnumber (gssapi_krb5_context,
(*context_handle)->auth_context,
seq_number);
@@ -568,7 +568,7 @@ gsskrb5_accept_sec_context
krb5_free_principal (gssapi_krb5_context,
(*context_handle)->target);
if((*context_handle)->order)
gssapi_msg_order_destroy(&(*context_handle)->order);
_gssapi_msg_order_destroy(&(*context_handle)->order);
HEIMDAL_MUTEX_destroy(&(*context_handle)->ctx_id_mutex);
free (*context_handle);
if (src_name != NULL) {

8
lib/gssapi/arcfour.c
View File

@@ -316,7 +316,7 @@ _gssapi_verify_mic_arcfour(OM_uint32 * minor_status,
}
HEIMDAL_MUTEX_lock(&context_handle->ctx_id_mutex);
omret = gssapi_msg_order_check(context_handle->order, seq_number);
omret = _gssapi_msg_order_check(context_handle->order, seq_number);
HEIMDAL_MUTEX_unlock(&context_handle->ctx_id_mutex);
if (omret)
return omret;
@@ -345,8 +345,8 @@ _gssapi_wrap_arcfour(OM_uint32 * minor_status,
*conf_state = 0;
datalen = input_message_buffer->length + 1 /* padding */;
len = datalen + 30;
gssapi_krb5_encap_length (len, &len, &total_len, GSS_KRB5_MECHANISM);
len = datalen + GSS_ARCFOUR_WRAP_TOKEN_SIZE - 2; /* encap_length adds 2 */
_gssapi_encap_length(len, &len, &total_len, GSS_KRB5_MECHANISM);
output_message_buffer->length = total_len;
output_message_buffer->value = malloc (total_len);
@@ -623,7 +623,7 @@ OM_uint32 _gssapi_unwrap_arcfour(OM_uint32 *minor_status,
}
HEIMDAL_MUTEX_lock(&context_handle->ctx_id_mutex);
omret = gssapi_msg_order_check(context_handle->order, seq_number);
omret = _gssapi_msg_order_check(context_handle->order, seq_number);
HEIMDAL_MUTEX_unlock(&context_handle->ctx_id_mutex);
if (omret)
return omret;

4
lib/gssapi/cfx.c
View File

@@ -481,7 +481,7 @@ OM_uint32 _gssapi_unwrap_cfx(OM_uint32 *minor_status,
}
HEIMDAL_MUTEX_lock(&context_handle->ctx_id_mutex);
ret = gssapi_msg_order_check(context_handle->order, seq_number_lo);
ret = _gssapi_msg_order_check(context_handle->order, seq_number_lo);
if (ret != 0) {
*minor_status = 0;
HEIMDAL_MUTEX_unlock(&context_handle->ctx_id_mutex);
@@ -773,7 +773,7 @@ OM_uint32 _gssapi_verify_mic_cfx(OM_uint32 *minor_status,
}
HEIMDAL_MUTEX_lock(&context_handle->ctx_id_mutex);
ret = gssapi_msg_order_check(context_handle->order, seq_number_lo);
ret = _gssapi_msg_order_check(context_handle->order, seq_number_lo);
if (ret != 0) {
*minor_status = 0;
HEIMDAL_MUTEX_unlock(&context_handle->ctx_id_mutex);

2
lib/gssapi/delete_sec_context.c
View File

@@ -62,7 +62,7 @@ OM_uint32 gss_delete_sec_context
krb5_free_ticket (gssapi_krb5_context,
(*context_handle)->ticket);
if((*context_handle)->order)
gssapi_msg_order_destroy(&(*context_handle)->order);
_gssapi_msg_order_destroy(&(*context_handle)->order);
HEIMDAL_MUTEX_unlock(&(*context_handle)->ctx_id_mutex);
HEIMDAL_MUTEX_destroy(&(*context_handle)->ctx_id_mutex);

8
lib/gssapi/gssapi_locl.h
View File

@@ -247,16 +247,16 @@ gssapi_lifetime_left(OM_uint32 *, OM_uint32, OM_uint32 *);
/* sequence */
OM_uint32
gssapi_msg_order_create(OM_uint32 *, struct gss_msg_order **,
_gssapi_msg_order_create(OM_uint32 *, struct gss_msg_order **,
OM_uint32, OM_uint32, OM_uint32, int);
OM_uint32
gssapi_msg_order_destroy(struct gss_msg_order **);
_gssapi_msg_order_destroy(struct gss_msg_order **);
OM_uint32
gssapi_msg_order_check(struct gss_msg_order *, OM_uint32);
_gssapi_msg_order_check(struct gss_msg_order *, OM_uint32);
OM_uint32
gssapi_msg_order_f(OM_uint32);
_gssapi_msg_order_f(OM_uint32);
/* 8003 */

6
lib/gssapi/import_sec_context.c
View File

@@ -197,9 +197,9 @@ gss_import_sec_context (
gsskrb5_is_cfx(*context_handle, &is_cfx);
ret = gssapi_msg_order_create(minor_status,
ret = _gssapi_msg_order_create(minor_status,
&(*context_handle)->order,
gssapi_msg_order_f((*context_handle)->flags),
_gssapi_msg_order_f((*context_handle)->flags),
0, 0, is_cfx);
if (ret)
goto failure;
@@ -219,7 +219,7 @@ failure:
if (remotep)
krb5_free_address (gssapi_krb5_context, remotep);
if((*context_handle)->order)
gssapi_msg_order_destroy(&(*context_handle)->order);
_gssapi_msg_order_destroy(&(*context_handle)->order);
HEIMDAL_MUTEX_destroy(&(*context_handle)->ctx_id_mutex);
krb5_storage_free (sp);
free (*context_handle);

10
lib/gssapi/init_sec_context.c
View File

@@ -427,9 +427,9 @@ init_auth
gsskrb5_is_cfx(*context_handle, &is_cfx);
ret = gssapi_msg_order_create(minor_status,
ret = _gssapi_msg_order_create(minor_status,
&(*context_handle)->order,
gssapi_msg_order_f(flags),
_gssapi_msg_order_f(flags),
seq_number, 0, is_cfx);
if (ret)
goto failure;
@@ -456,7 +456,7 @@ init_auth
krb5_free_principal (gssapi_krb5_context,
(*context_handle)->target);
if((*context_handle)->order)
gssapi_msg_order_destroy(&(*context_handle)->order);
_gssapi_msg_order_destroy(&(*context_handle)->order);
HEIMDAL_MUTEX_destroy(&(*context_handle)->ctx_id_mutex);
free (*context_handle);
*context_handle = GSS_C_NO_CONTEXT;
@@ -521,9 +521,9 @@ repl_mutual
gsskrb5_is_cfx(*context_handle, &is_cfx);
ret = gssapi_msg_order_create(minor_status,
ret = _gssapi_msg_order_create(minor_status,
&(*context_handle)->order,
gssapi_msg_order_f((*context_handle)->flags),
_gssapi_msg_order_f((*context_handle)->flags),
seq_number, 0, is_cfx);
if (ret) {
HEIMDAL_MUTEX_unlock(&(*context_handle)->ctx_id_mutex);

8
lib/gssapi/krb5/accept_sec_context.c
View File

@@ -521,14 +521,14 @@ gsskrb5_accept_sec_context
krb5_auth_getremoteseqnumber (gssapi_krb5_context,
(*context_handle)->auth_context,
&seq_number);
ret = gssapi_msg_order_create(minor_status,
ret = _gssapi_msg_order_create(minor_status,
&(*context_handle)->order,
gssapi_msg_order_f(flags),
_gssapi_msg_order_f(flags),
seq_number, 0, is_cfx);
if (ret)
goto failure;
if ((flags & GSS_C_MUTUAL_FLAG) == 0 && gssapi_msg_order_f(flags)) {
if ((flags & GSS_C_MUTUAL_FLAG) == 0 && _gssapi_msg_order_f(flags)) {
krb5_auth_con_setlocalseqnumber (gssapi_krb5_context,
(*context_handle)->auth_context,
seq_number);
@@ -568,7 +568,7 @@ gsskrb5_accept_sec_context
krb5_free_principal (gssapi_krb5_context,
(*context_handle)->target);
if((*context_handle)->order)
gssapi_msg_order_destroy(&(*context_handle)->order);
_gssapi_msg_order_destroy(&(*context_handle)->order);
HEIMDAL_MUTEX_destroy(&(*context_handle)->ctx_id_mutex);
free (*context_handle);
if (src_name != NULL) {

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

@@ -316,7 +316,7 @@ _gssapi_verify_mic_arcfour(OM_uint32 * minor_status,
}
HEIMDAL_MUTEX_lock(&context_handle->ctx_id_mutex);
omret = gssapi_msg_order_check(context_handle->order, seq_number);
omret = _gssapi_msg_order_check(context_handle->order, seq_number);
HEIMDAL_MUTEX_unlock(&context_handle->ctx_id_mutex);
if (omret)
return omret;
@@ -345,8 +345,8 @@ _gssapi_wrap_arcfour(OM_uint32 * minor_status,
*conf_state = 0;
datalen = input_message_buffer->length + 1 /* padding */;
len = datalen + 30;
gssapi_krb5_encap_length (len, &len, &total_len, GSS_KRB5_MECHANISM);
len = datalen + GSS_ARCFOUR_WRAP_TOKEN_SIZE - 2; /* encap_length adds 2 */
_gssapi_encap_length(len, &len, &total_len, GSS_KRB5_MECHANISM);
output_message_buffer->length = total_len;
output_message_buffer->value = malloc (total_len);
@@ -623,7 +623,7 @@ OM_uint32 _gssapi_unwrap_arcfour(OM_uint32 *minor_status,
}
HEIMDAL_MUTEX_lock(&context_handle->ctx_id_mutex);
omret = gssapi_msg_order_check(context_handle->order, seq_number);
omret = _gssapi_msg_order_check(context_handle->order, seq_number);
HEIMDAL_MUTEX_unlock(&context_handle->ctx_id_mutex);
if (omret)
return omret;

4
lib/gssapi/krb5/cfx.c
View File

@@ -481,7 +481,7 @@ OM_uint32 _gssapi_unwrap_cfx(OM_uint32 *minor_status,
}
HEIMDAL_MUTEX_lock(&context_handle->ctx_id_mutex);
ret = gssapi_msg_order_check(context_handle->order, seq_number_lo);
ret = _gssapi_msg_order_check(context_handle->order, seq_number_lo);
if (ret != 0) {
*minor_status = 0;
HEIMDAL_MUTEX_unlock(&context_handle->ctx_id_mutex);
@@ -773,7 +773,7 @@ OM_uint32 _gssapi_verify_mic_cfx(OM_uint32 *minor_status,
}
HEIMDAL_MUTEX_lock(&context_handle->ctx_id_mutex);
ret = gssapi_msg_order_check(context_handle->order, seq_number_lo);
ret = _gssapi_msg_order_check(context_handle->order, seq_number_lo);
if (ret != 0) {
*minor_status = 0;
HEIMDAL_MUTEX_unlock(&context_handle->ctx_id_mutex);

2
lib/gssapi/krb5/delete_sec_context.c
View File

@@ -62,7 +62,7 @@ OM_uint32 gss_delete_sec_context
krb5_free_ticket (gssapi_krb5_context,
(*context_handle)->ticket);
if((*context_handle)->order)
gssapi_msg_order_destroy(&(*context_handle)->order);
_gssapi_msg_order_destroy(&(*context_handle)->order);
HEIMDAL_MUTEX_unlock(&(*context_handle)->ctx_id_mutex);
HEIMDAL_MUTEX_destroy(&(*context_handle)->ctx_id_mutex);

8
lib/gssapi/krb5/gssapi_locl.h
View File

@@ -247,16 +247,16 @@ gssapi_lifetime_left(OM_uint32 *, OM_uint32, OM_uint32 *);
/* sequence */
OM_uint32
gssapi_msg_order_create(OM_uint32 *, struct gss_msg_order **,
_gssapi_msg_order_create(OM_uint32 *, struct gss_msg_order **,
OM_uint32, OM_uint32, OM_uint32, int);
OM_uint32
gssapi_msg_order_destroy(struct gss_msg_order **);
_gssapi_msg_order_destroy(struct gss_msg_order **);
OM_uint32
gssapi_msg_order_check(struct gss_msg_order *, OM_uint32);
_gssapi_msg_order_check(struct gss_msg_order *, OM_uint32);
OM_uint32
gssapi_msg_order_f(OM_uint32);
_gssapi_msg_order_f(OM_uint32);
/* 8003 */

6
lib/gssapi/krb5/import_sec_context.c
View File

@@ -197,9 +197,9 @@ gss_import_sec_context (
gsskrb5_is_cfx(*context_handle, &is_cfx);
ret = gssapi_msg_order_create(minor_status,
ret = _gssapi_msg_order_create(minor_status,
&(*context_handle)->order,
gssapi_msg_order_f((*context_handle)->flags),
_gssapi_msg_order_f((*context_handle)->flags),
0, 0, is_cfx);
if (ret)
goto failure;
@@ -219,7 +219,7 @@ failure:
if (remotep)
krb5_free_address (gssapi_krb5_context, remotep);
if((*context_handle)->order)
gssapi_msg_order_destroy(&(*context_handle)->order);
_gssapi_msg_order_destroy(&(*context_handle)->order);
HEIMDAL_MUTEX_destroy(&(*context_handle)->ctx_id_mutex);
krb5_storage_free (sp);
free (*context_handle);

10
lib/gssapi/krb5/init_sec_context.c
View File

@@ -427,9 +427,9 @@ init_auth
gsskrb5_is_cfx(*context_handle, &is_cfx);
ret = gssapi_msg_order_create(minor_status,
ret = _gssapi_msg_order_create(minor_status,
&(*context_handle)->order,
gssapi_msg_order_f(flags),
_gssapi_msg_order_f(flags),
seq_number, 0, is_cfx);
if (ret)
goto failure;
@@ -456,7 +456,7 @@ init_auth
krb5_free_principal (gssapi_krb5_context,
(*context_handle)->target);
if((*context_handle)->order)
gssapi_msg_order_destroy(&(*context_handle)->order);
_gssapi_msg_order_destroy(&(*context_handle)->order);
HEIMDAL_MUTEX_destroy(&(*context_handle)->ctx_id_mutex);
free (*context_handle);
*context_handle = GSS_C_NO_CONTEXT;
@@ -521,9 +521,9 @@ repl_mutual
gsskrb5_is_cfx(*context_handle, &is_cfx);
ret = gssapi_msg_order_create(minor_status,
ret = _gssapi_msg_order_create(minor_status,
&(*context_handle)->order,
gssapi_msg_order_f((*context_handle)->flags),
_gssapi_msg_order_f((*context_handle)->flags),
seq_number, 0, is_cfx);
if (ret) {
HEIMDAL_MUTEX_unlock(&(*context_handle)->ctx_id_mutex);

8
lib/gssapi/krb5/sequence.c
View File

@@ -51,7 +51,7 @@ struct gss_msg_order {
*/
OM_uint32
gssapi_msg_order_create(OM_uint32 *minor_status,
_gssapi_msg_order_create(OM_uint32 *minor_status,
struct gss_msg_order **o,
OM_uint32 flags,
OM_uint32 seq_num,
@@ -84,7 +84,7 @@ gssapi_msg_order_create(OM_uint32 *minor_status,
}
OM_uint32
gssapi_msg_order_destroy(struct gss_msg_order **m)
_gssapi_msg_order_destroy(struct gss_msg_order **m)
{
free(*m);
*m = NULL;
@@ -120,7 +120,7 @@ elem_insert(struct gss_msg_order *o,
/* rule 4+5: seqnum in [seqnum(first),seqnum(last)] */
OM_uint32
gssapi_msg_order_check(struct gss_msg_order *o, OM_uint32 seq_num)
_gssapi_msg_order_check(struct gss_msg_order *o, OM_uint32 seq_num)
{
OM_uint32 r;
int i;
@@ -183,7 +183,7 @@ gssapi_msg_order_check(struct gss_msg_order *o, OM_uint32 seq_num)
}
OM_uint32
gssapi_msg_order_f(OM_uint32 flags)
_gssapi_msg_order_f(OM_uint32 flags)
{
return flags & (GSS_C_SEQUENCE_FLAG|GSS_C_REPLAY_FLAG);
}

7
lib/gssapi/krb5/test_sequence.c
View File

@@ -88,16 +88,17 @@ test_seq(int t, OM_uint32 flags, OM_uint32 start_seq,
OM_uint32 maj_stat, min_stat;
int i;
maj_stat = gssapi_msg_order_create(&min_stat, &o, flags, start_seq, 20, 0);
maj_stat = _gssapi_msg_order_create(&min_stat, &o, flags,
start_seq, 20, 0);
if (maj_stat)
err(1, "create: %d %d", maj_stat, min_stat);
for (i = 0; i < pattern_len; i++) {
maj_stat = gssapi_msg_order_check(o, pattern[i]);
maj_stat = _gssapi_msg_order_check(o, pattern[i]);
if (maj_stat)
return maj_stat;
}
gssapi_msg_order_destroy(&o);
_gssapi_msg_order_destroy(&o);
return 0;
}

4
lib/gssapi/krb5/unwrap.c
View File

@@ -150,7 +150,7 @@ unwrap_des
return GSS_S_BAD_MIC;
}
ret = gssapi_msg_order_check(context_handle->order, seq_number);
ret = _gssapi_msg_order_check(context_handle->order, seq_number);
if (ret) {
HEIMDAL_MUTEX_unlock(&context_handle->ctx_id_mutex);
return ret;
@@ -306,7 +306,7 @@ unwrap_des3
return GSS_S_BAD_MIC;
}
ret = gssapi_msg_order_check(context_handle->order, seq_number);
ret = _gssapi_msg_order_check(context_handle->order, seq_number);
if (ret) {
*minor_status = 0;
HEIMDAL_MUTEX_unlock(&context_handle->ctx_id_mutex);

4
lib/gssapi/krb5/verify_mic.c
View File

@@ -116,7 +116,7 @@ verify_mic_des
return GSS_S_BAD_MIC;
}
ret = gssapi_msg_order_check(context_handle->order, seq_number);
ret = _gssapi_msg_order_check(context_handle->order, seq_number);
if (ret) {
HEIMDAL_MUTEX_unlock(&context_handle->ctx_id_mutex);
return ret;
@@ -221,7 +221,7 @@ retry:
return GSS_S_BAD_MIC;
}
ret = gssapi_msg_order_check(context_handle->order, seq_number);
ret = _gssapi_msg_order_check(context_handle->order, seq_number);
if (ret) {
krb5_crypto_destroy (gssapi_krb5_context, crypto);
*minor_status = 0;

8
lib/gssapi/sequence.c
View File

@@ -51,7 +51,7 @@ struct gss_msg_order {
*/
OM_uint32
gssapi_msg_order_create(OM_uint32 *minor_status,
_gssapi_msg_order_create(OM_uint32 *minor_status,
struct gss_msg_order **o,
OM_uint32 flags,
OM_uint32 seq_num,
@@ -84,7 +84,7 @@ gssapi_msg_order_create(OM_uint32 *minor_status,
}
OM_uint32
gssapi_msg_order_destroy(struct gss_msg_order **m)
_gssapi_msg_order_destroy(struct gss_msg_order **m)
{
free(*m);
*m = NULL;
@@ -120,7 +120,7 @@ elem_insert(struct gss_msg_order *o,
/* rule 4+5: seqnum in [seqnum(first),seqnum(last)] */
OM_uint32
gssapi_msg_order_check(struct gss_msg_order *o, OM_uint32 seq_num)
_gssapi_msg_order_check(struct gss_msg_order *o, OM_uint32 seq_num)
{
OM_uint32 r;
int i;
@@ -183,7 +183,7 @@ gssapi_msg_order_check(struct gss_msg_order *o, OM_uint32 seq_num)
}
OM_uint32
gssapi_msg_order_f(OM_uint32 flags)
_gssapi_msg_order_f(OM_uint32 flags)
{
return flags & (GSS_C_SEQUENCE_FLAG|GSS_C_REPLAY_FLAG);
}

7
lib/gssapi/test_sequence.c
View File

@@ -88,16 +88,17 @@ test_seq(int t, OM_uint32 flags, OM_uint32 start_seq,
OM_uint32 maj_stat, min_stat;
int i;
maj_stat = gssapi_msg_order_create(&min_stat, &o, flags, start_seq, 20, 0);
maj_stat = _gssapi_msg_order_create(&min_stat, &o, flags,
start_seq, 20, 0);
if (maj_stat)
err(1, "create: %d %d", maj_stat, min_stat);
for (i = 0; i < pattern_len; i++) {
maj_stat = gssapi_msg_order_check(o, pattern[i]);
maj_stat = _gssapi_msg_order_check(o, pattern[i]);
if (maj_stat)
return maj_stat;
}
gssapi_msg_order_destroy(&o);
_gssapi_msg_order_destroy(&o);
return 0;
}

4
lib/gssapi/unwrap.c
View File

@@ -150,7 +150,7 @@ unwrap_des
return GSS_S_BAD_MIC;
}
ret = gssapi_msg_order_check(context_handle->order, seq_number);
ret = _gssapi_msg_order_check(context_handle->order, seq_number);
if (ret) {
HEIMDAL_MUTEX_unlock(&context_handle->ctx_id_mutex);
return ret;
@@ -306,7 +306,7 @@ unwrap_des3
return GSS_S_BAD_MIC;
}
ret = gssapi_msg_order_check(context_handle->order, seq_number);
ret = _gssapi_msg_order_check(context_handle->order, seq_number);
if (ret) {
*minor_status = 0;
HEIMDAL_MUTEX_unlock(&context_handle->ctx_id_mutex);

4
lib/gssapi/verify_mic.c
View File

@@ -116,7 +116,7 @@ verify_mic_des
return GSS_S_BAD_MIC;
}
ret = gssapi_msg_order_check(context_handle->order, seq_number);
ret = _gssapi_msg_order_check(context_handle->order, seq_number);
if (ret) {
HEIMDAL_MUTEX_unlock(&context_handle->ctx_id_mutex);
return ret;
@@ -221,7 +221,7 @@ retry:
return GSS_S_BAD_MIC;
}
ret = gssapi_msg_order_check(context_handle->order, seq_number);
ret = _gssapi_msg_order_check(context_handle->order, seq_number);
if (ret) {
krb5_crypto_destroy (gssapi_krb5_context, crypto);
*minor_status = 0;