FIX: @aczid's fix https://github.com/aczid/crypto1_bs/commit/957702be9c89f31a184971...

[proxmark3-svn] / armsrc / des.c

diff --git a/armsrc/des.c b/armsrc/des.c
index 172b32358dbf38aa96f30a25dcd0e118105d1634..6b3bea9b77ed5f14f0b181aa625f2ddd597fcfca 100644 (file)
--- 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){
        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;
                                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);
        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 */
                ((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 i;
        unsigned char temp[8];

-

        uint8_t* tin = (uint8_t*) in;
        uint8_t* tout = (uint8_t*) out;
        
        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){
        }
  }
 
        }
  }
 

+

 /******************************************************************************/
 
 
 /******************************************************************************/