aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevel <acompagn+fdio@cisco.com>2018-04-16 10:31:55 +0200
committerDevel <acompagn+fdio@cisco.com>2018-04-16 10:31:55 +0200
commit04dd447681b20fa087554708b2672f4f5bd1dea0 (patch)
treeb531611a678c33d0773460a723e222291c1d2528
parent9439750179b4541c91c7d9ad1b6179baada8f141 (diff)
Updated to the latest changes in libparc
Change-Id: I273cba1750bf810e16694ff2a273ad1625b6ab10 Signed-off-by: Devel <acompagn+fdio@cisco.com>
-rwxr-xr-xlibccnx-common/ccnx/common/codec/schema_v1/ccnxCodecSchemaV1_CryptoSuite.c2
-rwxr-xr-xlibccnx-common/ccnx/common/codec/schema_v1/ccnxCodecSchemaV1_ValidationEncoder.c2
-rw-r--r--libccnx-common/ccnx/common/codec/schema_v1/test/test_ccnxCodecSchemaV1_CryptoSuite.c4
-rw-r--r--libccnx-common/ccnx/common/validation/ccnxValidation_CRC32C.c4
4 files changed, 6 insertions, 6 deletions
diff --git a/libccnx-common/ccnx/common/codec/schema_v1/ccnxCodecSchemaV1_CryptoSuite.c b/libccnx-common/ccnx/common/codec/schema_v1/ccnxCodecSchemaV1_CryptoSuite.c
index 588694b0..ca9c4e52 100755
--- a/libccnx-common/ccnx/common/codec/schema_v1/ccnxCodecSchemaV1_CryptoSuite.c
+++ b/libccnx-common/ccnx/common/codec/schema_v1/ccnxCodecSchemaV1_CryptoSuite.c
@@ -119,7 +119,7 @@ ccnxCodecSchemaV1CryptoSuite_SignAndHashToTlv(PARCSigningAlgorithm signAlgorithm
break;
}
- case PARCSigningAlgortihm_NULL: {
+ case PARCSigningAlgorithm_NULL: {
switch (hashType) {
case PARCCryptoHashType_CRC32C:
*outputValue = CCNxCodecSchemaV1TlvDictionary_CryptoSuite_CRC32C;
diff --git a/libccnx-common/ccnx/common/codec/schema_v1/ccnxCodecSchemaV1_ValidationEncoder.c b/libccnx-common/ccnx/common/codec/schema_v1/ccnxCodecSchemaV1_ValidationEncoder.c
index f7ad00aa..4e9ecd13 100755
--- a/libccnx-common/ccnx/common/codec/schema_v1/ccnxCodecSchemaV1_ValidationEncoder.c
+++ b/libccnx-common/ccnx/common/codec/schema_v1/ccnxCodecSchemaV1_ValidationEncoder.c
@@ -113,7 +113,7 @@ _encodeSignatureTime(CCNxCodecTlvEncoder *encoder, CCNxTlvDictionary *packetDict
PARCSigner *signer = ccnxCodecTlvEncoder_GetSigner(encoder);
if (signer) {
PARCSigningAlgorithm alg = parcSigner_GetSigningAlgorithm(signer);
- if (alg != PARCSigningAlgortihm_NULL && alg != PARCSigningAlgorithm_UNKNOWN) {
+ if (alg != PARCSigningAlgorithm_NULL && alg != PARCSigningAlgorithm_UNKNOWN) {
// We will generate a signature, so generate a signing time
struct timeval tv;
diff --git a/libccnx-common/ccnx/common/codec/schema_v1/test/test_ccnxCodecSchemaV1_CryptoSuite.c b/libccnx-common/ccnx/common/codec/schema_v1/test/test_ccnxCodecSchemaV1_CryptoSuite.c
index 10bc24d2..021fccc1 100644
--- a/libccnx-common/ccnx/common/codec/schema_v1/test/test_ccnxCodecSchemaV1_CryptoSuite.c
+++ b/libccnx-common/ccnx/common/codec/schema_v1/test/test_ccnxCodecSchemaV1_CryptoSuite.c
@@ -126,10 +126,10 @@ LONGBOW_TEST_CASE(Global, ccnxCodecSchemaV1CryptoSuite_SignAndHashToTlv)
} vectors[] = {
{ .signAlg = PARCSigningAlgorithm_RSA, .hashType = PARCCryptoHashType_SHA256, .output = CCNxCodecSchemaV1TlvDictionary_CryptoSuite_RsaSha256, .success = true, .sentinel = false },
{ .signAlg = PARCSigningAlgorithm_HMAC, .hashType = PARCCryptoHashType_SHA256, .output = CCNxCodecSchemaV1TlvDictionary_CryptoSuite_HmacSha256, .success = true, .sentinel = false },
- { .signAlg = PARCSigningAlgortihm_NULL, .hashType = PARCCryptoHashType_CRC32C, .output = CCNxCodecSchemaV1TlvDictionary_CryptoSuite_CRC32C, .success = true, .sentinel = false },
+ { .signAlg = PARCSigningAlgorithm_NULL, .hashType = PARCCryptoHashType_CRC32C, .output = CCNxCodecSchemaV1TlvDictionary_CryptoSuite_CRC32C, .success = true, .sentinel = false },
{ .signAlg = PARCSigningAlgorithm_RSA, .hashType = 12345, .output = 0, .success = false, .sentinel = false },
{ .signAlg = PARCSigningAlgorithm_HMAC, .hashType = 12345, .output = 0, .success = false, .sentinel = false },
- { .signAlg = PARCSigningAlgortihm_NULL, .hashType = 12345, .output = 0, .success = false, .sentinel = false },
+ { .signAlg = PARCSigningAlgorithm_NULL, .hashType = 12345, .output = 0, .success = false, .sentinel = false },
{ .signAlg = 12345, .hashType = 12345, .output = 0, .success = false, .sentinel = false },
{ .signAlg = 0, .hashType = 0, .output = 0, .success = false, .sentinel = true },
};
diff --git a/libccnx-common/ccnx/common/validation/ccnxValidation_CRC32C.c b/libccnx-common/ccnx/common/validation/ccnxValidation_CRC32C.c
index f8ff7ba4..36259823 100644
--- a/libccnx-common/ccnx/common/validation/ccnxValidation_CRC32C.c
+++ b/libccnx-common/ccnx/common/validation/ccnxValidation_CRC32C.c
@@ -109,14 +109,14 @@ static PARCSignature *
_crc32Signer_SignDigest(_CRC32Signer *interfaceContext, const PARCCryptoHash *cryptoHash)
{
PARCSignature *signature =
- parcSignature_Create(PARCSigningAlgortihm_NULL, PARCCryptoHashType_CRC32C, parcCryptoHash_GetDigest(cryptoHash));
+ parcSignature_Create(PARCSigningAlgorithm_NULL, PARCCryptoHashType_CRC32C, parcCryptoHash_GetDigest(cryptoHash));
return signature;
}
static PARCSigningAlgorithm
_crc32Signer_GetSigningAlgorithm(_CRC32Signer *interfaceContext)
{
- return PARCSigningAlgortihm_NULL;
+ return PARCSigningAlgorithm_NULL;
}
static PARCCryptoHashType