projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CHG: syntax suger
[proxmark3-svn]
/
armsrc
/
des.c
diff --git
a/armsrc/des.c
b/armsrc/des.c
index 172b32358dbf38aa96f30a25dcd0e118105d1634..1ff041843e60aadbda8e65148562d765373d4cc3 100644
(file)
--- a/
armsrc/des.c
+++ b/
armsrc/des.c
@@
-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){
}
}
}
}
+
/******************************************************************************/
/******************************************************************************/
Impressum
,
Datenschutz