1.7.0

Upstream Changelog:
	- Added configuration menu, accessible from the admin panel. This saves the user settings to a JSON file, by default in data/config.json, but configurable with the CONFIG_FILE environment variable.
	- Added templating support for emails, can be added to $DATA_FOLDER/templates/email, or $TEMPLATES_FOLDER/email, if configured. Check here for examples.
		- Added reload templates option, useful during development. Set RELOAD_TEMPLATES to true to enable.
		- The templates use the Handlebars format.
	- Improved icon downloader, now we don't use the upstream server anymore.
	- Added option to disable icon download, set DISABLE_ICON_DOWNLOAD to true.
		- Note that icons already in the cache will still be served. With this, if ICON_CACHE_TTL is set to 0, the cached icons will not expire.
	- Admin panel improvements:
		- Organization, 2FA status and disabled user badges
		- Deauthorize user sessions button
		- Now using templates
	- Added Feature-Policy header.
	- Created recovery code when registering a YubiKey
	- Now the .env file is only read from the current directory.
	- Other fixes and dependency updates

3 files changed, 7 insertions, 687 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0d3c26132b80..7c7dbccea696 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bitwarden_rs
 	pkgdesc = An unofficial lightweight implementation of the bitwarden-server using rust and sqlite. Does NOT include the web-interface.
-	pkgver = 1.6.1
+	pkgver = 1.7.0
 	pkgrel = 1
 	url = https://github.com/dani-garcia/bitwarden_rs
 	install = bitwarden_rs.install
@@ -15,16 +15,14 @@ pkgbase = bitwarden_rs
 	optdepends = bitwarden_rs-vault: Web Interface 'Vault'
 	conflicts = bitwarden_rs-git
 	backup = etc/bitwarden_rs.env
-	source = https://github.com/dani-garcia/bitwarden_rs/archive/1.6.1.tar.gz
+	source = https://github.com/dani-garcia/bitwarden_rs/archive/1.7.0.tar.gz
 	source = bitwarden_rs.install
 	source = bitwarden_rs.service
 	source = 0001-Disable-Vault.patch
-	source = 0002-Update-Yubico-Dep.patch
-	sha512sums = 4ff36f0104368e9544a04b1f0d11e4c1a16d726dcbaeb432f83251ed413971b27b71acddb5484bc0670d3f281c74fa0624b0f2f1ef5e44e4950508fd4a7e35b4
+	sha512sums = 434a1aaa721f82eaa9eb391ed48df210a14b15bb0c1ef975a5f6dc1b2a50721369b586fcc3e8447f4a82ef98c6eeb26d46a414959545f90c4683312ab001396e
 	sha512sums = 399e63002acb764895bbcf3b983642c8858343b36909eeeb73133de1a9740a3d81232bc206ff6bf3daed50f72354c5e6fd5314d0d044acd9f1cb23a933b1dd74
 	sha512sums = 4ce188956f6fe7cfdb711b1505f6344ed2775751ea112a0506dc96455c2705ab8529ec442e4747d7810fc3535b4ca78d1864e874dab5b5306373587097e02658
 	sha512sums = a6f2361c7aa83e63b9a557500406b0cd660e0d7f8b16345f859faa3f96e22bdcecd7589711960486fa0401896291f7d46f66882744c69117fc146056f4a49028
-	sha512sums = ccb82c2d895290acc2367797ecca6c050f0ce353932efeda15e4f96ed227a7e60cf1325731072b1e661a4e6f5bc705ae95c1badb1403911db1e5b6e94bb0a4cd
 
 pkgname = bitwarden_rs
 
diff --git a/0002-Update-Yubico-Dep.patch b/0002-Update-Yubico-Dep.patch
deleted file mode 100644
index 74bb6a57b8da..000000000000
--- a/0002-Update-Yubico-Dep.patch
+++ /dev/null
@@ -1,675 +0,0 @@
-commit 60f6a350be1e81e04f02913161e751c2b0cc0095
-Author: Daniel García <dani-garcia@users.noreply.github.com>
-Date:   Sun Jan 13 14:37:17 2019 +0100
-
-    Update yubico to fix OpenSSL error
-
-diff --git a/Cargo.lock b/Cargo.lock
-index e1dcf18..b91c591 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -101,11 +101,6 @@ name = "bitflags"
- version = "0.7.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- 
--[[package]]
--name = "bitflags"
--version = "0.9.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--
- [[package]]
- name = "bitflags"
- version = "1.0.4"
-@@ -142,12 +137,12 @@ dependencies = [
-  "rocket_contrib 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
-  "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
-- "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_json 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
-  "syslog 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "u2f 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-  "uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "ws 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
-- "yubico 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "yubico 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
-@@ -282,15 +277,6 @@ dependencies = [
-  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
--[[package]]
--name = "core-foundation"
--version = "0.2.3"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--dependencies = [
-- "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
--]
--
- [[package]]
- name = "core-foundation"
- version = "0.5.1"
-@@ -300,14 +286,6 @@ dependencies = [
-  "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
--[[package]]
--name = "core-foundation-sys"
--version = "0.2.3"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--dependencies = [
-- "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
--]
--
- [[package]]
- name = "core-foundation-sys"
- version = "0.5.1"
-@@ -802,31 +780,6 @@ dependencies = [
-  "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
--[[package]]
--name = "hyper"
--version = "0.11.27"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--dependencies = [
-- "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
-- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
-- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
-- "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-- "httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-- "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-- "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
-- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
-- "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
-- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
-- "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
-- "relay 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "want 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
--]
--
- [[package]]
- name = "hyper"
- version = "0.12.20"
-@@ -864,20 +817,6 @@ dependencies = [
-  "webpki-roots 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
--[[package]]
--name = "hyper-tls"
--version = "0.1.4"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--dependencies = [
-- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
-- "hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)",
-- "native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
--]
--
- [[package]]
- name = "hyper-tls"
- version = "0.3.1"
-@@ -977,7 +916,7 @@ dependencies = [
-  "ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)",
-  "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
-  "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
-- "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_json 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
-  "untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
-@@ -995,11 +934,6 @@ name = "language-tags"
- version = "0.2.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- 
--[[package]]
--name = "lazy_static"
--version = "0.2.11"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--
- [[package]]
- name = "lazy_static"
- version = "1.2.0"
-@@ -1026,7 +960,7 @@ dependencies = [
-  "nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
-  "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
-- "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_json 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
-@@ -1199,16 +1133,6 @@ dependencies = [
-  "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
--[[package]]
--name = "mio-uds"
--version = "0.6.7"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--dependencies = [
-- "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
-- "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
--]
--
- [[package]]
- name = "miow"
- version = "0.2.1"
-@@ -1255,20 +1179,6 @@ dependencies = [
-  "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
--[[package]]
--name = "native-tls"
--version = "0.1.5"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--dependencies = [
-- "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
-- "openssl 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)",
-- "schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
-- "security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
-- "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
--]
--
- [[package]]
- name = "native-tls"
- version = "0.2.2"
-@@ -1403,18 +1313,6 @@ name = "opaque-debug"
- version = "0.2.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- 
--[[package]]
--name = "openssl"
--version = "0.9.24"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--dependencies = [
-- "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
-- "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
-- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
-- "openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)",
--]
--
- [[package]]
- name = "openssl"
- version = "0.10.16"
-@@ -1766,14 +1664,6 @@ dependencies = [
-  "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
--[[package]]
--name = "relay"
--version = "0.1.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--dependencies = [
-- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
--]
--
- [[package]]
- name = "remove_dir_all"
- version = "0.5.1"
-@@ -1782,30 +1672,6 @@ dependencies = [
-  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
--[[package]]
--name = "reqwest"
--version = "0.8.8"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--dependencies = [
-- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
-- "encoding_rs 0.8.14 (registry+https://github.com/rust-lang/crates.io-index)",
-- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
-- "hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)",
-- "hyper-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libflate 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
-- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
-- "mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)",
-- "native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-- "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
-- "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
-- "serde_urlencoded 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
-- "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
--]
--
- [[package]]
- name = "reqwest"
- version = "0.9.8"
-@@ -1824,7 +1690,7 @@ dependencies = [
-  "mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)",
-  "native-tls 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
-  "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
-- "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_json 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
-  "serde_urlencoded 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -1906,7 +1772,7 @@ dependencies = [
-  "notify 4.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
-  "rocket 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
-- "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_json 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
-@@ -2003,11 +1869,6 @@ dependencies = [
-  "antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
--[[package]]
--name = "scoped-tls"
--version = "0.1.2"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--
- [[package]]
- name = "scopeguard"
- version = "0.3.3"
-@@ -2022,17 +1883,6 @@ dependencies = [
-  "untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
--[[package]]
--name = "security-framework"
--version = "0.1.16"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--dependencies = [
-- "core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-- "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
-- "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
--]
--
- [[package]]
- name = "security-framework"
- version = "0.2.1"
-@@ -2044,15 +1894,6 @@ dependencies = [
-  "security-framework-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
--[[package]]
--name = "security-framework-sys"
--version = "0.1.16"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--dependencies = [
-- "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
--]
--
- [[package]]
- name = "security-framework-sys"
- version = "0.2.2"
-@@ -2093,7 +1934,7 @@ dependencies = [
- 
- [[package]]
- name = "serde_json"
--version = "1.0.34"
-+version = "1.0.35"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -2334,45 +2175,12 @@ dependencies = [
-  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
-  "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
-  "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-current-thread 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-fs 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-threadpool 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-  "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
--]
--
--[[package]]
--name = "tokio-codec"
--version = "0.1.1"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--dependencies = [
-- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
-- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
--]
--
--[[package]]
--name = "tokio-core"
--version = "0.1.17"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--dependencies = [
-- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
-- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
-- "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
-- "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
-- "scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
- [[package]]
-@@ -2393,16 +2201,6 @@ dependencies = [
-  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
--[[package]]
--name = "tokio-fs"
--version = "0.1.5"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--dependencies = [
-- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-threadpool 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
--]
--
- [[package]]
- name = "tokio-io"
- version = "0.1.11"
-@@ -2430,14 +2228,6 @@ dependencies = [
-  "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
--[[package]]
--name = "tokio-service"
--version = "0.1.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--dependencies = [
-- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
--]
--
- [[package]]
- name = "tokio-tcp"
- version = "0.1.3"
-@@ -2477,48 +2267,6 @@ dependencies = [
-  "tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
--[[package]]
--name = "tokio-tls"
--version = "0.1.4"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--dependencies = [
-- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
-- "native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
--]
--
--[[package]]
--name = "tokio-udp"
--version = "0.1.3"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--dependencies = [
-- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
-- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
-- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
-- "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
--]
--
--[[package]]
--name = "tokio-uds"
--version = "0.2.5"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--dependencies = [
-- "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
-- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
-- "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
-- "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
-- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
-- "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
-- "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
-- "tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
--]
--
- [[package]]
- name = "toml"
- version = "0.4.10"
-@@ -2532,11 +2280,6 @@ name = "traitobject"
- version = "0.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- 
--[[package]]
--name = "try-lock"
--version = "0.1.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--
- [[package]]
- name = "try-lock"
- version = "0.2.2"
-@@ -2580,7 +2323,7 @@ dependencies = [
-  "ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)",
-  "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
-  "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
-- "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "serde_json 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
-  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
-  "untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
-  "webpki 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -2666,15 +2409,6 @@ name = "utf8-ranges"
- version = "1.0.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- 
--[[package]]
--name = "uuid"
--version = "0.6.5"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--dependencies = [
-- "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
-- "rand 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
--]
--
- [[package]]
- name = "uuid"
- version = "0.7.1"
-@@ -2708,16 +2442,6 @@ dependencies = [
-  "winapi-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- ]
- 
--[[package]]
--name = "want"
--version = "0.0.4"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--dependencies = [
-- "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
-- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
-- "try-lock 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
--]
--
- [[package]]
- name = "want"
- version = "0.0.6"
-@@ -2829,17 +2553,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- 
- [[package]]
- name = "yubico"
--version = "0.5.0"
-+version = "0.5.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- dependencies = [
-  "aes-soft 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
-- "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
-  "block-modes 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "crypto-mac 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "hmac 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-- "rand 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
-- "reqwest 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "rand 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
-+ "reqwest 0.9.8 (registry+https://github.com/rust-lang/crates.io-index)",
-  "sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "subtle 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
-@@ -2861,7 +2585,6 @@ dependencies = [
- "checksum base64 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "621fc7ecb8008f86d7fb9b95356cd692ce9514b80a86d85b397f32a22da7b9e2"
- "checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643"
- "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
--"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
- "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
- "checksum block-buffer 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49665c62e0e700857531fa5d3763e91b539ff1abeebd56808d378b495870d60d"
- "checksum block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774"
-@@ -2881,9 +2604,7 @@ dependencies = [
- "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
- "checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
- "checksum cookie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1465f8134efa296b4c19db34d909637cb2bf0f7aaf21299e23e18fa29ac557cf"
--"checksum core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25bfd746d203017f7d5cbd31ee5d8e17f94b6521c7af77ece6c9e4b2d4b16c67"
- "checksum core-foundation 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "286e0b41c3a20da26536c6000a280585d519fd07b3956b43aed8a79e9edce980"
--"checksum core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "065a5d7ffdcbc8fa145d6f0746f3555025b9097a9e9cda59f7467abae670c78d"
- "checksum core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "716c271e8613ace48344f723b60b900a93150271e5be206212d052bbc0883efa"
- "checksum crc32fast 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e91d5240c6975ef33aeb5f148f35275c25eda8e8a5f95abe421978b05b8bf192"
- "checksum crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "137bc235f622ffaa0428e3854e24acb53291fc0b3ff6fb2cb75a8be6fb02f06b"
-@@ -2940,10 +2661,8 @@ dependencies = [
- "checksum http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "02096a6d2c55e63f7fcb800690e4f889a25f6ec342e3adb4594e293b625215ab"
- "checksum httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83"
- "checksum hyper 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)" = "df0caae6b71d266b91b4a83111a61d2b94ed2e2bea024c532b933dcff867e58c"
--"checksum hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)" = "34a590ca09d341e94cddf8e5af0bbccde205d5fbc2fa3c09dd67c7f85cea59d7"
- "checksum hyper 0.12.20 (registry+https://github.com/rust-lang/crates.io-index)" = "80eeda66c9ef8e18f5122fff2c54604c053420b11dae951cfb74cf1dcba2e93f"
- "checksum hyper-sync-rustls 0.3.0-rc.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6d1a443a90413a118ac6739e024f6a5180aa3b3f43f7de65f9d388a961cff19b"
--"checksum hyper-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ffb1bd5e518d3065840ab315dbbf44e4420e5f7d80e2cb93fa6ffffc50522378"
- "checksum hyper-tls 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "32cd73f14ad370d3b4d4b7dce08f69b81536c82e39fcc89731930fe5788cd661"
- "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e"
- "checksum indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7e81a7c05f79578dbc15793d8b619db9ba32b4577003ef3af1a91c416798c58d"
-@@ -2956,7 +2675,6 @@ dependencies = [
- "checksum jsonwebtoken 5.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8d438ea707d465c230305963b67f8357a1d56fcfad9434797d7cb1c46c2e41df"
- "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
- "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
--"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
- "checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
- "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
- "checksum lettre 0.9.0 (git+https://github.com/lettre/lettre?rev=c988b1760ad81)" = "<none>"
-@@ -2978,12 +2696,10 @@ dependencies = [
- "checksum mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)" = "30de2e4613efcba1ec63d8133f344076952090c122992a903359be5a4f99c3ed"
- "checksum mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)" = "71646331f2619b1026cc302f87a2b8b648d5c6dd6937846a16cc8ce0f347f432"
- "checksum mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40"
--"checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125"
- "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
- "checksum modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41f5c9112cb662acd3b204077e0de5bc66305fa8df65c8019d5adb10e9ab6e58"
- "checksum multipart 0.15.4 (registry+https://github.com/rust-lang/crates.io-index)" = "adba94490a79baf2d6a23eac897157047008272fa3eecb3373ae6377b91eca28"
- "checksum mustache 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ddb004e419334fc9172d0a5ff91c0770bdd6239091b0b343eb5926101f0a7d13"
--"checksum native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f74dbadc8b43df7864539cedb7bc91345e532fdd913cfdc23ad94f4d2d40fbc0"
- "checksum native-tls 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ff8e08de0070bbf4c31f452ea2a70db092f36f6f2e4d897adf5674477d488fb2"
- "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
- "checksum nickel 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "da8f6d24c912e56ae0b595fed54326dc49e8d7c8a13f303861fd0c2c3021e746"
-@@ -2998,7 +2714,6 @@ dependencies = [
- "checksum oath 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ec6405dc6afe8219020d535f9ad888a12b191bbc8ce1c55f7ee663bde5be80ca"
- "checksum opaque-debug 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "51ecbcb821e1bd256d456fe858aaa7f380b63863eab2eb86eee1bd9f33dd6682"
- "checksum openssl 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)" = "ec7bd7ca4cce6dbdc77e7c1230682740d307d1218a87fb0349a571272be749f9"
--"checksum openssl 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "a3605c298474a3aa69de92d21139fb5e2a81688d308262359d85cdd0d12a7985"
- "checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
- "checksum openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)" = "1bb974e77de925ef426b6bc82fce15fd45bdcbeb5728bffcfc7cdeeb7ce1c2d6"
- "checksum owning_ref 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9d52571ddcb42e9c900c901a18d8d67e393df723fcd51dd59c5b1a85d0acb6cc"
-@@ -3038,9 +2753,7 @@ dependencies = [
- "checksum redox_syscall 0.1.50 (registry+https://github.com/rust-lang/crates.io-index)" = "52ee9a534dc1301776eff45b4fa92d2c39b1d8c3d3357e6eb593e0d795506fc2"
- "checksum regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "37e7cbbd370869ce2e8dff25c7018702d10b21a20ef7135316f8daecd6c25b7f"
- "checksum regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4e47a2ed29da7a9e1960e1639e7a982e6edc6d49be308a3b02daf511504a16d1"
--"checksum relay 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1576e382688d7e9deecea24417e350d3062d97e32e45d70b1cde65994ff1489a"
- "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
--"checksum reqwest 0.8.8 (registry+https://github.com/rust-lang/crates.io-index)" = "738769ec83daf6c1929dc9dae7d69ed3779b55ae5c356e989dcd3aa677d8486e"
- "checksum reqwest 0.9.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0e60f169af3915c294818d55dde549f00d2966cef36d6c5e7255d75df3f2b16f"
- "checksum ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2c4db68a2e35f3497146b7e4563df7d4773a2433230c5e4b448328e31740458a"
- "checksum rmp 0.8.7 (git+https://github.com/dani-garcia/msgpack-rust)" = "<none>"
-@@ -3060,18 +2773,15 @@ dependencies = [
- "checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267"
- "checksum schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "0e1a231dc10abf6749cfa5d7767f25888d484201accbd919b66ab5413c502d56"
- "checksum scheduled-thread-pool 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a2ff3fc5223829be817806c6441279c676e454cc7da608faf03b0ccc09d3889"
--"checksum scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28"
- "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
- "checksum sct 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cb8f61f9e6eadd062a71c380043d28036304a4706b3c4dd001ff3387ed00745a"
--"checksum security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "dfa44ee9c54ce5eecc9de7d5acbad112ee58755239381f687e564004ba4a2332"
- "checksum security-framework 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "697d3f3c23a618272ead9e1fb259c1411102b31c6af8b93f1d64cca9c3b0e8e0"
--"checksum security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "5421621e836278a0b139268f36eee0dc7e389b784dc3f79d8f11aabadf41bead"
- "checksum security-framework-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "40d95f3d7da09612affe897f320d78264f0d2320f3e8eea27d12bd1bd94445e2"
- "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
- "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
- "checksum serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "0e732ed5a5592c17d961555e3b552985baf98d50ce418b7b655f31f6ba7eb1b7"
- "checksum serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d6115a3ca25c224e409185325afc16a0d5aaaabc15c42b09587d6f1ba39a5b"
--"checksum serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)" = "bdf540260cfee6da923831f4776ddc495ada940c30117977c70f1313a6130545"
-+"checksum serde_json 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "dfb1277d4d0563e4593e0b8b5d23d744d277b55d2bc0bf1c38d0d8a6589d38aa"
- "checksum serde_urlencoded 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d48f9f99cd749a2de71d29da5f948de7f2764cc5a9d7f3c97e3514d4ee6eabf2"
- "checksum sha-1 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8347606816471548cd60f0abd5ef0d513a81f5202dbdab9c09f17a15b5248484"
- "checksum sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68"
-@@ -3099,23 +2809,15 @@ dependencies = [
- "checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
- "checksum tiny_http 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951"
- "checksum tokio 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4790d0be6f4ba6ae4f48190efa2ed7780c9e3567796abdb285003cf39840d9c5"
--"checksum tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f"
--"checksum tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "aeeffbbb94209023feaef3c196a41cbcdafa06b4a6f893f68779bb5e53796f71"
- "checksum tokio-current-thread 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "331c8acc267855ec06eb0c94618dcbbfea45bed2d20b77252940095273fb58f6"
- "checksum tokio-executor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "30c6dbf2d1ad1de300b393910e8a3aa272b724a400b6531da03eed99e329fbf0"
--"checksum tokio-fs 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0e9cbbc8a3698b7ab652340f46633364f9eaa928ddaaee79d8b8f356dd79a09d"
- "checksum tokio-io 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b53aeb9d3f5ccf2ebb29e19788f96987fa1355f8fe45ea193928eaaaf3ae820f"
- "checksum tokio-reactor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "afbcdb0f0d2a1e4c440af82d7bbf0bf91a8a8c0575bcd20c05d15be7e9d3a02f"
--"checksum tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162"
- "checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119"
- "checksum tokio-threadpool 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "17465013014410310f9f61fa10bf4724803c149ea1d51efece131c38efca93aa"
- "checksum tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4f37f0111d76cc5da132fe9bc0590b9b9cfd079bc7e75ac3846278430a299ff8"
--"checksum tokio-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "772f4b04e560117fe3b0a53e490c16ddc8ba6ec437015d91fa385564996ed913"
--"checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92"
--"checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445"
- "checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f"
- "checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
--"checksum try-lock 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee2aa4715743892880f70885373966c83d73ef1b0838a664ef0c76fffd35e7c2"
- "checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382"
- "checksum twoway 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1"
- "checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887"
-@@ -3134,13 +2836,11 @@ dependencies = [
- "checksum untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f"
- "checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
- "checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737"
--"checksum uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e1436e58182935dcd9ce0add9ea0b558e8a87befe01c1a301e6020aeb0876363"
- "checksum uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dab5c5526c5caa3d106653401a267fed923e7046f35895ffcb5ca42db64942e6"
- "checksum vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "def296d3eb3b12371b2c7d0e83bfe1403e4db2d7a0bba324a12b21c4ee13143d"
- "checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd"
- "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
- "checksum walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9d9d7ed3431229a144296213105a390676cc49c9b6a72bd19f3176c98e129fa1"
--"checksum want 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a05d9d966753fa4b5c8db73fcab5eed4549cfe0e1e4e66911e5564a0085c35d1"
- "checksum want 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "797464475f30ddb8830cc529aaaae648d581f99e2036a928877dfde027ddf6b3"
- "checksum webpki 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "17d7967316d8411ca3b01821ee6c332bde138ba4363becdb492f12e514daa17f"
- "checksum webpki-roots 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "85d1f408918fd590908a70d36b7ac388db2edc221470333e4d6e5b598e44cabf"
-@@ -3155,4 +2855,4 @@ dependencies = [
- "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
- "checksum yansi 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d60c3b48c9cdec42fb06b3b84b5b087405e1fa1c644a1af3930e4dfafe93de48"
- "checksum yansi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9fc79f4a1e39857fc00c3f662cbf2651c771f00e9c15fe2abc341806bd46bd71"
--"checksum yubico 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "16a79414bd7780b150a1959c5c9ec989668036fc68807eca52f30db86d078e56"
-+"checksum yubico 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "47c39daf43d8cb9c7a3dca905f274272ae1972e75b84ac4c7d645b98d1238d77"
-diff --git a/Cargo.toml b/Cargo.toml
-index bf59085..7126487 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -72,7 +72,7 @@ jsonwebtoken = "5.0.1"
- u2f = "0.1.4"
- 
- # Yubico Library
--yubico = { version = "0.5.0", features = ["online"], default-features = false }
-+yubico = { version = "0.5.1", features = ["online"], default-features = false }
- 
- # A `dotenv` implementation for Rust
- dotenv = { version = "0.13.0", default-features = false }
diff --git a/PKGBUILD b/PKGBUILD
index 20f61729bf70..83d7a6e41473 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=bitwarden_rs
 _pkgbase=bitwarden_rs
-pkgver=1.6.1
+pkgver=1.7.0
 pkgrel=1
 pkgdesc="An unofficial lightweight implementation of the bitwarden-server using rust and sqlite. Does NOT include the web-interface."
 arch=('i686' 'x86_64' 'armv7h' 'aarch64')
@@ -17,20 +17,17 @@ install=bitwarden_rs.install
 source=("https://github.com/dani-garcia/bitwarden_rs/archive/$pkgver.tar.gz"
 	"${_pkgbase}.install"
 	"${_pkgbase}.service"
-	"0001-Disable-Vault.patch"
-	"0002-Update-Yubico-Dep.patch")
-sha512sums=('4ff36f0104368e9544a04b1f0d11e4c1a16d726dcbaeb432f83251ed413971b27b71acddb5484bc0670d3f281c74fa0624b0f2f1ef5e44e4950508fd4a7e35b4'
+	"0001-Disable-Vault.patch")
+sha512sums=('434a1aaa721f82eaa9eb391ed48df210a14b15bb0c1ef975a5f6dc1b2a50721369b586fcc3e8447f4a82ef98c6eeb26d46a414959545f90c4683312ab001396e'
             '399e63002acb764895bbcf3b983642c8858343b36909eeeb73133de1a9740a3d81232bc206ff6bf3daed50f72354c5e6fd5314d0d044acd9f1cb23a933b1dd74'
             '4ce188956f6fe7cfdb711b1505f6344ed2775751ea112a0506dc96455c2705ab8529ec442e4747d7810fc3535b4ca78d1864e874dab5b5306373587097e02658'
-            'a6f2361c7aa83e63b9a557500406b0cd660e0d7f8b16345f859faa3f96e22bdcecd7589711960486fa0401896291f7d46f66882744c69117fc146056f4a49028'
-            'ccb82c2d895290acc2367797ecca6c050f0ce353932efeda15e4f96ed227a7e60cf1325731072b1e661a4e6f5bc705ae95c1badb1403911db1e5b6e94bb0a4cd')
+            'a6f2361c7aa83e63b9a557500406b0cd660e0d7f8b16345f859faa3f96e22bdcecd7589711960486fa0401896291f7d46f66882744c69117fc146056f4a49028')
 _src="$pkgname-$pkgver"
 
 build() {
 	#build bitwarden_rs
 	cd "$srcdir/$_src"
 	patch -N -p1 -i "$srcdir/0001-Disable-Vault.patch"
-	patch -N -p1 -i "$srcdir/0002-Update-Yubico-Dep.patch"
 	cargo build --release
 }