static analysis: make __write static to avoid confusion

diff --git a/movement/lib/TOTP-MCU/sha1.c b/movement/lib/TOTP-MCU/sha1.c
index 21a24fa55155be58f7cdd95fe20f294575fc75fb..3dc02190a26ac87edc6ee91c464e07845c407f34 100644 (file)
--- a/movement/lib/TOTP-MCU/sha1.c
+++ b/movement/lib/TOTP-MCU/sha1.c
@@ -84,7 +84,7 @@ static void addUncounted(uint8_t data) {
   }\r
 }\r
 \r
-void write(uint8_t data) {\r
+static void __write(uint8_t data) {\r
   ++byteCount;\r
   addUncounted(data);\r
 \r
@@ -93,7 +93,7 @@ void write(uint8_t data) {
 \r
 void writeArray(uint8_t *buffer, uint8_t size){\r
     while (size--) {\r
-        write(*buffer++);\r
+        __write(*buffer++);\r
     }\r
 }\r
 \r
@@ -144,7 +144,7 @@ void initHmac(const uint8_t* key, uint8_t keyLength) {
   if (keyLength > BLOCK_LENGTH) {\r
     // Hash long keys\r
     init();\r
-    for (;keyLength--;) write(*key++);\r
+    for (;keyLength--;) __write(*key++);\r
     memcpy(keyBuffer,result(),HASH_LENGTH);\r
   } else {\r
     // Block length keys are used as is\r
@@ -153,7 +153,7 @@ void initHmac(const uint8_t* key, uint8_t keyLength) {
   // Start inner hash\r
   init();\r
   for (i=0; i<BLOCK_LENGTH; i++) {\r
-    write(keyBuffer[i] ^ HMAC_IPAD);\r
+    __write(keyBuffer[i] ^ HMAC_IPAD);\r
   }\r
 }\r
 \r
@@ -163,7 +163,7 @@ uint8_t* resultHmac(void) {
   memcpy(innerHash,result(),HASH_LENGTH);\r
   // Calculate outer hash\r
   init();\r
-  for (i=0; i<BLOCK_LENGTH; i++) write(keyBuffer[i] ^ HMAC_OPAD);\r
-  for (i=0; i<HASH_LENGTH; i++) write(innerHash[i]);\r
+  for (i=0; i<BLOCK_LENGTH; i++) __write(keyBuffer[i] ^ HMAC_OPAD);\r
+  for (i=0; i<HASH_LENGTH; i++) __write(innerHash[i]);\r
   return result();\r
 }\r

diff --git a/movement/lib/TOTP-MCU/sha1.h b/movement/lib/TOTP-MCU/sha1.h
index 2db8fdf8b07c61b56102ae5cffb3b95641d0722d..bd689c34e659cdec440fa36d15487bb6f7f657ef 100644 (file)
--- a/movement/lib/TOTP-MCU/sha1.h
+++ b/movement/lib/TOTP-MCU/sha1.h
@@ -10,7 +10,6 @@ void init(void);
 void initHmac(const uint8_t* secret, uint8_t secretLength);\r
 uint8_t* result(void);\r
 uint8_t* resultHmac(void);\r
-void write(uint8_t);\r
 void writeArray(uint8_t *buffer, uint8_t size);\r
 \r
 #endif // SHA1_H\r