X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/f9e1816b95a56d5663ec8957fafe16986ddccd9e..refs/pull/566/head:/common/protocols.c?ds=sidebyside

diff --git a/common/protocols.c b/common/protocols.c
index 0d95cf08..795f3eaa 100644
--- a/common/protocols.c
+++ b/common/protocols.c
@@ -1,4 +1,3 @@
-#include <strings.h>
 #include <string.h>
 #include <stdint.h>
 #include <stdarg.h>
@@ -63,23 +62,23 @@ uint8_t notset(uint8_t val, uint8_t mask) {
 void fuse_config(const picopass_hdr *hdr) {
 	uint8_t fuses = hdr->conf.fuses;
 
-	if (isset(fuses,FUSE_FPERS))prnt("	Mode: Personalization [Programmable]");
-	else prnt("	Mode: Application [Locked]");
+	if (isset(fuses,FUSE_FPERS))prnt("  Mode: Personalization [Programmable]");
+	else prnt("  Mode: Application [Locked]");
 
 	if (isset(fuses, FUSE_CODING1))
-		prnt("	Coding: RFU");
+		prnt("Coding: RFU");
 	else
 	{
-		if( isset( fuses , FUSE_CODING0)) prnt("	Coding: ISO 14443-2 B/ISO 15693");
-		else prnt("	Coding: ISO 14443B only");
+		if( isset( fuses , FUSE_CODING0)) prnt("Coding: ISO 14443-2 B/ISO 15693");
+		else prnt("Coding: ISO 14443B only");
 	}
-	if( isset (fuses,FUSE_CRYPT1 | FUSE_CRYPT0 )) prnt("	Crypt: Secured page, keys not locked");
-	if( isset (fuses,FUSE_CRYPT1) && notset( fuses, FUSE_CRYPT0 )) prnt("	Crypt: Secured page, keys not locked");
-	if( notset (fuses,FUSE_CRYPT1) && isset( fuses, FUSE_CRYPT0 )) prnt("	Crypt: Non secured page");
-	if( notset (fuses,FUSE_CRYPT1) && notset( fuses, FUSE_CRYPT0 )) prnt("	Crypt: No auth possible. Read only if RA is enabled");
+	if( isset (fuses,FUSE_CRYPT1 | FUSE_CRYPT0 )) prnt(" Crypt: Secured page, keys not locked");
+	if( isset (fuses,FUSE_CRYPT1) && notset( fuses, FUSE_CRYPT0 )) prnt(" Crypt: Secured page, keys not locked");
+	if( notset (fuses,FUSE_CRYPT1) && isset( fuses, FUSE_CRYPT0 )) prnt(" Crypt: Non secured page");
+	if( notset (fuses,FUSE_CRYPT1) && notset( fuses, FUSE_CRYPT0 )) prnt(" Crypt: No auth possible. Read only if RA is enabled");
 
-	if( isset( fuses, FUSE_RA)) prnt("	RA: Read access enabled");
-	else prnt("	RA: Read access not enabled");
+	if( isset( fuses, FUSE_RA)) prnt("    RA: Read access enabled");
+	else prnt("    RA: Read access not enabled");
 }
 
 void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *app_areas, uint8_t *kb) {
@@ -120,9 +119,9 @@ void mem_app_config(const picopass_hdr *hdr) {
 	uint8_t app_areas = 2;
 	uint8_t max_blk = 31;
 	getMemConfig(mem, chip, &max_blk, &app_areas, &kb);
-	prnt("  Mem: %u KBits/%u App Areas (%u * 8 bytes) [%02X]", kb, app_areas, max_blk, mem);
-	prnt("	AA1: blocks 06-%02X", applimit);
-	prnt("	AA2: blocks %02X-%02X", applimit+1, max_blk);
+	prnt("   Mem: %u KBits/%u App Areas (%u * 8 bytes) [%02X]", kb, app_areas, max_blk, mem);
+	prnt("   AA1: blocks 06-%02X", applimit);
+	prnt("   AA2: blocks %02X-%02X", applimit+1, max_blk);
 }
 void print_picopass_info(const picopass_hdr *hdr) {
 	fuse_config(hdr);