X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/c068ebb78f2e4070fcf1a604df0d7088374b60c6..ea1c1ca6f88c4e9b1bcb75cd703f6be81df9b95c:/armsrc/des.c?ds=sidebyside

diff --git a/armsrc/des.c b/armsrc/des.c
index 172b3235..6b3bea9b 100644
--- a/armsrc/des.c
+++ b/armsrc/des.c
@@ -210,7 +210,7 @@ void permute(const uint8_t *ptable, const uint8_t *in, uint8_t *out){
 	for(byte=0; byte<ob; ++byte){
 		uint8_t x,t=0;
 		for(bit=0; bit<8; ++bit){
-			x=*ptable++ -1 ;
+			x = *ptable++ - 1;
 				t<<=1;
 			if((in[x/8]) & (0x80>>(x%8)) ){
 				t|=0x01;
@@ -274,7 +274,7 @@ uint32_t des_f(uint32_t r, uint8_t* kr){
 	uint64_t data;
 	uint8_t *sbp; /* sboxpointer */ 
 	permute((uint8_t*)e_permtab, (uint8_t*)&r, (uint8_t*)&data);
-	for(i=0; i<7; ++i)
+	for(i=0; i<6; ++i)
 		((uint8_t*)&data)[i] ^= kr[i];
 	
 	/* Sbox substitution */
@@ -409,7 +409,6 @@ void tdes_dec(void* out, void* in, const uint8_t* key){
 
 	uint8_t i;
 	unsigned char temp[8];
-
 	uint8_t* tin = (uint8_t*) in;
 	uint8_t* tout = (uint8_t*) out;
 	
@@ -432,6 +431,7 @@ void tdes_dec(void* out, void* in, const uint8_t* key){
 	}
  }
 
+
 /******************************************************************************/