Fix SECIO security protocol (incl AES CTR) (#56)

* Fix SECIO security protocol
* Implement correct AesCtr and fix SECIO
* Add AES CTR stream data test

Signed-off-by: Igor Egorov <[email protected]>

Author: Igor Egorov

include/libp2p/crypto/aes_ctr.hpp

@@ -0,0 +1,43 @@
+/**
+ * Copyright Soramitsu Co., Ltd. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef LIBP2P_CRYPTO_IMPL_DETAIL_AES_CRYPT_HPP
+#define LIBP2P_CRYPTO_IMPL_DETAIL_AES_CRYPT_HPP
+
+#include <gsl/span>
+#include <libp2p/common/types.hpp>
+#include <libp2p/crypto/common.hpp>
+#include <libp2p/outcome/outcome.hpp>
+
+namespace libp2p::crypto::aes {
+
+  /**
+   * An interface for stream data cipher encryption or decryption engine with
+   * AES128 or AES256 algorithms.
+   */
+  class AesCtr {
+   public:
+    using ByteArray = libp2p::common::ByteArray;
+
+    virtual ~AesCtr() = default;
+
+    /**
+     * Encrypts or decrypts user data
+     * @param data to be processed
+     * @return processed data chunk or an error
+     */
+    virtual outcome::result<ByteArray> crypt(
+        gsl::span<const uint8_t> data) const = 0;
+
+    /**
+     * Does stream data finalization
+     * @return bytes buffer to correctly pad all the previously processed
+     * data or an error
+     */
+    virtual outcome::result<ByteArray> finalize() = 0;
+  };
+}  // namespace libp2p::crypto::aes
+
+#endif  // LIBP2P_CRYPTO_IMPL_DETAIL_AES_CRYPT_HPP

include/libp2p/crypto/aes_ctr/aes_ctr_impl.hpp

@@ -0,0 +1,53 @@
+/**
+ * Copyright Soramitsu Co., Ltd. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef LIBP2P_CRYPTO_IMPL_DETAIL_AES_CRYPT_IMPL_HPP
+#define LIBP2P_CRYPTO_IMPL_DETAIL_AES_CRYPT_IMPL_HPP
+
+#include <libp2p/crypto/aes_ctr.hpp>
+
+#include <openssl/evp.h>
+#include <gsl/span>
+#include <libp2p/crypto/common.hpp>
+#include <libp2p/outcome/outcome.hpp>
+
+namespace libp2p::crypto::aes {
+
+  class AesCtrImpl : public AesCtr {
+   public:
+    using Aes128Secret = libp2p::crypto::common::Aes128Secret;
+    using Aes256Secret = libp2p::crypto::common::Aes256Secret;
+
+    enum class Mode {
+      // all the constants are explicitly specified in accordance to OpenSSL
+      // values
+      DECRYPT = 0,
+      ENCRYPT = 1,
+    };
+
+    AesCtrImpl(const Aes128Secret &secret, Mode mode);
+
+    AesCtrImpl(const Aes256Secret &secret, Mode mode);
+
+    ~AesCtrImpl() override;
+
+    outcome::result<ByteArray> crypt(
+        gsl::span<const uint8_t> data) const override;
+
+    outcome::result<ByteArray> finalize() override;
+
+   private:
+    outcome::result<void> init(gsl::span<const uint8_t> key,
+                               gsl::span<const uint8_t> iv,
+                               const EVP_CIPHER *cipher);
+
+    const Mode mode_;
+    outcome::result<void> initialization_error_{outcome::success()};
+    EVP_CIPHER_CTX *ctx_{nullptr};
+  };
+
+}  // namespace libp2p::crypto::aes
+
+#endif  // LIBP2P_CRYPTO_IMPL_DETAIL_AES_CRYPT_IMPL_HPP

include/libp2p/crypto/aes_provider.hpp

@@ -26,6 +26,8 @@ namespace libp2p::crypto {
     FAILED_DECRYPT_FINALIZE,        ///< failed to finalize decryption
     WRONG_IV_SIZE,                  ///< wrong iv size
     WRONG_KEY_SIZE,                 ///< wrong key size
+    STREAM_FINALIZED,  ///< crypt update operations cannot be performed after
+                       ///< stream finalization
   };
 
   enum class HmacProviderError {
@@ -58,7 +60,7 @@ namespace libp2p::crypto {
     CANNOT_LOAD_UNSPECIFIED,          ///< cannot load unspecified key
     GET_KEY_BYTES_FAILED,             ///< failed to get key bytes from PKEY
     INTERNAL_ERROR,                   ///< internal error happened
-    UNSUPPORTED_CURVE_TYPE,           ///< generator for curve type is not implemented
+    UNSUPPORTED_CURVE_TYPE,  ///< generator for curve type is not implemented
   };
 
   enum class KeyValidatorError {

include/libp2p/crypto/aes_provider/aes_provider_impl.hpp

@@ -9,7 +9,7 @@
 #include <boost/di.hpp>
 
 // implementations
-#include <libp2p/crypto/aes_provider/aes_provider_impl.hpp>
+#include <libp2p/crypto/aes_ctr/aes_ctr_impl.hpp>
 #include <libp2p/crypto/crypto_provider/crypto_provider_impl.hpp>
 #include <libp2p/crypto/ecdsa_provider/ecdsa_provider_impl.hpp>
 #include <libp2p/crypto/ed25519_provider/ed25519_provider_impl.hpp>
@@ -259,7 +259,7 @@ namespace libp2p::injector {
         di::bind<crypto::rsa::RsaProvider>().template to(std::move(rsa_provider)),
         di::bind<crypto::ecdsa::EcdsaProvider>().template to(std::move(ecdsa_provider)),
         di::bind<crypto::secp256k1::Secp256k1Provider>().template to(std::move(secp256k1_provider)),
-        di::bind<crypto::aes::AesProvider>().template to<crypto::aes::AesProviderImpl>(),
+        di::bind<crypto::aes::AesCtr>().template to<crypto::aes::AesCtrImpl>(),
         di::bind<crypto::hmac::HmacProvider>().template to<crypto::hmac::HmacProviderImpl>(),
         di::bind<crypto::CryptoProvider>().template to<crypto::CryptoProviderImpl>(),
         di::bind<crypto::marshaller::KeyMarshaller>().template to<crypto::marshaller::KeyMarshallerImpl>(),

include/libp2p/crypto/error.hpp

@@ -7,7 +7,7 @@
 #define LIBP2P_SECIO_ADAPTOR_HPP
 
 #include <libp2p/common/logger.hpp>
-#include <libp2p/crypto/aes_provider.hpp>
+#include <libp2p/crypto/aes_ctr.hpp>
 #include <libp2p/crypto/crypto_provider.hpp>
 #include <libp2p/crypto/hmac_provider.hpp>
 #include <libp2p/crypto/key_marshaller.hpp>
@@ -31,6 +31,7 @@ namespace libp2p::security {
    public:
     enum class Error {
       REMOTE_PEER_SIGNATURE_IS_INVALID = 1,
+      INITIAL_PACKET_VERIFICATION_FAILED,
     };
 
     static constexpr auto kProtocolId = "/secio/1.0.0";
@@ -46,8 +47,7 @@ namespace libp2p::security {
           std::shared_ptr<secio::ExchangeMessageMarshaller> exchange_marshaller,
           std::shared_ptr<peer::IdentityManager> idmgr,
           std::shared_ptr<crypto::marshaller::KeyMarshaller> key_marshaller,
-          std::shared_ptr<crypto::hmac::HmacProvider> hmac_provider,
-          std::shared_ptr<crypto::aes::AesProvider> aes_provider);
+          std::shared_ptr<crypto::hmac::HmacProvider> hmac_provider);
 
     peer::Protocol getProtocolId() const override;
 
@@ -90,9 +90,9 @@ namespace libp2p::security {
     std::shared_ptr<crypto::marshaller::KeyMarshaller> key_marshaller_;
     // secio conn deps go below
     std::shared_ptr<crypto::hmac::HmacProvider> hmac_provider_;
-    std::shared_ptr<crypto::aes::AesProvider> aes_provider_;
     //
     secio::ProposeMessage propose_message_;
+    mutable common::ByteArray remote_peer_rand_;
     common::Logger log_ = common::createLogger("SECIO");
   };
 }  // namespace libp2p::security

include/libp2p/injector/network_injector.hpp

@@ -18,7 +18,7 @@
 
 namespace libp2p::crypto {
   namespace aes {
-    class AesProvider;
+    class AesCtr;
   }
   namespace hmac {
     class HmacProvider;
@@ -61,7 +61,6 @@ namespace libp2p::connection {
     SecioConnection(
         std::shared_ptr<RawConnection> raw_connection,
         std::shared_ptr<crypto::hmac::HmacProvider> hmac_provider,
-        std::shared_ptr<crypto::aes::AesProvider> aes_provider,
         std::shared_ptr<crypto::marshaller::KeyMarshaller> key_marshaller,
         crypto::PublicKey local_pubkey, crypto::PublicKey remote_pubkey,
         crypto::common::HashType hash_type,
@@ -141,28 +140,11 @@ namespace libp2p::connection {
     outcome::result<common::ByteArray> macRemote(
         gsl::span<const uint8_t> message) const;
 
-    /**
-     * Does AES encryption of a message using local peer key
-     * @param message to be encrypted
-     * @return an encrypted representation of the message
-     */
-    outcome::result<common::ByteArray> encryptLocal(
-        gsl::span<const uint8_t> message) const;
-
-    /**
-     * Does AES decryption of a message using remote peer key
-     * @param message to be decrypted
-     * @return a decrypted representation of the message
-     */
-    outcome::result<common::ByteArray> decryptRemote(
-        gsl::span<const uint8_t> message) const;
-
     /// Returns MAC digest size in bytes for the chosen algorithm
     outcome::result<size_t> macSize() const;
 
     std::shared_ptr<RawConnection> raw_connection_;
     std::shared_ptr<crypto::hmac::HmacProvider> hmac_provider_;
-    std::shared_ptr<crypto::aes::AesProvider> aes_provider_;
     std::shared_ptr<crypto::marshaller::KeyMarshaller> key_marshaller_;
 
     crypto::PublicKey local_;
@@ -176,6 +158,9 @@ namespace libp2p::connection {
     boost::optional<AesSecrets<crypto::common::Aes128Secret>> aes128_secrets_;
     boost::optional<AesSecrets<crypto::common::Aes256Secret>> aes256_secrets_;
 
+    boost::optional<std::unique_ptr<crypto::aes::AesCtr>> local_encryptor_;
+    boost::optional<std::unique_ptr<crypto::aes::AesCtr>> remote_decryptor_;
+
     std::queue<uint8_t> user_data_buffer_;
     common::Logger log_ = common::createLogger("SECCONN");
   };

include/libp2p/security/secio/secio.hpp

@@ -4,7 +4,7 @@
 #
 
 libp2p_add_library(p2p_aes_provider
-    aes_provider_impl.cpp
+    aes_ctr_impl.cpp
     )
 
 target_link_libraries(p2p_aes_provider