move one function only used by SPNEGO to packet-spnego.c

remove the include of <epan/asn1.h> from kerberos, ntlmssp and gssapi since they no longer need to include that file.



git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@14709 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 1 insertions, 34 deletions

diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c
index 01c6f26b86..1e5f244ef4 100644
--- a/epan/dissectors/packet-gssapi.c
+++ b/epan/dissectors/packet-gssapi.c
@@ -38,8 +38,6 @@
 #include <glib.h>
 #include <epan/packet.h>
 
-#include <epan/asn1.h>    /* for subid_t */
-#include "format-oid.h"
 #include <epan/dissectors/packet-dcerpc.h>
 #include <epan/dissectors/packet-gssapi.h>
 #include <epan/dissectors/packet-frame.h>
@@ -98,37 +96,6 @@ gssapi_init_oid(char *oid, int proto, int ett, dissector_handle_t handle,
 }
 
 /*
- * This takes an OID in binary form, not an OID as a text string, as
- * an argument.
- */
-gssapi_oid_value *
-gssapi_lookup_oid(subid_t *oid, guint oid_len)
-{
-	gchar *oid_key;
-	gchar *p;
-	unsigned int i;
-	int len;
-	gssapi_oid_value *value;
-
-	/*
-	 * Convert the OID to a string, as text strings are used as
-	 * keys in the OID hash table.
-	 */
-	oid_key = g_malloc(oid_len * 22 + 1);
-	p = oid_key;
-	len = sprintf(p, "%lu", (unsigned long)oid[0]);
-	p += len;
-	for (i = 1; i < oid_len;i++) {
-		len = sprintf(p, ".%lu", (unsigned long)oid[i]);
-		p += len;
-	}
-
-	value = g_hash_table_lookup(gssapi_oids, oid_key);
-	g_free(oid_key);
-	return value;
-}
-
-/*
  * This takes an OID in text string form as
  * an argument.
  */
@@ -385,7 +352,7 @@ proto_register_gssapi(void)
 	};
 
 	proto_gssapi = proto_register_protocol(
-		"Generic Security Service Application Program Interface",
+		"GSS-API Generic Security Service Application Program Interface",
 		"GSS-API", "gss-api");
 
 	proto_register_field_array(proto_gssapi, hf, array_length(hf));