diff options
| author |   Angelo Mantellini <angelo.mantellini@cisco.com> | 2020-02-27 14:33:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2020-02-27 14:33:01 +0000 |
| commit | 0fe06328d8bb8a174f0e9a246b437e5eaf2a7628 (patch) | |
| tree | a8485c9952bf7bbc09ac6209b25352841a36371f /libtransport/includes | |
| parent | 40133d80a41f438b469b6c94e87fea2a00affa81 (diff) | |
| parent | 3c532dd5e1844e0f094e2ae7555b1f65a2fd106f (diff) | |
Merge "[HICN-538] Use type utils::CryptoHashtype instead of HashAlgorithm everywhere"
Diffstat (limited to 'libtransport/includes')
3 files changed, 7 insertions, 7 deletions
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 b51050307..e269fb83d 100644 --- a/libtransport/includes/hicn/transport/interfaces/socket_producer.h +++ b/libtransport/includes/hicn/transport/interfaces/socket_producer.h @@ -103,7 +103,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); @@ -132,7 +133,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 |