gssapi_krb5.c: Rearrange OID's so that the V1V2 mechanism set returns

	all three mechanism ID's recognized by this implementation, with the
	RFC1964 OID first (and thus preferred).

import_sec_context.c (krb5_gss_convert_static_mech_oid): Make the old
	convert_static_oid() function globally accessible with a namespace
	compliant name, since init_sec_context() needs to be able to use this
	function.

indicate_mechs.c (krb5_gss_indicate_mechs): Return the v1v2 mechanism
	set OID, since we should return all the mechanisms that we support.

init_sec_context.c (krb5_gss_init_sec_context): Make ctx->mech_used
	use a static OID, since it is returned by gss_inquire_context which
	must return a static OID.

wrap_size_limit.c (krb5_gss_wrap_size_limit): Fix bug where we would
	overestimate the size of the allowable input message by one byte,
	because we weren't passing the right estimate of the wrapped data to
	g_token_size().

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11315 dc483132-0cff-0310-8789-dd5450dbe970

1 files changed, 13 insertions, 15 deletions

diff --git a/src/lib/gssapi/krb5/gssapi_krb5.c b/src/lib/gssapi/krb5/gssapi_krb5.c
index aaa47ea..e700bb8 100644
--- a/src/lib/gssapi/krb5/gssapi_krb5.c
+++ b/src/lib/gssapi/krb5/gssapi_krb5.c
@@ -83,36 +83,34 @@
  */
 
 const gss_OID_desc krb5_gss_oid_array[] = {
-   /* this is the unofficial, wrong OID */
-   {5, "\053\005\001\005\002"},
    /* this is the official, rfc-specified OID */
    {9, "\052\206\110\206\367\022\001\002\002"},
+   /* this is the unofficial, wrong OID */
+   {5, "\053\005\001\005\002"},
+   /* this is the v2 assigned OID */
+   {9, "\052\206\110\206\367\022\001\002\003"},
    /* these two are name type OID's */
    {10, "\052\206\110\206\367\022\001\002\002\001"},
    {10, "\052\206\110\206\367\022\001\002\002\002"},
-   /* this is the v2 assigned OID */
-   {9, "\052\206\110\206\367\022\001\002\003"},
-   /* this is the official, rfc-specified OID again */
-   {9, "\052\206\110\206\367\022\001\002\002"},
    { 0, 0 }
 };
 
-const gss_OID_desc * const gss_mech_krb5_old = krb5_gss_oid_array+0;
-const gss_OID_desc * const gss_mech_krb5 = krb5_gss_oid_array+1;
-const gss_OID_desc * const gss_nt_krb5_name = krb5_gss_oid_array+2;
-const gss_OID_desc * const gss_nt_krb5_principal = krb5_gss_oid_array+3;
-const gss_OID_desc * const gss_mech_krb5_v2 = krb5_gss_oid_array+4;
+const gss_OID_desc * const gss_mech_krb5 = krb5_gss_oid_array+0;
+const gss_OID_desc * const gss_mech_krb5_old = krb5_gss_oid_array+1;
+const gss_OID_desc * const gss_mech_krb5_v2 = krb5_gss_oid_array+2;
+const gss_OID_desc * const gss_nt_krb5_name = krb5_gss_oid_array+3;
+const gss_OID_desc * const gss_nt_krb5_principal = krb5_gss_oid_array+4;
 
 static const gss_OID_set_desc oidsets[] = {
    {1, (gss_OID) krb5_gss_oid_array+0},
    {1, (gss_OID) krb5_gss_oid_array+1},
    {2, (gss_OID) krb5_gss_oid_array+0},
-   {1, (gss_OID) krb5_gss_oid_array+4},
-   {2, (gss_OID) krb5_gss_oid_array+4},
+   {1, (gss_OID) krb5_gss_oid_array+2},
+   {3, (gss_OID) krb5_gss_oid_array+0},
 };
 
-const gss_OID_set_desc * const gss_mech_set_krb5_old = oidsets+0;
-const gss_OID_set_desc * const gss_mech_set_krb5 = oidsets+1;
+const gss_OID_set_desc * const gss_mech_set_krb5 = oidsets+0;
+const gss_OID_set_desc * const gss_mech_set_krb5_old = oidsets+1;
 const gss_OID_set_desc * const gss_mech_set_krb5_both = oidsets+2;
 const gss_OID_set_desc * const gss_mech_set_krb5_v2 = oidsets+3;
 const gss_OID_set_desc * const gss_mech_set_krb5_v1v2 = oidsets+4;