svn rev #21583: branches/mskrb-integ/src/lib/gssapi/ generic/ krb5/

[lhoward@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=21583
Commit By: lhoward
Log Message:
s/GSS_C_INQ_SESSION_KEY/GSS_C_INQ_SSPI_SESSION_KEY/


Changed Files:
U   branches/mskrb-integ/src/lib/gssapi/generic/gssapi_ext.h
U   branches/mskrb-integ/src/lib/gssapi/generic/gssapi_generic.c
U   branches/mskrb-integ/src/lib/gssapi/krb5/gssapiP_krb5.h
U   branches/mskrb-integ/src/lib/gssapi/krb5/krb5_gss_glue.c
U   branches/mskrb-integ/src/lib/gssapi/libgssapi_krb5.exports
Modified: branches/mskrb-integ/src/lib/gssapi/generic/gssapi_ext.h
===================================================================
--- branches/mskrb-integ/src/lib/gssapi/generic/gssapi_ext.h	2008-12-24 00:41:02 UTC (rev 21582)
+++ branches/mskrb-integ/src/lib/gssapi/generic/gssapi_ext.h	2008-12-24 03:32:57 UTC (rev 21583)
@@ -136,7 +136,7 @@
  * session key for SSPI compatibility. The optional second
  * member contains an OID identifying the session key type.
  */
-GSS_DLLIMP extern gss_OID GSS_C_INQ_SESSION_KEY;
+GSS_DLLIMP extern gss_OID GSS_C_INQ_SSPI_SESSION_KEY;
 
 OM_uint32 KRB5_CALLCONV gss_complete_auth_token
 	(OM_uint32 *minor_status,

Modified: branches/mskrb-integ/src/lib/gssapi/generic/gssapi_generic.c
===================================================================
--- branches/mskrb-integ/src/lib/gssapi/generic/gssapi_generic.c	2008-12-24 00:41:02 UTC (rev 21582)
+++ branches/mskrb-integ/src/lib/gssapi/generic/gssapi_generic.c	2008-12-24 03:32:57 UTC (rev 21583)
@@ -120,7 +120,7 @@
      * to that gss_OID_desc.
      */
 
-    /* GSS_C_INQ_SESSION_KEY 1.2.840.113554.1.2.2.5.5 */
+    /* GSS_C_INQ_SSPI_SESSION_KEY 1.2.840.113554.1.2.2.5.5 */
     {11, (void *)"\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x05\x05"},
 };
 
@@ -151,5 +151,5 @@
 GSS_DLLIMP gss_OID GSS_C_NT_EXPORT_NAME         = oids+6;
 gss_OID gss_nt_exported_name                    = oids+6;
 
-GSS_DLLIMP gss_OID GSS_C_INQ_SESSION_KEY	= oids+7;
+GSS_DLLIMP gss_OID GSS_C_INQ_SSPI_SESSION_KEY	= oids+7;
 

Modified: branches/mskrb-integ/src/lib/gssapi/krb5/gssapiP_krb5.h
===================================================================
--- branches/mskrb-integ/src/lib/gssapi/krb5/gssapiP_krb5.h	2008-12-24 00:41:02 UTC (rev 21582)
+++ branches/mskrb-integ/src/lib/gssapi/krb5/gssapiP_krb5.h	2008-12-24 03:32:57 UTC (rev 21583)
@@ -914,8 +914,8 @@
 gss_krb5int_set_cred_alias(OM_uint32 *, const gss_ctx_id_t, const gss_OID, gss_buffer_set_t *);
 #endif
 
-#define GSS_KRB5_INQ_SESSION_KEY_OID_LENGTH 11
-#define GSS_KRB5_INQ_SESSION_KEY_OID "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x05\x05"
+#define GSS_KRB5_INQ_SSPI_SESSION_KEY_OID_LENGTH 11
+#define GSS_KRB5_INQ_SSPI_SESSION_KEY_OID "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x05\x05"
 
 OM_uint32
 gss_krb5int_inq_session_key(OM_uint32 *, const gss_ctx_id_t, const gss_OID, gss_buffer_set_t *);

Modified: branches/mskrb-integ/src/lib/gssapi/krb5/krb5_gss_glue.c
===================================================================
--- branches/mskrb-integ/src/lib/gssapi/krb5/krb5_gss_glue.c	2008-12-24 00:41:02 UTC (rev 21582)
+++ branches/mskrb-integ/src/lib/gssapi/krb5/krb5_gss_glue.c	2008-12-24 03:32:57 UTC (rev 21583)
@@ -75,7 +75,7 @@
 	gss_krb5int_extract_authz_data_from_sec_context
     },
     {
-	{GSS_KRB5_INQ_SESSION_KEY_OID_LENGTH, GSS_KRB5_INQ_SESSION_KEY_OID},
+	{GSS_KRB5_INQ_SSPI_SESSION_KEY_OID_LENGTH, GSS_KRB5_INQ_SSPI_SESSION_KEY_OID},
 	gss_krb5int_inq_session_key
     },
     {

Modified: branches/mskrb-integ/src/lib/gssapi/libgssapi_krb5.exports
===================================================================
--- branches/mskrb-integ/src/lib/gssapi/libgssapi_krb5.exports	2008-12-24 00:41:02 UTC (rev 21582)
+++ branches/mskrb-integ/src/lib/gssapi/libgssapi_krb5.exports	2008-12-24 03:32:57 UTC (rev 21583)
@@ -1,4 +1,4 @@
-GSS_C_INQ_SESSION_KEY
+GSS_C_INQ_SSPI_SESSION_KEY
 GSS_C_NT_ANONYMOUS
 GSS_C_NT_EXPORT_NAME
 GSS_C_NT_HOSTBASED_SERVICE