Auto merge of #2605 - jtgeibel:upgrade/cookie, r=JohnTitor

bors · bors · commit f3756f44f381 · 2020-07-06T05:18:59.000Z
Bump to the latest version of cookie crate This bumps to the latest release of `cookie` and addresses a deprecation. Upstream `conduit-cookie` has similar changes: conduit-rust/conduit-cookie@v0.9.0-alpha.3...v0.9.0-alpha.4 r? @JohnTitor
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -68,8 +68,8 @@ failure = "0.1.1"
 
 conduit = "0.9.0-alpha.2"
 conduit-conditional-get = "0.9.0-alpha.3"
-conduit-cookie = "0.9.0-alpha.3"
-cookie = { version = "0.13", features = ["secure"] }
+conduit-cookie = "0.9.0-alpha.4"
+cookie = { version = "0.14", features = ["secure"] }
 conduit-middleware = "0.9.0-alpha.2"
 conduit-router = "0.9.0-alpha.2"
 conduit-static = "0.9.0-alpha.3"
diff --git a/src/middleware.rs b/src/middleware.rs
@@ -62,7 +62,7 @@ pub fn build_middleware(app: Arc<App>, endpoints: R404) -> MiddlewareBuilder {
     m.add(Cookie::new());
     m.add(SessionMiddleware::new(
         "cargo_session",
-        cookie::Key::from_master(app.session_key.as_bytes()),
+        cookie::Key::derive_from(app.session_key.as_bytes()),
         env == Env::Production,
     ));
 
