From 5c541a16f1f2656f501b5a03e19126c97f3faa7f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Apr 2021 10:09:13 +0200
Subject: [PATCH] build(deps): update salsa20 requirement from 0.7 to 0.8
 (#2062)

* build(deps): update salsa20 requirement from 0.7 to 0.8

Updates the requirements on [salsa20](https://github.com/RustCrypto/stream-ciphers) to permit the latest version.
- [Release notes](https://github.com/RustCrypto/stream-ciphers/releases)
- [Commits](https://github.com/RustCrypto/stream-ciphers/compare/ctr-v0.7.0...salsa20-v0.8.0)

Signed-off-by: dependabot[bot] <support@github.com>

* *: Update changelog and cargo tomls

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Max Inden <mail@max-inden.de>
---
 CHANGELOG.md                        | 3 ++-
 Cargo.toml                          | 4 ++--
 transports/pnet/CHANGELOG.md        | 4 ++++
 transports/pnet/Cargo.toml          | 4 ++--
 transports/pnet/src/crypt_writer.rs | 2 +-
 transports/pnet/src/lib.rs          | 2 +-
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6a2562b..65eb6d89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,11 +41,12 @@
 
 # `libp2p` facade crate
 
-## Version 0.37.2 [unreleased]
+## Version 0.38.0 [unreleased]
 
 - Update individual crates.
     - `libp2p-core`
     - `libp2p-gossipsub`
+    - `libp2p-pnet`
     - `libp2p-wasm-ext`
 
 ## Version 0.37.1 [2021-04-14]
diff --git a/Cargo.toml b/Cargo.toml
index 1db70370..f19dd5e0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libp2p"
 edition = "2018"
 description = "Peer-to-peer networking library"
-version = "0.37.2"
+version = "0.38.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -73,7 +73,7 @@ libp2p-mplex = { version = "0.28.0", path = "muxers/mplex", optional = true }
 libp2p-noise = { version = "0.30.0", path = "transports/noise", optional = true }
 libp2p-ping = { version = "0.29.0", path = "protocols/ping", optional = true }
 libp2p-plaintext = { version = "0.28.0", path = "transports/plaintext", optional = true }
-libp2p-pnet = { version = "0.20.0", path = "transports/pnet", optional = true }
+libp2p-pnet = { version = "0.21.0", path = "transports/pnet", optional = true }
 libp2p-relay = { version = "0.2.0", path = "protocols/relay", optional = true }
 libp2p-request-response = { version = "0.11.0", path = "protocols/request-response", optional = true }
 libp2p-swarm = { version = "0.29.0", path = "swarm" }
diff --git a/transports/pnet/CHANGELOG.md b/transports/pnet/CHANGELOG.md
index e1e61174..e17fc693 100644
--- a/transports/pnet/CHANGELOG.md
+++ b/transports/pnet/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.21.0 [unreleased]
+
+- Update dependencies.
+
 # 0.20.0 [2020-12-17]
 
 - Update dependencies.
diff --git a/transports/pnet/Cargo.toml b/transports/pnet/Cargo.toml
index 8512bfce..3ed9acfb 100644
--- a/transports/pnet/Cargo.toml
+++ b/transports/pnet/Cargo.toml
@@ -2,7 +2,7 @@
 name = "libp2p-pnet"
 edition = "2018"
 description = "Private swarm support for libp2p"
-version = "0.20.0"
+version = "0.21.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -12,7 +12,7 @@ categories = ["network-programming", "asynchronous"]
 [dependencies]
 futures = "0.3.1"
 log = "0.4.8"
-salsa20 = "0.7"
+salsa20 = "0.8"
 sha3 = "0.9"
 rand = "0.7"
 pin-project = "1.0.2"
diff --git a/transports/pnet/src/crypt_writer.rs b/transports/pnet/src/crypt_writer.rs
index 4cf4a1cc..a61957d3 100644
--- a/transports/pnet/src/crypt_writer.rs
+++ b/transports/pnet/src/crypt_writer.rs
@@ -25,7 +25,7 @@ use futures::{
 };
 use log::trace;
 use pin_project::pin_project;
-use salsa20::{cipher::SyncStreamCipher, XSalsa20};
+use salsa20::{cipher::StreamCipher, XSalsa20};
 use std::{fmt, pin::Pin};
 
 /// A writer that encrypts and forwards to an inner writer
diff --git a/transports/pnet/src/lib.rs b/transports/pnet/src/lib.rs
index 62b85ccb..468e82cd 100644
--- a/transports/pnet/src/lib.rs
+++ b/transports/pnet/src/lib.rs
@@ -30,7 +30,7 @@ use log::trace;
 use pin_project::pin_project;
 use rand::RngCore;
 use salsa20::{
-    cipher::{NewStreamCipher, SyncStreamCipher},
+    cipher::{NewCipher, StreamCipher},
     Salsa20, XSalsa20,
 };
 use sha3::{digest::ExtendableOutput, Shake128};