mirror of
https://github.com/chatmail/core.git
synced 2026-05-08 09:26:29 +03:00
refactor(create_keypair): remove unnecessary map_err
This commit is contained in:
@@ -4,7 +4,7 @@ use std::collections::{BTreeMap, HashSet};
|
|||||||
use std::io;
|
use std::io;
|
||||||
use std::io::Cursor;
|
use std::io::Cursor;
|
||||||
|
|
||||||
use anyhow::{bail, format_err, Context as _, Result};
|
use anyhow::{bail, Context as _, Result};
|
||||||
use pgp::armor::BlockType;
|
use pgp::armor::BlockType;
|
||||||
use pgp::composed::{
|
use pgp::composed::{
|
||||||
Deserializable, KeyType as PgpKeyType, Message, SecretKeyParamsBuilder, SignedPublicKey,
|
Deserializable, KeyType as PgpKeyType, Message, SecretKeyParamsBuilder, SignedPublicKey,
|
||||||
@@ -174,31 +174,25 @@ pub(crate) fn create_keypair(addr: EmailAddress, keygen_type: KeyGenType) -> Res
|
|||||||
.can_encrypt(true)
|
.can_encrypt(true)
|
||||||
.passphrase(None)
|
.passphrase(None)
|
||||||
.build()
|
.build()
|
||||||
.map_err(|e| format_err!("{}", e))
|
|
||||||
.context("failed to build subkey parameters")?,
|
.context("failed to build subkey parameters")?,
|
||||||
)
|
)
|
||||||
.build()
|
.build()
|
||||||
.map_err(|e| format_err!("{}", e))
|
|
||||||
.context("invalid key params")?;
|
.context("invalid key params")?;
|
||||||
let key = key_params.generate().context("invalid params")?;
|
let key = key_params.generate().context("invalid params")?;
|
||||||
let private_key = key
|
let private_key = key
|
||||||
.sign(|| "".into())
|
.sign(|| "".into())
|
||||||
.map_err(|e| format_err!("{}", e))
|
|
||||||
.context("failed to sign secret key")?;
|
.context("failed to sign secret key")?;
|
||||||
|
|
||||||
let public_key = private_key.public_key();
|
let public_key = private_key.public_key();
|
||||||
let public_key = public_key
|
let public_key = public_key
|
||||||
.sign(&private_key, || "".into())
|
.sign(&private_key, || "".into())
|
||||||
.map_err(|e| format_err!("{}", e))
|
|
||||||
.context("failed to sign public key")?;
|
.context("failed to sign public key")?;
|
||||||
|
|
||||||
private_key
|
private_key
|
||||||
.verify()
|
.verify()
|
||||||
.map_err(|e| format_err!("{}", e))
|
|
||||||
.context("invalid private key generated")?;
|
.context("invalid private key generated")?;
|
||||||
public_key
|
public_key
|
||||||
.verify()
|
.verify()
|
||||||
.map_err(|e| format_err!("{}", e))
|
|
||||||
.context("invalid public key generated")?;
|
.context("invalid public key generated")?;
|
||||||
|
|
||||||
Ok(KeyPair {
|
Ok(KeyPair {
|
||||||
|
|||||||
Reference in New Issue
Block a user