From 4c8876424cca41c8ce8ce67c1c0a394932cbdd58 Mon Sep 17 00:00:00 2001
From: Angelo Mantellini <manangel@cisco.com>
Date: Sun, 10 Feb 2019 12:49:21 +0100
Subject: [HICN-46] Remove warnings libtransport on windows

Change-Id: I09456770dcbca979491cdcadb310eab95a0dea17
Signed-off-by: Angelo Mantellini <manangel@cisco.com>
---
 libtransport/src/hicn/transport/utils/identity.cc         | 8 ++++----
 libtransport/src/hicn/transport/utils/signer.cc           | 9 +++++----
 libtransport/src/hicn/transport/utils/signer.h            | 2 +-
 libtransport/src/hicn/transport/utils/string_tokenizer.cc | 2 +-
 libtransport/src/hicn/transport/utils/verifier.cc         | 2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'libtransport/src/hicn/transport/utils')

diff --git a/libtransport/src/hicn/transport/utils/identity.cc b/libtransport/src/hicn/transport/utils/identity.cc
index 1b2fd4828..d84129537 100644
--- a/libtransport/src/hicn/transport/utils/identity.cc
+++ b/libtransport/src/hicn/transport/utils/identity.cc
@@ -51,7 +51,7 @@ Identity::Identity(const std::string &keystore_name,
 
   signer_ = std::make_shared<Signer>(signer);
 
-  signature_length_ = parcSigner_GetSignatureSize(signer);
+  signature_length_ = (unsigned int)parcSigner_GetSignatureSize(signer);
 
   parcSigner_Release(&signer);
   parcIdentityFile_Release(&identity_file);
@@ -72,8 +72,8 @@ Identity Identity::generateIdentity(const std::string &subject_name) {
   unsigned int validity_days = 30;
   CryptoSuite suite = CryptoSuite::RSA_SHA256;
 
-  return utils::Identity(keystore_name, keystore_password, suite, key_length,
-                         validity_days, subject_name);
+  return utils::Identity(keystore_name, keystore_password, suite,
+                         (unsigned int)key_length, validity_days, subject_name);
 }
 
 Identity::Identity(std::string &file_name, std::string &password,
@@ -92,7 +92,7 @@ Identity::Identity(std::string &file_name, std::string &password,
 
   signer_ = std::make_shared<Signer>(signer);
 
-  signature_length_ = parcSigner_GetSignatureSize(signer);
+  signature_length_ = (unsigned int)parcSigner_GetSignatureSize(signer);
 
   parcSigner_Release(&signer);
   parcIdentityFile_Release(&identity_file);
diff --git a/libtransport/src/hicn/transport/utils/signer.cc b/libtransport/src/hicn/transport/utils/signer.cc
index 9c06a051c..22bdf54d0 100644
--- a/libtransport/src/hicn/transport/utils/signer.cc
+++ b/libtransport/src/hicn/transport/utils/signer.cc
@@ -117,7 +117,7 @@ void Signer::sign(Packet &packet) {
   utils::CryptoHasher hasher(parcSigner_GetCryptoHasher(signer_));
   hasher.init();
   hasher.updateBytes(hicn_packet, header_len + sign_len_bytes);
-  //hasher.updateBytes(zeros, sign_len_bytes);
+  // hasher.updateBytes(zeros, sign_len_bytes);
 
   for (utils::MemBuf *current = payload_chain; current != header_chain;
        current = current->next()) {
@@ -126,7 +126,9 @@ void Signer::sign(Packet &packet) {
 
   utils::CryptoHash hash = hasher.finalize();
 
-  PARCSignature *signature = parcSigner_SignDigest(this->signer_, hash.hash_, packet.getSignature(), sign_len_bytes);
+  PARCSignature *signature =
+      parcSigner_SignDigest(this->signer_, hash.hash_, packet.getSignature(),
+                            (uint32_t)sign_len_bytes);
   PARCBuffer *buffer = parcSignature_GetSignature(signature);
   size_t bytes_len = parcBuffer_Remaining(buffer);
 
@@ -140,10 +142,9 @@ void Signer::sign(Packet &packet) {
   } else if (format & HFO_INET6) {
     memcpy(hicn_packet, &header_copy, sizeof(hicn_v6_hdr_t));
   }
-
 }
 
-PARCKeyStore * Signer::getKeyStore() {
+PARCKeyStore *Signer::getKeyStore() {
   return parcSigner_GetKeyStore(this->signer_);
 }
 
diff --git a/libtransport/src/hicn/transport/utils/signer.h b/libtransport/src/hicn/transport/utils/signer.h
index 10b1bfe8c..6afb9544c 100644
--- a/libtransport/src/hicn/transport/utils/signer.h
+++ b/libtransport/src/hicn/transport/utils/signer.h
@@ -60,7 +60,7 @@ class Signer {
    */
   void sign(Packet &packet);
 
-  PARCKeyStore * getKeyStore();
+  PARCKeyStore *getKeyStore();
 
  private:
   PARCSigner *signer_;
diff --git a/libtransport/src/hicn/transport/utils/string_tokenizer.cc b/libtransport/src/hicn/transport/utils/string_tokenizer.cc
index 9d1911080..a280a3c43 100644
--- a/libtransport/src/hicn/transport/utils/string_tokenizer.cc
+++ b/libtransport/src/hicn/transport/utils/string_tokenizer.cc
@@ -30,7 +30,7 @@ bool StringTokenizer::hasMoreTokens() {
 }
 
 std::string StringTokenizer::nextToken() {
-  unsigned long pos = str_.find(delimiter_);
+  unsigned long pos = (unsigned long)str_.find(delimiter_);
 
   bool token_found = std::string::npos != pos;
 
diff --git a/libtransport/src/hicn/transport/utils/verifier.cc b/libtransport/src/hicn/transport/utils/verifier.cc
index 49cbe3b36..bc460b821 100644
--- a/libtransport/src/hicn/transport/utils/verifier.cc
+++ b/libtransport/src/hicn/transport/utils/verifier.cc
@@ -125,7 +125,7 @@ int Verifier::verify(const Packet &packet) {
   PARCKeyId *key_id = parcKeyId_Create(buffer);
   parcBuffer_Release(&buffer);
 
-  int ah_payload_len = header_chain->next()->length();
+  int ah_payload_len = (int)(header_chain->next()->length());
   uint8_t *signature = header_chain->next()->writableData();
 
   // Reset fields that should not appear in the signature
-- 
cgit 1.2.3-korg