Merge pull request #5 from cwood/4039-chris-hash_names

Glenn Scott · Glenn Scott · commit 8d450207d95a · 2016-06-15T13:32:10.000-07:00
Rename PARCCryptoHashType enum values
diff --git a/ccnx/forwarder/metis/tlv/metis_TlvSchemaV0.c b/ccnx/forwarder/metis/tlv/metis_TlvSchemaV0.c
@@ -298,7 +298,7 @@ _parseControlPlaneInterface(const uint8_t *packet, size_t offset, size_t endMess
 static PARCCryptoHash *
 _computeHash(const uint8_t *packet, size_t offset, size_t endMessage)
 {
-    PARCCryptoHasher *hasher = parcCryptoHasher_Create(PARC_HASH_SHA256);
+    PARCCryptoHasher *hasher = parcCryptoHasher_Create(PARCCryptoHashType_SHA256);
     parcCryptoHasher_Init(hasher);
     parcCryptoHasher_UpdateBytes(hasher, packet + offset, endMessage - offset);
     PARCCryptoHash *hash = parcCryptoHasher_Finalize(hasher);
diff --git a/ccnx/forwarder/metis/tlv/metis_TlvSchemaV1.c b/ccnx/forwarder/metis/tlv/metis_TlvSchemaV1.c
@@ -437,7 +437,7 @@ _parseMessage(const uint8_t *packet, size_t offset, size_t endMessage, struct tl
 static PARCCryptoHash *
 _computeHash(const uint8_t *packet, size_t offset, size_t endMessage)
 {
-    PARCCryptoHasher *hasher = parcCryptoHasher_Create(PARC_HASH_SHA256);
+    PARCCryptoHasher *hasher = parcCryptoHasher_Create(PARCCryptoHashType_SHA256);
     parcCryptoHasher_Init(hasher);
     parcCryptoHasher_UpdateBytes(hasher, packet + offset, endMessage - offset);
     PARCCryptoHash *hash = parcCryptoHasher_Finalize(hasher);
diff --git a/ccnx/forwarder/metis/tlv/test/test_metis_TlvSchemaV0.c b/ccnx/forwarder/metis/tlv/test/test_metis_TlvSchemaV0.c
@@ -176,7 +176,7 @@ LONGBOW_TEST_CASE(Global, metisTlvSchemaV0_ComputeContentObjectHash)
     uint8_t *start = &metisTestDataV0_EncodedObject[endHeaders];
     size_t length = endPacket - endHeaders;
 
-    PARCCryptoHasher *hasher = parcCryptoHasher_Create(PARC_HASH_SHA256);
+    PARCCryptoHasher *hasher = parcCryptoHasher_Create(PARCCryptoHashType_SHA256);
     parcCryptoHasher_Init(hasher);
     parcCryptoHasher_UpdateBytes(hasher, start, length);
 
diff --git a/ccnx/forwarder/metis/tlv/test/test_metis_TlvSchemaV1.c b/ccnx/forwarder/metis/tlv/test/test_metis_TlvSchemaV1.c
@@ -268,7 +268,7 @@ LONGBOW_TEST_CASE(TlvOpsFunctions, _computeContentObjectHash)
     uint8_t *start = &metisTestDataV1_ContentObject_NameA_Crc32c[endHeaders];
     size_t length = endPacket - endHeaders;
 
-    PARCCryptoHasher *hasher = parcCryptoHasher_Create(PARC_HASH_SHA256);
+    PARCCryptoHasher *hasher = parcCryptoHasher_Create(PARCCryptoHashType_SHA256);
     parcCryptoHasher_Init(hasher);
     parcCryptoHasher_UpdateBytes(hasher, start, length);
 
diff --git a/ccnx/forwarder/metis/tlv/test/test_metis_TlvSkeleton.c b/ccnx/forwarder/metis/tlv/test/test_metis_TlvSkeleton.c
@@ -168,7 +168,7 @@ LONGBOW_TEST_CASE(SchemaV1, metisTlvSkeleton_ComputeContentObjectHash)
 
     size_t length = endPacket - endHeaders;
 
-    PARCCryptoHasher *hasher = parcCryptoHasher_Create(PARC_HASH_SHA256);
+    PARCCryptoHasher *hasher = parcCryptoHasher_Create(PARCCryptoHashType_SHA256);
     parcCryptoHasher_Init(hasher);
     parcCryptoHasher_UpdateBytes(hasher, start, length);
 

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ _parseControlPlaneInterface(const uint8_t *packet, size_t offset, size_t endMess`
`298`	`298`	`static PARCCryptoHash *`
`299`	`299`	`_computeHash(const uint8_t *packet, size_t offset, size_t endMessage)`
`300`	`300`	`{`
`301`		`- PARCCryptoHasher *hasher = parcCryptoHasher_Create(PARC_HASH_SHA256);`
	`301`	`+ PARCCryptoHasher *hasher = parcCryptoHasher_Create(PARCCryptoHashType_SHA256);`
`302`	`302`	`parcCryptoHasher_Init(hasher);`
`303`	`303`	`parcCryptoHasher_UpdateBytes(hasher, packet + offset, endMessage - offset);`
`304`	`304`	`PARCCryptoHash *hash = parcCryptoHasher_Finalize(hasher);`
Original file line number	Diff line number	Diff line change
`@@ -437,7 +437,7 @@ _parseMessage(const uint8_t *packet, size_t offset, size_t endMessage, struct tl`
`437`	`437`	`static PARCCryptoHash *`
`438`	`438`	`_computeHash(const uint8_t *packet, size_t offset, size_t endMessage)`
`439`	`439`	`{`
`440`		`- PARCCryptoHasher *hasher = parcCryptoHasher_Create(PARC_HASH_SHA256);`
	`440`	`+ PARCCryptoHasher *hasher = parcCryptoHasher_Create(PARCCryptoHashType_SHA256);`
`441`	`441`	`parcCryptoHasher_Init(hasher);`
`442`	`442`	`parcCryptoHasher_UpdateBytes(hasher, packet + offset, endMessage - offset);`
`443`	`443`	`PARCCryptoHash *hash = parcCryptoHasher_Finalize(hasher);`