From 4b75c518824964b719ee800a504e83e6442166ad Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 28 Aug 2020 18:14:17 -0400
Subject: [PATCH] Run cargo-upgrade.

---
 tor-bytes/Cargo.toml    |  8 ++++----
 tor-cert/Cargo.toml     |  2 +-
 tor-llcrypto/Cargo.toml | 17 ++++++++---------
 tor-netdoc/Cargo.toml   |  4 ++--
 tor-proto/Cargo.toml    | 10 +++++-----
 5 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/tor-bytes/Cargo.toml b/tor-bytes/Cargo.toml
index e3b3d37b4..eb7b39e4d 100644
--- a/tor-bytes/Cargo.toml
+++ b/tor-bytes/Cargo.toml
@@ -10,11 +10,11 @@ publish = false
 tor-llcrypto = { path="../tor-llcrypto" }
 
 arrayref = "0.3.6"
-generic-array = "0.14.3"
-crypto-mac = "0.8.0"
+generic-array = "0.14.4"
+crypto-mac = "0.9.1"
 thiserror = "1.0.20"
-signature = "1.1.0"
+signature = "1.2.2"
 
 [dev-dependencies]
-hex-literal = "0.3.0"
+hex-literal = "0.3.1"
 
diff --git a/tor-cert/Cargo.toml b/tor-cert/Cargo.toml
index bd24f8deb..0ca485ca4 100644
--- a/tor-cert/Cargo.toml
+++ b/tor-cert/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 caret = { path="../caret" }
 tor-llcrypto = { path="../tor-llcrypto" }
 tor-bytes = { path="../tor-bytes" }
-signature = "1.1.0"
+signature = "1.2.2"
 
 [dev-dependencies]
 base64 = "0.12.3"
diff --git a/tor-llcrypto/Cargo.toml b/tor-llcrypto/Cargo.toml
index 15b72c1a0..60455353a 100644
--- a/tor-llcrypto/Cargo.toml
+++ b/tor-llcrypto/Cargo.toml
@@ -10,27 +10,26 @@ publish = false
 arrayref = "0.3.6"
 digest = "0.9.0"
 typenum = "1.12.0"
-# XXXX why did I have to downgrade?
-#generic-array = "0.12"
-generic-array = "0.14.3"
+generic-array = "0.14.4"
 aes-ctr = "0.4.0"
 zeroize = "1.1.0"
 rsa = "0.3.0"
 simple_asn1= "0.4.1"
 subtle = "2.2.3"
-stream-cipher = "0.4.0"
+# Can't upgrade past this because of aes-ctr crate! Why?
+stream-cipher = "^0.4"
 num-traits = "0.2.12"
 num-bigint = "0.3.0"
-curve25519-dalek = "2.1.0"
-x25519-dalek = "0.6.0"
-ed25519-dalek = "1.0.0-pre.4"
+curve25519-dalek = "3.0.0"
+x25519-dalek = "1.0.1"
+ed25519-dalek = "1.0.0"
 sha-1 = "0.9.1"
 sha2 = "0.9.1"
 sha3 = "0.9.1"
 
 [dev-dependencies]
-hex-literal = "0.3.0"
-signature = "*"
+hex-literal = "0.3.1"
+signature = "1.2.2"
 
 # This is a magic crate that runs the tests and checks the format
 # before it lets you commit or push.  It installs git hooks for this whenever
diff --git a/tor-netdoc/Cargo.toml b/tor-netdoc/Cargo.toml
index 1d8e32e38..94dbb4ae5 100644
--- a/tor-netdoc/Cargo.toml
+++ b/tor-netdoc/Cargo.toml
@@ -17,5 +17,5 @@ hex = "0.4.2"
 lazy_static = "1.4.0"
 base64 = "0.12.3"
 thiserror = "1.0.20"
-chrono = "0.4.13"
-signature = "1.1.0"
+chrono = "0.4.15"
+signature = "1.2.2"
diff --git a/tor-proto/Cargo.toml b/tor-proto/Cargo.toml
index 3728253b7..5dd6235ad 100644
--- a/tor-proto/Cargo.toml
+++ b/tor-proto/Cargo.toml
@@ -16,16 +16,16 @@ digest = "0.9.0"
 rand = "0.7.3"
 typenum = "1.12.0"
 # XXXX why did I have to downgrade?
-generic-array = "0.14.3"
+generic-array = "0.14.4"
 rand_core = "0.5.1"
-crypto-mac = "0.8.0"
-hmac = "0.8.1"
+crypto-mac = "0.9.1"
+hmac = "0.9.0"
 hkdf = "0.9.0"
 zeroize = "1.1.0"
 subtle = "2.2.3"
-stream-cipher = "0.6.0"
+stream-cipher = "0.7.1"
 sha2 = "0.9.1"
 
 [dev-dependencies]
-hex-literal = "0.3.0"
+hex-literal = "0.3.1"