From 3a420d5c6cfded6a04f4c78aa98c5d4ae7de8ca1 Mon Sep 17 00:00:00 2001
From: Joey Castillo <joeycastillo@utexas.edu>
Date: Wed, 24 Nov 2021 12:14:17 -0500
Subject: add header guards, move declarations to source file

---
 movement/lib/TOTP-MCU/TOTP.h |  5 +++++
 movement/lib/TOTP-MCU/sha1.c | 16 +++++++++++++++-
 movement/lib/TOTP-MCU/sha1.h | 19 +++++--------------
 3 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/movement/lib/TOTP-MCU/TOTP.h b/movement/lib/TOTP-MCU/TOTP.h
index 13715f4d..cfef38b1 100644
--- a/movement/lib/TOTP-MCU/TOTP.h
+++ b/movement/lib/TOTP-MCU/TOTP.h
@@ -1,3 +1,6 @@
+#ifndef TOTP_H_
+#define TOTP_H_
+
 #include <inttypes.h>
 #include "time.h"
 
@@ -6,3 +9,5 @@ void setTimezone(uint8_t timezone);
 uint32_t getCodeFromTimestamp(uint32_t timeStamp);
 uint32_t getCodeFromTimeStruct(struct tm time);
 uint32_t getCodeFromSteps(uint32_t steps);
+
+#endif // TOTP_H_
diff --git a/movement/lib/TOTP-MCU/sha1.c b/movement/lib/TOTP-MCU/sha1.c
index 07ad697b..8e918e64 100644
--- a/movement/lib/TOTP-MCU/sha1.c
+++ b/movement/lib/TOTP-MCU/sha1.c
@@ -14,6 +14,20 @@ uint8_t sha1InitState[] = {
   0xf0,0xe1,0xd2,0xc3  // H4
 };
 
+union _buffer {
+  uint8_t b[BLOCK_LENGTH];
+  uint32_t w[BLOCK_LENGTH/4];
+} buffer;
+union _state {
+  uint8_t b[HASH_LENGTH];
+  uint32_t w[HASH_LENGTH/4];
+} state;
+
+uint8_t bufferOffset;
+uint32_t byteCount;
+uint8_t keyBuffer[BLOCK_LENGTH];
+uint8_t innerHash[HASH_LENGTH];
+
 void init(void) {
   memcpy(state.b,sha1InitState,HASH_LENGTH);
   byteCount = 0;
@@ -84,7 +98,7 @@ void writeArray(uint8_t *buffer, uint8_t size){
 }
 
 void pad() {
-  // Implement SHA-1 padding (fips180-2 ��5.1.1)
+  // Implement SHA-1 padding (fips180-2 ��5.1.1)
 
   // Pad with 0x80 followed by 0x00 until the end of the block
   addUncounted(0x80);
diff --git a/movement/lib/TOTP-MCU/sha1.h b/movement/lib/TOTP-MCU/sha1.h
index 2257e367..2db8fdf8 100644
--- a/movement/lib/TOTP-MCU/sha1.h
+++ b/movement/lib/TOTP-MCU/sha1.h
@@ -1,25 +1,16 @@
+#ifndef SHA1_H_
+#define SHA1_H_
+
 #include <inttypes.h>
 
 #define HASH_LENGTH 20
 #define BLOCK_LENGTH 64
 
-union _buffer {
-  uint8_t b[BLOCK_LENGTH];
-  uint32_t w[BLOCK_LENGTH/4];
-} buffer;
-union _state {
-  uint8_t b[HASH_LENGTH];
-  uint32_t w[HASH_LENGTH/4];
-} state;
-
-uint8_t bufferOffset;
-uint32_t byteCount;
-uint8_t keyBuffer[BLOCK_LENGTH];
-uint8_t innerHash[HASH_LENGTH];
-
 void init(void);
 void initHmac(const uint8_t* secret, uint8_t secretLength);
 uint8_t* result(void);
 uint8_t* resultHmac(void);
 void write(uint8_t);
 void writeArray(uint8_t *buffer, uint8_t size);
+
+#endif // SHA1_H
-- 
cgit v1.2.3