Switch back to Sequoia git
- Needed for Sequoia's new RFC 2822 parser.
This commit is contained in:
parent
1430a4accb
commit
9e104a9d8c
|
@ -14,7 +14,7 @@ hagrid-database = { path = "database" }
|
|||
failure = "0.1.5"
|
||||
rocket = "0"
|
||||
rocket_codegen = "0"
|
||||
sequoia-openpgp = "0.5"
|
||||
sequoia-openpgp = { git = "https://gitlab.com/sequoia-pgp/sequoia.git" }
|
||||
multipart = "0"
|
||||
log = "0"
|
||||
serde = "1.0"
|
||||
|
|
|
@ -5,7 +5,7 @@ authors = ["Kai Michaelis <kai@sequoia-pgp.org>"]
|
|||
|
||||
[dependencies]
|
||||
failure = "0.1.5"
|
||||
sequoia-openpgp = "0.5"
|
||||
sequoia-openpgp = { git = "https://gitlab.com/sequoia-pgp/sequoia.git" }
|
||||
multipart = "0"
|
||||
log = "0"
|
||||
rand = "0.6"
|
||||
|
|
|
@ -76,7 +76,7 @@ pub fn test_uid_verification<D: Database>(db: &mut D) {
|
|||
|
||||
assert!((uid == uid1) ^ (uid == uid2));
|
||||
let email =
|
||||
Email::from_str(&String::from_utf8(uid.userid().to_vec()).unwrap())
|
||||
Email::from_str(&String::from_utf8(uid.value().to_vec()).unwrap())
|
||||
.unwrap();
|
||||
assert_eq!(db.by_email(&email).unwrap(), raw);
|
||||
|
||||
|
@ -105,7 +105,7 @@ pub fn test_uid_verification<D: Database>(db: &mut D) {
|
|||
|
||||
assert!((uid == uid1) ^ (uid == uid2));
|
||||
let email =
|
||||
Email::from_str(&String::from_utf8(uid.userid().to_vec()).unwrap())
|
||||
Email::from_str(&String::from_utf8(uid.value().to_vec()).unwrap())
|
||||
.unwrap();
|
||||
assert_eq!(db.by_email(&email).unwrap(), raw);
|
||||
|
||||
|
@ -580,7 +580,7 @@ pub fn test_unlink_uid<D: Database>(db: &mut D) {
|
|||
let tpk_evil = TPKBuilder::default().add_userid(uid).generate().unwrap().0;
|
||||
let sig = {
|
||||
let uid = tpk_evil.userids()
|
||||
.find(|b| b.userid().userid() == uid.as_bytes()).unwrap();
|
||||
.find(|b| b.userid().value() == uid.as_bytes()).unwrap();
|
||||
assert_eq!(RevocationStatus::NotAsFarAsWeKnow, uid.revoked(None));
|
||||
|
||||
let mut keypair = tpk_evil.primary().clone().into_keypair().unwrap();
|
||||
|
|
|
@ -191,7 +191,7 @@ fn key_to_hkp_index<'a>(db: rocket::State<Polymorphic>, query: Query)
|
|||
|
||||
for uid in tpk.userids() {
|
||||
let u =
|
||||
url::form_urlencoded::byte_serialize(uid.userid().userid())
|
||||
url::form_urlencoded::byte_serialize(uid.userid().value())
|
||||
.fold(String::default(), |acc, x| acc + x);
|
||||
let ctime = uid
|
||||
.binding_signature()
|
||||
|
|
Loading…
Reference in New Issue