FIX: 'LF PYRAMID' the crc8_MAXIM and crc16_DNP was calling the wrong crc method....

[proxmark3-svn] / client / util.c

diff --git a/client/util.c b/client/util.c
index a520245867a935abc1dc75f9acf2e35955bf8011..a6ba8e81d16622d951f0e15a7684fdfa4f5ac9a9 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -63,7 +63,10 @@ void AddLogLine(char *file, char *extData, char *c) {
        fprintf(f, "%s", extData);
        fprintf(f, "%s\n", c);
        fflush(f);
-       fclose(f);
+       if (f) {
+               fclose(f);
+               f = NULL;
+       }
 }
 
 void AddLogHex(char *fileName, char *extData, const uint8_t * data, const size_t len){
@@ -221,7 +224,7 @@ void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest) {
 // hh,gg,ff,ee,dd,cc,bb,aa, pp,oo,nn,mm,ll,kk,jj,ii
 // up to 64 bytes or 512 bits
 uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize){
-       uint8_t buf[64];
+       static uint8_t buf[64];
        memset(buf, 0x00, 64);
        uint8_t *tmp = buf;
        for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){
@@ -229,7 +232,7 @@ uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockS
                        tmp[i+(blockSize*block)] = src[(blockSize-1-i)+(blockSize*block)];
                }
        }
-       return tmp;
+       return buf;
 }
 
 // takes a uint8_t src array, for len items and reverses the byte order in blocksizes (8,16,32,64), 
@@ -280,7 +283,6 @@ int param_getptr(const char *line, int *bg, int *en, int paramnum)
        return 0;
 }
 
-
 char param_getchar(const char *line, int paramnum)
 {
        int bg, en;
@@ -566,3 +568,12 @@ uint32_t reflect(uint32_t v, int b) {
        }
        return v;
 }
+
+uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor) {
+   uint64_t remainder=0, quotient=0, result=0;
+   remainder = num % divider;
+   quotient = num / divider;
+   if(!(quotient == 0 && remainder == 0))
+   result += HornerScheme(quotient, divider, factor) * factor + remainder;
+   return result;
+}
\ No newline at end of file