From c9ca6d1be6f2fd3be7a9ab06dfad7fda91fa537c Mon Sep 17 00:00:00 2001
From: schneider <schneider@blinkenlichts.net>
Date: Sun, 17 Jul 2011 20:34:59 +0200
Subject: [PATCH] removed broken xxtea byte level routines

---
 firmware/basic/xxtea.c | 80 ------------------------------------------
 firmware/basic/xxtea.h |  6 ----
 2 files changed, 86 deletions(-)

diff --git a/firmware/basic/xxtea.c b/firmware/basic/xxtea.c
index 306c72b..d126793 100644
--- a/firmware/basic/xxtea.c
+++ b/firmware/basic/xxtea.c
@@ -14,86 +14,6 @@
 #define MX (((z>>5^y<<2) + (y>>3^z<<4)) ^ ((sum^y) + (k[(p&3)^e] ^ z)))
 #include "xxtea.h"
 
-uint32_t charp2uint32(uint8_t *data, uint8_t bytes)
-{
-    uint32_t r = 0;
-    if( bytes ){
-        r |= *data++;
-    }
-    if( bytes > 1){
-        r<<=8;
-        r |= *data++;
-    }
-    if( bytes > 2){
-        r<<=8;
-        r |= *data++;
-    }
-    if( bytes > 3){
-        r<<=8;
-        r |= *data++;
-    }
-    return r;
-}
-
-void charp2uint32p(uint8_t* data, uint8_t  n, uint32_t *v)
-{
-    int i,j=0;
-    int fullwords = n/4;
-    for(i=0; i<fullwords*4; i+=4){
-        v[j++] = charp2uint32(data+i,4);
-    }
-    
-    uint8_t extrabytes = n - i;
-    v[j] = charp2uint32(data+i,extrabytes);
-}
-
-void uint322charp(uint32_t data, uint8_t *buf, uint8_t bytes)
-{
-    if( bytes )
-        buf[0] = data>>24;
-    if( bytes > 1)
-        buf[1] = (data>>16)&0xFF;
-    if( bytes > 2)
-        buf[2] = (data>>8)&0xFF;
-    if( bytes > 3)
-        buf[3] = (data>>0)&0xFF;
-}
-
-void uint32p2charp(uint8_t* data, uint8_t  n, uint32_t *v)
-{
-    int i;
-    int fullwords = n/4;
-    
-    for(i=0; i<fullwords; i++){
-        uint322charp(v[i],data+i*4,4);
-    }
-    
-    uint8_t extrabytes = n - fullwords*4;
-    uint322charp(v[i],data+i*4,extrabytes);
-}
-
-void xxtea_encode(uint8_t *data, int n, uint32_t const k[4])
-{
-    uint32_t v[8];      //maximum 32 bytes
-    int words = (n+3)/4;
-    if( words > 8 )
-        return;
-    charp2uint32p(data, n, v);
-    xxtea_encode_words(v, words, k);
-    uint32p2charp(data, n, v);
-}
-
-void xxtea_decode(uint8_t *data, int n, uint32_t const k[4])
-{
-    uint32_t v[8];      //maximum 32 bytes
-    int words = (n+3)/4;
-    if( words > 8 )
-        return;
-    charp2uint32p(data, n, v);
-    xxtea_decode_words(v, words, k);
-    uint32p2charp(data, n, v);
-}
- 
 void xxtea_encode_words(uint32_t *v, int n, uint32_t const k[4])
 {
     if(k[0] == 0 && k[1] == 0 && k[2] == 0 && k[3] == 0) return;
diff --git a/firmware/basic/xxtea.h b/firmware/basic/xxtea.h
index 1718308..e8b99c9 100644
--- a/firmware/basic/xxtea.h
+++ b/firmware/basic/xxtea.h
@@ -1,12 +1,6 @@
 #ifndef _XXTEA_H_
 #define _XXTEA_H_
 
-uint32_t charp2uint32(uint8_t *data, uint8_t bytes);
-void charp2uint32p(uint8_t* data, uint8_t  n, uint32_t *v);
-void uint322charp(uint32_t data, uint8_t *buf, uint8_t bytes);
-void uint32p2charp(uint8_t* data, uint8_t  n, uint32_t *v);
-void xxtea_encode(uint8_t *data, int n, uint32_t const k[4]);
-void xxtea_decode(uint8_t *v, int n, uint32_t const k[4]);
 void xxtea_encode_words(uint32_t *v, int n, uint32_t const k[4]);
 void xxtea_decode_words(uint32_t *v, int n, uint32_t const k[4]);