Changeset 3999

Timestamp:

11/26/10 13:20:01 (10 years ago)

Author:

schlocke

Message:

cccam: added rc6 support

Location:

trunk

Files:

• cscrypt/rc6.c (modified) (1 diff)
• cscrypt/rc6.h (modified) (1 diff)
• module-cccam.c (modified) (1 diff)

trunk/cscrypt/rc6.c

@@ -20 +20 @@
 #include "rc6.h"
 
+#define w 32    /* word size in bits */
+#define r 20    /* based on security estimates */
+
+#define P32 0xB7E15163  /* Magic constants for key setup */
+#define Q32 0x9E3779B9
+
+/* derived constants */
+#define bytes   (w / 8)                         /* bytes per word */
+#define c       ((b + bytes - 1) / bytes)       /* key in words, rounded up */
+#define R24     (2 * r + 4)
+#define lgw     5                               /* log2(w) -- wussed out */
+
 /* Rotations */
 #define ROTL(x,y) (((x)<<((y)&(w-1))) | ((x)>>(w-((y)&(w-1)))))

trunk/cscrypt/rc6.h

@@ -22 +22 @@
  */
    
-#define w 32    /* word size in bits */
-#define r 20    /* based on security estimates */
-   
-#define P32 0xB7E15163  /* Magic constants for key setup */
-#define Q32 0x9E3779B9
-   
-/* derived constants */
-#define bytes   (w / 8)                         /* bytes per word */
-#define c       ((b + bytes - 1) / bytes)       /* key in words, rounded up */
-#define R24     (2 * r + 4)
-#define lgw     5                               /* log2(w) -- wussed out */
-   
-#define rc6keylen R24 - 1                      /* Key schedule */
+#define rc6keylen 43
 
 typedef unsigned int RC6KEY[rc6keylen];

trunk/module-cccam.c

@@ -6 +6 @@
 #include "reader-common.h"
 #include <poll.h>
+#include "cscrypt/rc6.h"
 
 extern int pthread_mutexattr_settype(pthread_mutexattr_t *__attr, int __kind); //Needs extern defined???