diff options
Diffstat (limited to 'libtransport/includes')
4 files changed, 12 insertions, 9 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_consumer.h b/libtransport/includes/hicn/transport/interfaces/socket_consumer.h index ee60ecbff..0a6e9a43a 100644 --- a/libtransport/includes/hicn/transport/interfaces/socket_consumer.h +++ b/libtransport/includes/hicn/transport/interfaces/socket_consumer.h @@ -23,9 +23,10 @@ #include <hicn/transport/interfaces/socket_options_keys.h> #include <hicn/transport/security/verifier.h> +#ifndef ASIO_STANDALONE #define ASIO_STANDALONE +#endif #include <asio/io_service.hpp> -#undef ASIO_STANDALONE #define CONSUMER_FINISHED 0 #define CONSUMER_BUSY 1 diff --git a/libtransport/includes/hicn/transport/interfaces/socket_producer.h b/libtransport/includes/hicn/transport/interfaces/socket_producer.h index e4823cb5c..e269fb83d 100644 --- a/libtransport/includes/hicn/transport/interfaces/socket_producer.h +++ b/libtransport/includes/hicn/transport/interfaces/socket_producer.h @@ -23,9 +23,11 @@ #include <hicn/transport/interfaces/socket_options_keys.h> #include <hicn/transport/security/signer.h> +#ifndef ASIO_STANDALONE #define ASIO_STANDALONE +#endif #include <asio/io_service.hpp> -#undef ASIO_STANDALONE + namespace transport { namespace implementation { @@ -101,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); @@ -130,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 |