Address FIXMEs

Author: celskeggs

Os/File.cpp

@@ -237,8 +237,11 @@ File::Status File::incrementalCrc(FwSizeType& size) {
         status = this->read(this->m_crc_buffer, size, File::WaitType::NO_WAIT);
         if (OP_OK == status) {
             FW_ASSERT(size <= FW_FILE_CHUNK_SIZE, FwAssertArgType(size));
-            // FIXME: Use Utils::Hash wrapper instead of directly using CRC-32 implementation
-            this->m_crc = Utils::crc32_ieee802_3_update(this->m_crc_buffer, size, this->m_crc);
+            Utils::Hash hash;
+            hash.setHashValue(U32(~this->m_crc));
+            hash.update(this->m_crc_buffer, size);
+            U32 crc;
+            hash.finalize(crc) this->m_crc = ~crc;
         }
     }
     return status;

Os/test/ut/file/FileRules.cpp

@@ -80,18 +80,24 @@ void Os::Test::FileTest::Tester::shadow_flush() {
 }
 
 void Os::Test::FileTest::Tester::shadow_crc(U32& crc) {
+    Utils::Hash hash;
+    hash.setHashValue(U32(~this->m_independent_crc));
+    hash.update(this->m_crc_buffer, size);
+
     crc = this->m_independent_crc;
     SyntheticFileData& data = *reinterpret_cast<SyntheticFileData*>(this->m_shadow.getHandle());
 
     // Calculate CRC on full file starting at m_pointer
     for (FwSizeType i = data.m_pointer; i < data.m_data.size();
          i++, this->m_shadow.seek(1, Os::File::SeekType::RELATIVE)) {
-        // FIXME: Use Utils::Hash wrapper instead of directly using CRC-32 implementation
         U8 byte = data.m_data.at(i);
-        crc = Utils::crc32_ieee802_3_update(&byte, sizeof(byte), crc);
+        hash.update(&byte, sizeof(byte));
     }
     // Update tracking variables
-    this->m_independent_crc = Os::File::INITIAL_CRC;
+    U32 crcFinal;
+    hash.finalize(crcFinal);
+    crc = ~crcFinal;
+    this->m_independent_crc = crc;
 }
 
 void Os::Test::FileTest::Tester::shadow_partial_crc(FwSizeType& size) {
@@ -102,9 +108,16 @@ void Os::Test::FileTest::Tester::shadow_partial_crc(FwSizeType& size) {
         std::min(static_cast<FwSizeType>(data.m_pointer) + size, static_cast<FwSizeType>(data.m_data.size()));
     size = (data.m_pointer >= bound) ? 0 : static_cast<FwSizeType>(bound - data.m_pointer);
     for (FwSizeType i = data.m_pointer; i < bound; i++) {
-        // FIXME: Use Utils::Hash wrapper instead of directly using CRC-32 implementation
         U8 byte = data.m_data.at(i);
-        this->m_independent_crc = Utils::crc32_ieee802_3_update(&byte, sizeof(byte), this->m_independent_crc);
+
+        Utils::Hash hash;
+        hash.setHashValue(U32(~this->m_independent_crc));
+        hash.update(&byte, sizeof(byte));
+
+        U32 crcFinal;
+        hash.finalize(crcFinal);
+        this->m_independent_crc = ~crcFinal;
+
         this->m_shadow.seek(1, Os::File::SeekType::RELATIVE);
     }
 }

Svc/FpySequencer/test/ut/FpySequencerTester.cpp

@@ -650,7 +650,7 @@ void FpySequencerTester::tester_set_m_statementsDispatched(U64 val) {
 }
 
 void FpySequencerTester::tester_set_m_computedCRC(U32 crc) {
-    this->cmp.m_computedCRC.setHashValue(~crc);
+    this->cmp.m_computedCRC.setHashValue(U32(~crc));
 }
 
 // Get cmp member pointers

Svc/PrmDb/PrmDbImpl.cpp

@@ -138,7 +138,7 @@ void PrmDbImpl::PRM_SAVE_FILE_cmdHandler(FwOpcodeType opCode, U32 cmdSeq) {
     // write placeholder for the CRC
     Utils::Hash crc;
     FwSizeType writeSize = static_cast<FwSizeType>(HASH_DIGEST_LENGTH);
-    U32 crcInitial = ~0;
+    U32 crcInitial = U32(~0);
     stat = paramFile.write(reinterpret_cast<const U8*>(&crcInitial), writeSize, Os::File::WaitType::WAIT);
 
     if (stat != Os::File::OP_OK) {

Utils/Hash/Crc32/HashImpl.cpp

@@ -58,4 +58,8 @@ void Hash ::setHashValue(HashBuffer& value) {
     this->hash_handle = ~this->hash_handle;
 }
 
+void Hash ::setHashValue(U32 value) {
+    this->hash_handle = ~value;
+}
+
 }  // namespace Utils

Utils/Hash/Crc32/test/ut/Crc32Test.cpp

@@ -36,7 +36,7 @@ TEST(Crc32Test, testHelloWorld) {
 TEST(Crc32Test, testBinary) {
     U8 input[256];
     for (U32 i = 0; i < sizeof(input); i++) {
-        input[i] = i;
+        input[i] = U8(i);
     }
 
     Utils::HashBuffer hb;

Utils/Hash/Hash.hpp

@@ -62,6 +62,11 @@ class Hash {
     void setHashValue(HashBuffer& value  //! Hash value
     );
 
+    //! Set hash value to specified value
+    //!
+    void Hash ::setHashValue(U32 value  //! Hash value
+    );
+
     //! Update an incremental computation with new data
     //! \param data: pointer to start of data to add to hash calculation
     //! \param len: length of data to add to hash calculation