From 3c532dd5e1844e0f094e2ae7555b1f65a2fd106f Mon Sep 17 00:00:00 2001
From: Mauro Sardara <msardara@cisco.com>
Date: Thu, 27 Feb 2020 15:22:51 +0100
Subject: [HICN-538] Use type utils::CryptoHashtype instead of HashAlgorithm
 everywhere

Change-Id: Iddbc427611c888b28059170a70c0925ebb299cb5
Signed-off-by: Mauro Sardara <msardara@cisco.com>
---
 libtransport/includes/hicn/transport/core/packet.h                | 3 ++-
 libtransport/includes/hicn/transport/interfaces/socket_producer.h | 5 +++--
 libtransport/includes/hicn/transport/security/identity.h          | 6 ++----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'libtransport/includes/hicn/transport')

diff --git a/libtransport/includes/hicn/transport/core/packet.h b/libtransport/includes/hicn/transport/core/packet.h
index e80912cbe..e758aa13e 100644
--- a/libtransport/includes/hicn/transport/core/packet.h
+++ b/libtransport/includes/hicn/transport/core/packet.h
@@ -149,7 +149,8 @@ class Packet : public std::enable_shared_from_this<Packet> {
 
   utils::KeyId getKeyId() const;
 
-  virtual utils::CryptoHash computeDigest(HashAlgorithm algorithm) const;
+  virtual utils::CryptoHash computeDigest(
+      utils::CryptoHashType algorithm) const;
 
   void setChecksum();
 
diff --git a/libtransport/includes/hicn/transport/interfaces/socket_producer.h b/libtransport/includes/hicn/transport/interfaces/socket_producer.h
index e4823cb5c..2dc289995 100644
--- a/libtransport/includes/hicn/transport/interfaces/socket_producer.h
+++ b/libtransport/includes/hicn/transport/interfaces/socket_producer.h
@@ -101,7 +101,8 @@ class ProducerSocket {
   int setSocketOption(int socket_option_key,
                       ProducerContentCallback socket_option_value);
 
-  int setSocketOption(int socket_option_key, HashAlgorithm socket_option_value);
+  int setSocketOption(int socket_option_key,
+                      utils::CryptoHashType socket_option_value);
 
   int setSocketOption(int socket_option_key,
                       utils::CryptoSuite socket_option_value);
@@ -130,7 +131,7 @@ class ProducerSocket {
                       ProducerInterestCallback **socket_option_value);
 
   int getSocketOption(int socket_option_key,
-                      HashAlgorithm &socket_option_value);
+                      utils::CryptoHashType &socket_option_value);
 
   int getSocketOption(int socket_option_key,
                       utils::CryptoSuite &socket_option_value);
diff --git a/libtransport/includes/hicn/transport/security/identity.h b/libtransport/includes/hicn/transport/security/identity.h
index c5d4b975d..a575af134 100644
--- a/libtransport/includes/hicn/transport/security/identity.h
+++ b/libtransport/includes/hicn/transport/security/identity.h
@@ -18,8 +18,6 @@
 #include <hicn/transport/security/crypto_suite.h>
 #include <hicn/transport/security/signer.h>
 
-#include <core/manifest_format.h>
-
 extern "C" {
 #include <parc/security/parc_Identity.h>
 #include <parc/security/parc_IdentityFile.h>
@@ -40,7 +38,7 @@ class Identity {
   Identity(const Identity &other);
 
   Identity(std::string &file_name, std::string &password,
-           transport::core::HashAlgorithm hash_algorithm);
+           utils::CryptoHashType hash_algorithm);
 
   ~Identity();
 
@@ -57,7 +55,7 @@ class Identity {
  private:
   PARCIdentity *identity_;
   std::shared_ptr<Signer> signer_;
-  transport::core::HashAlgorithm hash_algorithm_;
+  utils::CryptoHashType hash_algorithm_;
 };
 
 }  // namespace utils
-- 
cgit 1.2.3-korg