diff options
18 files changed, 44 insertions, 47 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 diff --git a/libtransport/src/core/manifest.h b/libtransport/src/core/manifest.h index b4875bf22..eadfed752 100644 --- a/libtransport/src/core/manifest.h +++ b/libtransport/src/core/manifest.h @@ -96,13 +96,13 @@ class Manifest : public Base { return *this; } - Manifest &setHashAlgorithm(HashAlgorithm hash_algorithm) { + Manifest &setHashAlgorithm(utils::CryptoHashType hash_algorithm) { hash_algorithm_ = hash_algorithm; encoder_.setHashAlgorithm(hash_algorithm_); return *this; } - HashAlgorithm getHashAlgorithm() { return hash_algorithm_; } + utils::CryptoHashType getHashAlgorithm() { return hash_algorithm_; } ManifestType getManifestType() const { return manifest_type_; } @@ -138,7 +138,7 @@ class Manifest : public Base { protected: ManifestType manifest_type_; - HashAlgorithm hash_algorithm_; + utils::CryptoHashType hash_algorithm_; bool is_last_; Encoder encoder_; diff --git a/libtransport/src/core/manifest_format.h b/libtransport/src/core/manifest_format.h index f95d19aa8..36d23f99b 100644 --- a/libtransport/src/core/manifest_format.h +++ b/libtransport/src/core/manifest_format.h @@ -45,12 +45,6 @@ enum class ManifestType : uint8_t { FLIC_MANIFEST = 3, }; -enum class HashAlgorithm : uint8_t { - SHA_256 = static_cast<uint8_t>(utils::CryptoHashType::SHA_256), - SHA_512 = static_cast<uint8_t>(utils::CryptoHashType::SHA_512), - CRC32C = static_cast<uint8_t>(utils::CryptoHashType::CRC32C), -}; - /** * INCREMENTAL: Manifests will be received inline with the data with no specific * assumption regarding the manifest capacity. Consumers can send interests @@ -92,7 +86,7 @@ class ManifestEncoder { return static_cast<Implementation &>(*this).setManifestTypeImpl(type); } - ManifestEncoder &setHashAlgorithm(HashAlgorithm hash) { + ManifestEncoder &setHashAlgorithm(utils::CryptoHashType hash) { return static_cast<Implementation &>(*this).setHashAlgorithmImpl(hash); } @@ -166,7 +160,7 @@ class ManifestDecoder { return static_cast<const Implementation &>(*this).getManifestTypeImpl(); } - HashAlgorithm getHashAlgorithm() const { + utils::CryptoHashType getHashAlgorithm() const { return static_cast<const Implementation &>(*this).getHashAlgorithmImpl(); } diff --git a/libtransport/src/core/manifest_format_fixed.cc b/libtransport/src/core/manifest_format_fixed.cc index 4073a5d26..ca80c38b1 100644 --- a/libtransport/src/core/manifest_format_fixed.cc +++ b/libtransport/src/core/manifest_format_fixed.cc @@ -55,7 +55,7 @@ FixedManifestEncoder &FixedManifestEncoder::clearImpl() { } FixedManifestEncoder &FixedManifestEncoder::setHashAlgorithmImpl( - HashAlgorithm algorithm) { + utils::CryptoHashType algorithm) { manifest_header_->hash_algorithm = static_cast<uint8_t>(algorithm); return *this; } @@ -170,8 +170,8 @@ ManifestType FixedManifestDecoder::getManifestTypeImpl() const { return static_cast<ManifestType>(manifest_header_->manifest_type); } -HashAlgorithm FixedManifestDecoder::getHashAlgorithmImpl() const { - return static_cast<HashAlgorithm>(manifest_header_->hash_algorithm); +utils::CryptoHashType FixedManifestDecoder::getHashAlgorithmImpl() const { + return static_cast<utils::CryptoHashType>(manifest_header_->hash_algorithm); } NextSegmentCalculationStrategy diff --git a/libtransport/src/core/manifest_format_fixed.h b/libtransport/src/core/manifest_format_fixed.h index 9cacb3bc2..1d7cd7d32 100644 --- a/libtransport/src/core/manifest_format_fixed.h +++ b/libtransport/src/core/manifest_format_fixed.h @@ -94,7 +94,7 @@ class FixedManifestEncoder : public ManifestEncoder<FixedManifestEncoder> { FixedManifestEncoder &setManifestTypeImpl(ManifestType manifest_type); - FixedManifestEncoder &setHashAlgorithmImpl(HashAlgorithm algorithm); + FixedManifestEncoder &setHashAlgorithmImpl(utils::CryptoHashType algorithm); FixedManifestEncoder &setNextSegmentCalculationStrategyImpl( NextSegmentCalculationStrategy strategy); @@ -144,7 +144,7 @@ class FixedManifestDecoder : public ManifestDecoder<FixedManifestDecoder> { ManifestType getManifestTypeImpl() const; - HashAlgorithm getHashAlgorithmImpl() const; + utils::CryptoHashType getHashAlgorithmImpl() const; NextSegmentCalculationStrategy getNextSegmentCalculationStrategyImpl() const; diff --git a/libtransport/src/core/manifest_inline.h b/libtransport/src/core/manifest_inline.h index 235c6f3a0..0227fa93a 100644 --- a/libtransport/src/core/manifest_inline.h +++ b/libtransport/src/core/manifest_inline.h @@ -44,7 +44,7 @@ class ManifestInline static TRANSPORT_ALWAYS_INLINE ManifestInline *createManifest( const core::Name &manifest_name, ManifestVersion version, - ManifestType type, HashAlgorithm algorithm, bool is_last, + ManifestType type, utils::CryptoHashType algorithm, bool is_last, const Name &base_name, NextSegmentCalculationStrategy strategy, std::size_t signature_size) { auto manifest = new ManifestInline(manifest_name, signature_size); diff --git a/libtransport/src/core/packet.cc b/libtransport/src/core/packet.cc index 817f8de66..67e647fca 100644 --- a/libtransport/src/core/packet.cc +++ b/libtransport/src/core/packet.cc @@ -344,7 +344,7 @@ utils::KeyId Packet::getKeyId() const { return return_value; } -utils::CryptoHash Packet::computeDigest(HashAlgorithm algorithm) const { +utils::CryptoHash Packet::computeDigest(utils::CryptoHashType algorithm) const { utils::CryptoHasher hasher(static_cast<utils::CryptoHashType>(algorithm)); hasher.init(); diff --git a/libtransport/src/implementation/p2psecure_socket_producer.cc b/libtransport/src/implementation/p2psecure_socket_producer.cc index d7161986b..d0852539a 100644 --- a/libtransport/src/implementation/p2psecure_socket_producer.cc +++ b/libtransport/src/implementation/p2psecure_socket_producer.cc @@ -367,7 +367,7 @@ int P2PSecureProducerSocket::setSocketOption( } int P2PSecureProducerSocket::setSocketOption( - int socket_option_key, HashAlgorithm socket_option_value) { + int socket_option_key, utils::CryptoHashType socket_option_value) { if (!list_secure_producers.empty()) for (auto it = list_secure_producers.cbegin(); it != list_secure_producers.cend(); it++) diff --git a/libtransport/src/implementation/p2psecure_socket_producer.h b/libtransport/src/implementation/p2psecure_socket_producer.h index c2cbf31ac..33339deba 100644 --- a/libtransport/src/implementation/p2psecure_socket_producer.h +++ b/libtransport/src/implementation/p2psecure_socket_producer.h @@ -84,7 +84,7 @@ class P2PSecureProducerSocket : public ProducerSocket { ProducerContentCallback socket_option_value) override; int setSocketOption(int socket_option_key, - HashAlgorithm socket_option_value) override; + utils::CryptoHashType socket_option_value) override; int setSocketOption(int socket_option_key, utils::CryptoSuite socket_option_value) override; diff --git a/libtransport/src/implementation/socket_producer.h b/libtransport/src/implementation/socket_producer.h index a5dd578b1..d4a239cf6 100644 --- a/libtransport/src/implementation/socket_producer.h +++ b/libtransport/src/implementation/socket_producer.h @@ -53,7 +53,7 @@ class ProducerSocket : public Socket<BasePortal>, async_thread_(), registration_status_(REGISTRATION_NOT_ATTEMPTED), making_manifest_(false), - hash_algorithm_(HashAlgorithm::SHA_256), + hash_algorithm_(utils::CryptoHashType::SHA_256), suffix_strategy_(core::NextSegmentCalculationStrategy::INCREMENTAL), on_interest_input_(VOID_HANDLER), on_interest_dropped_input_buffer_(VOID_HANDLER), @@ -108,7 +108,7 @@ class ProducerSocket : public Socket<BasePortal>, // during the production std::size_t data_packet_size = data_packet_size_; uint32_t content_object_expiry_time = content_object_expiry_time_; - HashAlgorithm hash_algo = hash_algorithm_; + utils::CryptoHashType hash_algo = hash_algorithm_; bool making_manifest = making_manifest_; auto suffix_strategy = utils::SuffixStrategyFactory::getSuffixStrategy( suffix_strategy_, start_offset); @@ -650,7 +650,7 @@ class ProducerSocket : public Socket<BasePortal>, } virtual int setSocketOption(int socket_option_key, - HashAlgorithm socket_option_value) { + utils::CryptoHashType socket_option_value) { switch (socket_option_key) { case GeneralTransportOptions::HASH_ALGORITHM: hash_algorithm_ = socket_option_value; @@ -850,7 +850,7 @@ class ProducerSocket : public Socket<BasePortal>, } virtual int getSocketOption(int socket_option_key, - HashAlgorithm &socket_option_value) { + utils::CryptoHashType &socket_option_value) { switch (socket_option_key) { case GeneralTransportOptions::HASH_ALGORITHM: socket_option_value = hash_algorithm_; @@ -985,7 +985,7 @@ class ProducerSocket : public Socket<BasePortal>, // function std::unordered_map<Name, std::unordered_map<int, uint32_t>> seq_number_map_; - std::atomic<HashAlgorithm> hash_algorithm_; + std::atomic<utils::CryptoHashType> hash_algorithm_; std::atomic<utils::CryptoSuite> crypto_suite_; utils::SpinLock signer_lock_; std::shared_ptr<utils::Signer> signer_; diff --git a/libtransport/src/interfaces/socket_producer.cc b/libtransport/src/interfaces/socket_producer.cc index 679f7ccf4..d030fe756 100644 --- a/libtransport/src/interfaces/socket_producer.cc +++ b/libtransport/src/interfaces/socket_producer.cc @@ -126,7 +126,7 @@ int ProducerSocket::setSocketOption( } int ProducerSocket::setSocketOption(int socket_option_key, - HashAlgorithm socket_option_value) { + utils::CryptoHashType socket_option_value) { return socket_->setSocketOption(socket_option_key, socket_option_value); } @@ -177,8 +177,8 @@ int ProducerSocket::getSocketOption( return socket_->getSocketOption(socket_option_key, socket_option_value); } -int ProducerSocket::getSocketOption(int socket_option_key, - HashAlgorithm &socket_option_value) { +int ProducerSocket::getSocketOption( + int socket_option_key, utils::CryptoHashType &socket_option_value) { return socket_->getSocketOption(socket_option_key, socket_option_value); } diff --git a/libtransport/src/protocols/manifest_incremental_indexer.h b/libtransport/src/protocols/manifest_incremental_indexer.h index 88ae1720b..38b01533e 100644 --- a/libtransport/src/protocols/manifest_incremental_indexer.h +++ b/libtransport/src/protocols/manifest_incremental_indexer.h @@ -30,7 +30,7 @@ class ManifestIncrementalIndexer : public IncrementalIndexer { public: using SuffixQueue = std::queue<uint32_t>; - using HashEntry = std::pair<std::vector<uint8_t>, core::HashAlgorithm>; + using HashEntry = std::pair<std::vector<uint8_t>, utils::CryptoHashType>; ManifestIncrementalIndexer(implementation::ConsumerSocket *icn_socket, TransportProtocol *transport, diff --git a/libtransport/src/security/identity.cc b/libtransport/src/security/identity.cc index 55713245e..d7a08f7b5 100644 --- a/libtransport/src/security/identity.cc +++ b/libtransport/src/security/identity.cc @@ -73,7 +73,7 @@ Identity Identity::generateIdentity(const std::string &subject_name) { } Identity::Identity(std::string &file_name, std::string &password, - transport::core::HashAlgorithm hash_algorithm) + utils::CryptoHashType hash_algorithm) : hash_algorithm_(hash_algorithm) { parcSecurity_Init(); diff --git a/utils/src/hiperf.cc b/utils/src/hiperf.cc index 15bcb7405..e037e1309 100644 --- a/utils/src/hiperf.cc +++ b/utils/src/hiperf.cc @@ -157,7 +157,7 @@ struct ServerConfiguration { content_lifetime(600000000_U32), content_object_size(1440), download_size(20 * 1024 * 1024), - hash_algorithm(HashAlgorithm::SHA_256), + hash_algorithm(utils::CryptoHashType::SHA_256), keystore_name(""), passphrase(""), keystore_password("cisco"), @@ -181,7 +181,7 @@ struct ServerConfiguration { std::uint32_t content_lifetime; std::uint16_t content_object_size; std::uint32_t download_size; - HashAlgorithm hash_algorithm; + utils::CryptoHashType hash_algorithm; std::string keystore_name; std::string passphrase; std::string keystore_password; @@ -841,7 +841,7 @@ class HIperfServer { std::shared_ptr<utils::Identity> getProducerIdentity( std::string &keystore_name, std::string &keystore_password, - HashAlgorithm &hash_algorithm) { + utils::CryptoHashType &hash_algorithm) { if (access(keystore_name.c_str(), F_OK) != -1) { return std::make_shared<utils::Identity>(keystore_name, keystore_password, hash_algorithm); @@ -1335,11 +1335,11 @@ int main(int argc, char *argv[]) { } case 'y': { if (strncasecmp(optarg, "sha256", 6) == 0) { - server_configuration.hash_algorithm = HashAlgorithm::SHA_256; + server_configuration.hash_algorithm = utils::CryptoHashType::SHA_256; } else if (strncasecmp(optarg, "sha512", 6) == 0) { - server_configuration.hash_algorithm = HashAlgorithm::SHA_512; + server_configuration.hash_algorithm = utils::CryptoHashType::SHA_512; } else if (strncasecmp(optarg, "crc32", 5) == 0) { - server_configuration.hash_algorithm = HashAlgorithm::CRC32C; + server_configuration.hash_algorithm = utils::CryptoHashType::CRC32C; } else { std::cerr << "Ignored unknown hash algorithm. Using SHA 256." << std::endl; diff --git a/utils/src/ping_server.cc b/utils/src/ping_server.cc index d766e2811..de02a2072 100644 --- a/utils/src/ping_server.cc +++ b/utils/src/ping_server.cc @@ -38,7 +38,7 @@ using CryptoSuite = utils::CryptoSuite; utils::Identity setProducerIdentity(std::string keystore_name, std::string keystore_password, - HashAlgorithm hash_algorithm) { + utils::CryptoHashType hash_algorithm) { if (access(keystore_name.c_str(), F_OK) != -1) { return utils::Identity(keystore_name, keystore_password, hash_algorithm); } else { @@ -291,7 +291,7 @@ int main(int argc, char **argv) { CallbackContainer *stubs; utils::Identity identity = setProducerIdentity( - keystore_path, keystore_password, HashAlgorithm::SHA_256); + keystore_path, keystore_password, utils::CryptoHashType::SHA_256); if (sign) { stubs = new CallbackContainer(n, object_size, verbose, dump, quite, flags, |