Kerberos: remove debug logs when loading a keytab

Bug: 10543
Change-Id: I9ea20cd4d046cc072c21fd3f87f6d6be40b08b27
Reviewed-on: https://code.wireshark.org/review/4567
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>

2 files changed, 3 insertions, 13 deletions

diff --git a/asn1/kerberos/packet-kerberos-template.c b/asn1/kerberos/packet-kerberos-template.c
index 9eb82ab37f..24a21ef380 100644
--- a/asn1/kerberos/packet-kerberos-template.c
+++ b/asn1/kerberos/packet-kerberos-template.c
@@ -257,7 +257,6 @@ add_encryption_key(packet_info *pinfo, int keytype, int keylength, const char *k
 	if(pinfo->fd->flags.visited){
 		return;
 	}
-printf("added key in %u    keytype:%d len:%d\n",pinfo->fd->num, keytype, keylength);
 
 	new_key=(enc_key_t *)g_malloc(sizeof(enc_key_t));
 	g_snprintf(new_key->key_origin, KRB_MAX_ORIG_LEN, "%s learnt from frame %u",origin,pinfo->fd->num);
@@ -339,7 +338,6 @@ read_keytab_file(const char *filename)
 			pos+=MIN(KRB_MAX_ORIG_LEN-(pos-new_key->key_origin),
 					 g_snprintf(pos, KRB_MAX_ORIG_LEN-(pos-new_key->key_origin), "@%s",key.principal->realm.data));
 			*pos=0;
-/*printf("added key for principal :%s\n", new_key->key_origin);*/
 			new_key->keytype=key.key.enctype;
 			new_key->keylength=key.key.length;
 			new_key->keyvalue=(char *)g_memdup(key.key.contents, key.key.length);
@@ -593,7 +591,6 @@ add_encryption_key(packet_info *pinfo, int keytype, int keylength, const char *k
 	if(pinfo->fd->flags.visited){
 		return;
 	}
-printf("added key in %u\n",pinfo->fd->num);
 
 	new_key = g_malloc(sizeof(service_key_t));
 	new_key->kvno = 0;
@@ -660,7 +657,6 @@ read_keytab_file(const char *service_key_file)
 			service_key_list = g_slist_append(service_key_list, (gpointer) sk);
 			fseek(skf, newline_skip, SEEK_CUR);
 			count++;
-g_warning("added key: %s", sk->origin);
 		}
 		fclose(skf);
 	}
@@ -754,7 +750,6 @@ decrypt_krb5_data(proto_tree *tree, packet_info *pinfo,
 		md5_finish(&md5s, digest);
 
 		if (tvb_memeql (encr_tvb, 8, digest, 16) == 0) {
-g_warning("woohoo decrypted keytype:%d in frame:%u\n", keytype, pinfo->fd->num);
 			plaintext = g_malloc(data_len);
 			tvb_memcpy(encr_tvb, plaintext, CONFOUNDER_PLUS_CHECKSUM, data_len);
 			tvb_free(encr_tvb);
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
index f7720fd90d..6912d0d59e 100644
--- a/epan/dissectors/packet-kerberos.c
+++ b/epan/dissectors/packet-kerberos.c
@@ -508,7 +508,6 @@ add_encryption_key(packet_info *pinfo, int keytype, int keylength, const char *k
 	if(pinfo->fd->flags.visited){
 		return;
 	}
-printf("added key in %u    keytype:%d len:%d\n",pinfo->fd->num, keytype, keylength);
 
 	new_key=(enc_key_t *)g_malloc(sizeof(enc_key_t));
 	g_snprintf(new_key->key_origin, KRB_MAX_ORIG_LEN, "%s learnt from frame %u",origin,pinfo->fd->num);
@@ -590,7 +589,6 @@ read_keytab_file(const char *filename)
 			pos+=MIN(KRB_MAX_ORIG_LEN-(pos-new_key->key_origin),
 					 g_snprintf(pos, KRB_MAX_ORIG_LEN-(pos-new_key->key_origin), "@%s",key.principal->realm.data));
 			*pos=0;
-/*printf("added key for principal :%s\n", new_key->key_origin);*/
 			new_key->keytype=key.key.enctype;
 			new_key->keylength=key.key.length;
 			new_key->keyvalue=(char *)g_memdup(key.key.contents, key.key.length);
@@ -844,7 +842,6 @@ add_encryption_key(packet_info *pinfo, int keytype, int keylength, const char *k
 	if(pinfo->fd->flags.visited){
 		return;
 	}
-printf("added key in %u\n",pinfo->fd->num);
 
 	new_key = g_malloc(sizeof(service_key_t));
 	new_key->kvno = 0;
@@ -911,7 +908,6 @@ read_keytab_file(const char *service_key_file)
 			service_key_list = g_slist_append(service_key_list, (gpointer) sk);
 			fseek(skf, newline_skip, SEEK_CUR);
 			count++;
-g_warning("added key: %s", sk->origin);
 		}
 		fclose(skf);
 	}
@@ -1005,7 +1001,6 @@ decrypt_krb5_data(proto_tree *tree, packet_info *pinfo,
 		md5_finish(&md5s, digest);
 
 		if (tvb_memeql (encr_tvb, 8, digest, 16) == 0) {
-g_warning("woohoo decrypted keytype:%d in frame:%u\n", keytype, pinfo->fd->num);
 			plaintext = g_malloc(data_len);
 			tvb_memcpy(encr_tvb, plaintext, CONFOUNDER_PLUS_CHECKSUM, data_len);
 			tvb_free(encr_tvb);
@@ -3917,7 +3912,7 @@ dissect_kerberos_ChangePasswdData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 
 
 /*--- End of included file: packet-kerberos-fn.c ---*/
-#line 1660 "../../asn1/kerberos/packet-kerberos-template.c"
+#line 1655 "../../asn1/kerberos/packet-kerberos-template.c"
 
 /* Make wrappers around exported functions for now */
 int
@@ -4871,7 +4866,7 @@ void proto_register_kerberos(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-kerberos-hfarr.c ---*/
-#line 1957 "../../asn1/kerberos/packet-kerberos-template.c"
+#line 1952 "../../asn1/kerberos/packet-kerberos-template.c"
 	};
 
 	/* List of subtrees */
@@ -4936,7 +4931,7 @@ void proto_register_kerberos(void) {
     &ett_kerberos_ChangePasswdData,
 
 /*--- End of included file: packet-kerberos-ettarr.c ---*/
-#line 1964 "../../asn1/kerberos/packet-kerberos-template.c"
+#line 1959 "../../asn1/kerberos/packet-kerberos-template.c"
 	};
 
 	static ei_register_info ei[] = {