Commit 40051ac4 authored by Justus Winter's avatar Justus Winter

Bump Sequoia to 0.6.

parent 38ec9a7f
......@@ -161,7 +161,7 @@ dependencies = [
[[package]]
name = "buffered-reader"
version = "0.5.0"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -1293,7 +1293,7 @@ version = "0.1.0"
dependencies = [
"rocket 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rocket_contrib 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"sequoia-openpgp 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"sequoia-openpgp 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -1303,11 +1303,11 @@ dependencies = [
[[package]]
name = "sequoia-openpgp"
version = "0.5.0"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
"buffered-reader 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"buffered-reader 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"flate2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -1317,9 +1317,20 @@ dependencies = [
"nettle 5.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
"quickcheck 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
"sequoia-rfc2822 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "sequoia-rfc2822"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"lalrpop 0.16.3 (registry+https://github.com/rust-lang/crates.io-index)",
"lalrpop-util 0.16.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "serde"
version = "1.0.89"
......@@ -1779,7 +1790,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum block-buffer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a076c298b9ecdb530ed9d967e74a6027d6a7478924520acddcddc24c1c8ab3ab"
"checksum block-buffer 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49665c62e0e700857531fa5d3763e91b539ff1abeebd56808d378b495870d60d"
"checksum block-padding 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d75255892aeb580d3c566f213a2b6fdc1c66667839f45719ee1d30ebf2aea591"
"checksum buffered-reader 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "53cdc819ee68b9c9411b4c21469dea6f6a19f3ec5879539f73929d3b51992057"
"checksum buffered-reader 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "665f6ebe9a736f5e3edfbf320c3910f56f6d9091b70c5f27f7fce531353f1c1a"
"checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39"
"checksum byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40"
"checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
......@@ -1911,7 +1922,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
"checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9"
"checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267"
"checksum sequoia-openpgp 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc40fb4922ef59c67c42fe4dd4804251c1d9dd0a80c36d3edf047e7bbe87b85"
"checksum sequoia-openpgp 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "69cca79e151ab86fbb6e7941c9b5351f23418233e28dc658c19b516a9d942cfd"
"checksum sequoia-rfc2822 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "27cf86678fa4a7768d6bc41df9da2f5be00f474bd00bd8cc3f87aff18cd1185a"
"checksum serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)" = "92514fb95f900c9b5126e32d020f5c6d40564c27a5ea6d1d7d9f157a96623560"
"checksum serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)" = "bb6eabf4b5914e88e24eea240bb7c9f9a2cbc1bbbe8d961d381975ec3c6b806c"
"checksum serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)" = "5a23aa71d4a4d43fdbfaac00eff68ba8a06a51759a89ac3304323e800c4dd40d"
......
......@@ -9,7 +9,7 @@ vergen = "3"
[dependencies]
rocket = "0.4"
sequoia-openpgp = "0.5"
sequoia-openpgp = "0.6"
serde = "1.0"
serde_derive = "1.0"
serde_json = "1.0"
......
This diff is collapsed.
......@@ -13,6 +13,7 @@ use rocket_contrib::templates::Template;
extern crate serde_json;
extern crate sequoia_openpgp as openpgp;
use openpgp::conversions::hex;
use openpgp::crypto::SessionKey;
extern crate time;
......@@ -106,7 +107,7 @@ fn decode(data: Option<&String>, hex: bool, mpis: bool,
data: data.clone(),
hex: hex,
mpis: mpis,
session_key: sk.as_ref().map(|sk| dump::to_hex(sk, false)),
session_key: sk.as_ref().map(|sk| hex::encode(sk)),
appears_encrypted: encrypted,
dump: String::from_utf8(result)?,
include_permalink: data.len() < 2000,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment