Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1.1.0] Serialise sigs as raw data, not DER encoded #2668

Merged
merged 2 commits into from
Mar 11, 2019
Merged

[1.1.0] Serialise sigs as raw data, not DER encoded #2668

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7103fb9
serialise signatures as raw data
yeastplume Mar 11, 2019
a04dba0
rustfmt
yeastplume Mar 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions core/src/libtx/secp_ser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ pub mod pubkey_serde {
pub mod option_sig_serde {
use crate::serde::{Deserialize, Deserializer, Serializer};
use crate::util::secp;
use crate::util::static_secp_instance;
use crate::util::{from_hex, to_hex};
use serde::de::Error;

Expand All @@ -66,11 +65,7 @@ pub mod option_sig_serde {
S: Serializer,
{
match sig {
Some(sig) => {
let static_secp = static_secp_instance();
let static_secp = static_secp.lock();
serializer.serialize_str(&to_hex(sig.serialize_der(&static_secp)))
}
Some(sig) => serializer.serialize_str(&to_hex(sig.to_raw_data().to_vec())),
None => serializer.serialize_none(),
}
}
Expand All @@ -80,14 +75,13 @@ pub mod option_sig_serde {
where
D: Deserializer<'de>,
{
let static_secp = static_secp_instance();
let static_secp = static_secp.lock();

Option::<&str>::deserialize(deserializer).and_then(|res| match res {
Some(string) => from_hex(string.to_string())
.map_err(|err| Error::custom(err.to_string()))
.and_then(|bytes: Vec<u8>| {
secp::Signature::from_der(&static_secp, &bytes)
let mut b = [0u8; 64];
b.copy_from_slice(&bytes[0..64]);
secp::Signature::from_raw_data(&b)
.map(|val| Some(val))
.map_err(|err| Error::custom(err.to_string()))
}),
Expand Down