projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix headers
[proxmark3-svn]
/
armsrc
/
des.c
diff --git
a/armsrc/des.c
b/armsrc/des.c
index a81df9c8d4234c7bd2bd5432b0a503f9a1c6ba36..9bfd10905f11a28706ce5746910719596a97fe08 100644
(file)
--- a/
armsrc/des.c
+++ b/
armsrc/des.c
@@
-26,7
+26,7
@@
*
*/
#include <stdint.h>
*
*/
#include <stdint.h>
-#include
<string.h>
+#include
"string.h"
const uint8_t sbox[256] = {
/* S-box 1 */
const uint8_t sbox[256] = {
/* S-box 1 */
@@
-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 */
Impressum
,
Datenschutz