From d0443e205880124fdc2d7770976e6b4651d8f599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Wed, 27 Apr 2005 17:51:27 +0000
Subject: [PATCH] prefix all sequence symbols with _, they are not part of the
 GSS-API api. By comment from Wynn Wilkes <wynnw@vintela.com>

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14989 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/gssapi/accept_sec_context.c      | 14 +++++++-------
 lib/gssapi/arcfour.c                 |  8 ++++----
 lib/gssapi/cfx.c                     |  4 ++--
 lib/gssapi/delete_sec_context.c      |  2 +-
 lib/gssapi/gssapi_locl.h             | 10 +++++-----
 lib/gssapi/import_sec_context.c      | 10 +++++-----
 lib/gssapi/init_sec_context.c        | 18 +++++++++---------
 lib/gssapi/krb5/accept_sec_context.c | 14 +++++++-------
 lib/gssapi/krb5/arcfour.c            |  8 ++++----
 lib/gssapi/krb5/cfx.c                |  4 ++--
 lib/gssapi/krb5/delete_sec_context.c |  2 +-
 lib/gssapi/krb5/gssapi_locl.h        | 10 +++++-----
 lib/gssapi/krb5/import_sec_context.c | 10 +++++-----
 lib/gssapi/krb5/init_sec_context.c   | 18 +++++++++---------
 lib/gssapi/krb5/sequence.c           | 18 +++++++++---------
 lib/gssapi/krb5/test_sequence.c      |  7 ++++---
 lib/gssapi/krb5/unwrap.c             |  4 ++--
 lib/gssapi/krb5/verify_mic.c         |  4 ++--
 lib/gssapi/sequence.c                | 18 +++++++++---------
 lib/gssapi/test_sequence.c           |  7 ++++---
 lib/gssapi/unwrap.c                  |  4 ++--
 lib/gssapi/verify_mic.c              |  4 ++--
 22 files changed, 100 insertions(+), 98 deletions(-)

diff --git a/lib/gssapi/accept_sec_context.c b/lib/gssapi/accept_sec_context.c
index 78c698658..103e06942 100644
--- a/lib/gssapi/accept_sec_context.c
+++ b/lib/gssapi/accept_sec_context.c
@@ -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,
-				      &(*context_handle)->order,
-				      gssapi_msg_order_f(flags),
- 				      seq_number, 0, is_cfx);
+	ret = _gssapi_msg_order_create(minor_status,
+				       &(*context_handle)->order,
+				       _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);
@@ -554,7 +554,7 @@ gsskrb5_accept_sec_context
     *minor_status = 0;
     return GSS_S_COMPLETE;
 
-  failure:
+ failure:
     if (fwd_data.length > 0)
 	free(fwd_data.data);
     if (ticket != NULL)
@@ -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) {
diff --git a/lib/gssapi/arcfour.c b/lib/gssapi/arcfour.c
index 4e9772e8c..6b9149d45 100644
--- a/lib/gssapi/arcfour.c
+++ b/lib/gssapi/arcfour.c
@@ -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;
diff --git a/lib/gssapi/cfx.c b/lib/gssapi/cfx.c
index 29538ecc3..3d7506280 100644
--- a/lib/gssapi/cfx.c
+++ b/lib/gssapi/cfx.c
@@ -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);
diff --git a/lib/gssapi/delete_sec_context.c b/lib/gssapi/delete_sec_context.c
index c611cc483..6803fd117 100644
--- a/lib/gssapi/delete_sec_context.c
+++ b/lib/gssapi/delete_sec_context.c
@@ -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);
diff --git a/lib/gssapi/gssapi_locl.h b/lib/gssapi/gssapi_locl.h
index 790431ef8..1a7bcce69 100644
--- a/lib/gssapi/gssapi_locl.h
+++ b/lib/gssapi/gssapi_locl.h
@@ -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 **, 
-			OM_uint32, OM_uint32, OM_uint32, int);
+_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 */
 
diff --git a/lib/gssapi/import_sec_context.c b/lib/gssapi/import_sec_context.c
index 94a80fc56..e86f60d53 100644
--- a/lib/gssapi/import_sec_context.c
+++ b/lib/gssapi/import_sec_context.c
@@ -197,10 +197,10 @@ gss_import_sec_context (
 
     gsskrb5_is_cfx(*context_handle, &is_cfx);
 
-    ret = gssapi_msg_order_create(minor_status,
-				  &(*context_handle)->order,
-				  gssapi_msg_order_f((*context_handle)->flags),
-				  0, 0, is_cfx);
+    ret = _gssapi_msg_order_create(minor_status,
+				   &(*context_handle)->order,
+				   _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);
diff --git a/lib/gssapi/init_sec_context.c b/lib/gssapi/init_sec_context.c
index 773c91b4c..02d5b9f04 100644
--- a/lib/gssapi/init_sec_context.c
+++ b/lib/gssapi/init_sec_context.c
@@ -427,10 +427,10 @@ init_auth
 
 	gsskrb5_is_cfx(*context_handle, &is_cfx);
 
-	ret = gssapi_msg_order_create(minor_status,
-				      &(*context_handle)->order,
-				      gssapi_msg_order_f(flags),
-				      seq_number, 0, is_cfx);
+	ret = _gssapi_msg_order_create(minor_status,
+				       &(*context_handle)->order,
+				       _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,10 +521,10 @@ repl_mutual
 
     gsskrb5_is_cfx(*context_handle, &is_cfx);
 
-    ret = gssapi_msg_order_create(minor_status,
-				  &(*context_handle)->order,
-				  gssapi_msg_order_f((*context_handle)->flags),
-				  seq_number, 0, is_cfx);
+    ret = _gssapi_msg_order_create(minor_status,
+				   &(*context_handle)->order,
+				   _gssapi_msg_order_f((*context_handle)->flags),
+				   seq_number, 0, is_cfx);
     if (ret) {
 	HEIMDAL_MUTEX_unlock(&(*context_handle)->ctx_id_mutex);
 	return ret;
diff --git a/lib/gssapi/krb5/accept_sec_context.c b/lib/gssapi/krb5/accept_sec_context.c
index 78c698658..103e06942 100644
--- a/lib/gssapi/krb5/accept_sec_context.c
+++ b/lib/gssapi/krb5/accept_sec_context.c
@@ -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,
-				      &(*context_handle)->order,
-				      gssapi_msg_order_f(flags),
- 				      seq_number, 0, is_cfx);
+	ret = _gssapi_msg_order_create(minor_status,
+				       &(*context_handle)->order,
+				       _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);
@@ -554,7 +554,7 @@ gsskrb5_accept_sec_context
     *minor_status = 0;
     return GSS_S_COMPLETE;
 
-  failure:
+ failure:
     if (fwd_data.length > 0)
 	free(fwd_data.data);
     if (ticket != NULL)
@@ -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) {
diff --git a/lib/gssapi/krb5/arcfour.c b/lib/gssapi/krb5/arcfour.c
index 4e9772e8c..6b9149d45 100644
--- a/lib/gssapi/krb5/arcfour.c
+++ b/lib/gssapi/krb5/arcfour.c
@@ -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;
diff --git a/lib/gssapi/krb5/cfx.c b/lib/gssapi/krb5/cfx.c
index 29538ecc3..3d7506280 100644
--- a/lib/gssapi/krb5/cfx.c
+++ b/lib/gssapi/krb5/cfx.c
@@ -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);
diff --git a/lib/gssapi/krb5/delete_sec_context.c b/lib/gssapi/krb5/delete_sec_context.c
index c611cc483..6803fd117 100644
--- a/lib/gssapi/krb5/delete_sec_context.c
+++ b/lib/gssapi/krb5/delete_sec_context.c
@@ -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);
diff --git a/lib/gssapi/krb5/gssapi_locl.h b/lib/gssapi/krb5/gssapi_locl.h
index 790431ef8..1a7bcce69 100644
--- a/lib/gssapi/krb5/gssapi_locl.h
+++ b/lib/gssapi/krb5/gssapi_locl.h
@@ -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 **, 
-			OM_uint32, OM_uint32, OM_uint32, int);
+_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 */
 
diff --git a/lib/gssapi/krb5/import_sec_context.c b/lib/gssapi/krb5/import_sec_context.c
index 94a80fc56..e86f60d53 100644
--- a/lib/gssapi/krb5/import_sec_context.c
+++ b/lib/gssapi/krb5/import_sec_context.c
@@ -197,10 +197,10 @@ gss_import_sec_context (
 
     gsskrb5_is_cfx(*context_handle, &is_cfx);
 
-    ret = gssapi_msg_order_create(minor_status,
-				  &(*context_handle)->order,
-				  gssapi_msg_order_f((*context_handle)->flags),
-				  0, 0, is_cfx);
+    ret = _gssapi_msg_order_create(minor_status,
+				   &(*context_handle)->order,
+				   _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);
diff --git a/lib/gssapi/krb5/init_sec_context.c b/lib/gssapi/krb5/init_sec_context.c
index 773c91b4c..02d5b9f04 100644
--- a/lib/gssapi/krb5/init_sec_context.c
+++ b/lib/gssapi/krb5/init_sec_context.c
@@ -427,10 +427,10 @@ init_auth
 
 	gsskrb5_is_cfx(*context_handle, &is_cfx);
 
-	ret = gssapi_msg_order_create(minor_status,
-				      &(*context_handle)->order,
-				      gssapi_msg_order_f(flags),
-				      seq_number, 0, is_cfx);
+	ret = _gssapi_msg_order_create(minor_status,
+				       &(*context_handle)->order,
+				       _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,10 +521,10 @@ repl_mutual
 
     gsskrb5_is_cfx(*context_handle, &is_cfx);
 
-    ret = gssapi_msg_order_create(minor_status,
-				  &(*context_handle)->order,
-				  gssapi_msg_order_f((*context_handle)->flags),
-				  seq_number, 0, is_cfx);
+    ret = _gssapi_msg_order_create(minor_status,
+				   &(*context_handle)->order,
+				   _gssapi_msg_order_f((*context_handle)->flags),
+				   seq_number, 0, is_cfx);
     if (ret) {
 	HEIMDAL_MUTEX_unlock(&(*context_handle)->ctx_id_mutex);
 	return ret;
diff --git a/lib/gssapi/krb5/sequence.c b/lib/gssapi/krb5/sequence.c
index 613653b9e..37f576008 100644
--- a/lib/gssapi/krb5/sequence.c
+++ b/lib/gssapi/krb5/sequence.c
@@ -51,12 +51,12 @@ struct gss_msg_order {
  */
 
 OM_uint32
-gssapi_msg_order_create(OM_uint32 *minor_status,
-			struct gss_msg_order **o, 
-			OM_uint32 flags, 
-			OM_uint32 seq_num, 
-			OM_uint32 jitter_window,
-			int use_64)
+_gssapi_msg_order_create(OM_uint32 *minor_status,
+			 struct gss_msg_order **o, 
+			 OM_uint32 flags, 
+			 OM_uint32 seq_num, 
+			 OM_uint32 jitter_window,
+			 int use_64)
 {
     size_t len;
 
@@ -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);
 }
diff --git a/lib/gssapi/krb5/test_sequence.c b/lib/gssapi/krb5/test_sequence.c
index e9f367c58..26d1d9ff3 100644
--- a/lib/gssapi/krb5/test_sequence.c
+++ b/lib/gssapi/krb5/test_sequence.c
@@ -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;
 }
diff --git a/lib/gssapi/krb5/unwrap.c b/lib/gssapi/krb5/unwrap.c
index 3984fa5f8..a87ff7b38 100644
--- a/lib/gssapi/krb5/unwrap.c
+++ b/lib/gssapi/krb5/unwrap.c
@@ -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);
diff --git a/lib/gssapi/krb5/verify_mic.c b/lib/gssapi/krb5/verify_mic.c
index 6708d97c2..e5ccb8317 100644
--- a/lib/gssapi/krb5/verify_mic.c
+++ b/lib/gssapi/krb5/verify_mic.c
@@ -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;
diff --git a/lib/gssapi/sequence.c b/lib/gssapi/sequence.c
index 613653b9e..37f576008 100644
--- a/lib/gssapi/sequence.c
+++ b/lib/gssapi/sequence.c
@@ -51,12 +51,12 @@ struct gss_msg_order {
  */
 
 OM_uint32
-gssapi_msg_order_create(OM_uint32 *minor_status,
-			struct gss_msg_order **o, 
-			OM_uint32 flags, 
-			OM_uint32 seq_num, 
-			OM_uint32 jitter_window,
-			int use_64)
+_gssapi_msg_order_create(OM_uint32 *minor_status,
+			 struct gss_msg_order **o, 
+			 OM_uint32 flags, 
+			 OM_uint32 seq_num, 
+			 OM_uint32 jitter_window,
+			 int use_64)
 {
     size_t len;
 
@@ -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);
 }
diff --git a/lib/gssapi/test_sequence.c b/lib/gssapi/test_sequence.c
index e9f367c58..26d1d9ff3 100644
--- a/lib/gssapi/test_sequence.c
+++ b/lib/gssapi/test_sequence.c
@@ -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;
 }
diff --git a/lib/gssapi/unwrap.c b/lib/gssapi/unwrap.c
index 3984fa5f8..a87ff7b38 100644
--- a/lib/gssapi/unwrap.c
+++ b/lib/gssapi/unwrap.c
@@ -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);
diff --git a/lib/gssapi/verify_mic.c b/lib/gssapi/verify_mic.c
index 6708d97c2..e5ccb8317 100644
--- a/lib/gssapi/verify_mic.c
+++ b/lib/gssapi/verify_mic.c
@@ -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;