X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7838f4beba79370f94c7a3de2cf34278f5d481c8..7e735c1398b9c3643d292614db10c7e58c58db85:/armsrc/des.c

diff --git a/armsrc/des.c b/armsrc/des.c
index e72ebb2a..513f89bf 100644
--- a/armsrc/des.c
+++ b/armsrc/des.c
@@ -25,8 +25,8 @@
  * \license	 GPLv3 or later
  * 
  */
-#include <stdint.h>
-#include <string.h>
+
+#include "des.h"
 
 const uint8_t sbox[256]  = {
   /* S-box 1 */
@@ -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 */