ecdsa: rename asn1::Signature; impl signature trait#102

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

Merged
tarcieri merged 1 commit into from
Jul 23, 2020
Merged

ecdsa: rename asn1::Signature; impl signature trait #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
172 changes: 97 additions & 75 deletions ecdsa/src/asn1.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,8 @@ use crate::{
Error,
};
use core::{
convert::TryFrom,
convert::{TryFrom, TryInto},
fmt,
ops::{Add, Range},
};
use elliptic_curve::{consts::U9, ScalarBytes};
Expand All@@ -35,7 +36,7 @@ pub type MaxOverhead = U9;
/// Maximum size of an ASN.1 DER encoded signature for the given elliptic curve.
pub type MaxSize<ScalarSize> = <<ScalarSize as Add>::Output as Add<MaxOverhead>>::Output;

/// Byte array containing a serialized ASN.1 document
/// Byte array containing a serialized ASN.1 signature
type DocumentBytes<ScalarSize> = GenericArray<u8, MaxSize<ScalarSize>>;

/// ASN.1 `INTEGER` tag
Expand All@@ -44,10 +45,10 @@ const INTEGER_TAG: u8 = 0x02;
/// ASN.1 `SEQUENCE` tag
const SEQUENCE_TAG: u8 = 0x30;

/// Document containing an ASN.1 DER-encoded signature.
/// ASN.1 DER-encoded signature.
///
/// Generic over the scalar size of the elliptic curve.
pub struct Document<ScalarSize>
pub struct Signature<ScalarSize>
where
ScalarSize: Add + ArrayLength<u8>,
MaxSize<ScalarSize>: ArrayLength<u8>,
Expand All@@ -56,86 +57,33 @@ where
/// ASN.1 DER-encoded signature data
bytes: DocumentBytes<ScalarSize>,

/// Range of the `r` value within the document
/// Range of the `r` value within the signature
r_range: Range<usize>,

/// Range of the `s` value within the document
/// Range of the `s` value within the signature
s_range: Range<usize>,
}

#[allow(clippy::len_without_is_empty)]
impl<ScalarSize> Document<ScalarSize>
impl<ScalarSize> signature::Signature for Signature<ScalarSize>
where
ScalarSize: Add + ArrayLength<u8>,
MaxSize<ScalarSize>: ArrayLength<u8>,
<ScalarSize as Add>::Output: Add<MaxOverhead> + ArrayLength<u8>,
{
/// Parse an ASN.1 DER-encoded ECDSA signature from a byte slice
pub fn from_bytes(bytes: impl AsRef<[u8]>) -> Result<Self, Error> {
let input = bytes.as_ref();

// Signature format is a SEQUENCE of two INTEGER values. We
// support only integers of less than 127 bytes each (signed
// encoding) so the resulting raw signature will have length
// at most 254 bytes.
//
// First byte is SEQUENCE tag.
if input[0] != SEQUENCE_TAG as u8 {
return Err(Error::new());
}

// The SEQUENCE length will be encoded over one or two bytes. We
// limit the total SEQUENCE contents to 255 bytes, because it
// makes things simpler; this is enough for subgroup orders up
// to 999 bits.
let mut zlen = input[1] as usize;

let offset = if zlen > 0x80 {
if zlen != 0x81 {
return Err(Error::new());
}

zlen = input[2] as usize;
3
} else {
2
};

if zlen != input.len().checked_sub(offset).unwrap() {
return Err(Error::new());
}

// First INTEGER (r)
let r_range = parse_int(&input[offset..], ScalarSize::to_usize())?;
let r_start = offset.checked_add(r_range.start).unwrap();
let r_end = offset.checked_add(r_range.end).unwrap();

// Second INTEGER (s)
let s_range = parse_int(&input[r_end..], ScalarSize::to_usize())?;
let s_start = r_end.checked_add(s_range.start).unwrap();
let s_end = r_end.checked_add(s_range.end).unwrap();

if s_end != bytes.as_ref().len() {
return Err(Error::new());
}

let mut byte_arr = DocumentBytes::<ScalarSize>::default();
byte_arr[..s_end].copy_from_slice(bytes.as_ref());

Ok(Document {
bytes: byte_arr,
r_range: Range {
start: r_start,
end: r_end,
},
s_range: Range {
start: s_start,
end: s_end,
},
})
fn from_bytes(bytes: &[u8]) -> Result<Self, Error> {
bytes.try_into()
}
}

/// Get the length of the document
#[allow(clippy::len_without_is_empty)]
impl<ScalarSize> Signature<ScalarSize>
where
ScalarSize: Add + ArrayLength<u8>,
MaxSize<ScalarSize>: ArrayLength<u8>,
<ScalarSize as Add>::Output: Add<MaxOverhead> + ArrayLength<u8>,
{
/// Get the length of the signature in bytes
pub fn len(&self) -> usize {
self.s_range.end
}
Expand DownExpand Up@@ -168,7 +116,9 @@ where
serialize_int(s.as_slice(), &mut bytes[r_end..], s_len, scalar_size);
let s_end = r_end.checked_add(2).unwrap().checked_add(s_len).unwrap();

Self::from_bytes(&bytes[..s_end]).expect("generated invalid ASN.1 DER")
bytes[..s_end]
.try_into()
.expect("generated invalid ASN.1 DER")
}

/// Get the `r` component of the signature (leading zeros removed)
Expand All@@ -182,7 +132,7 @@ where
}
}

impl<ScalarSize> AsRef<[u8]> for Document<ScalarSize>
impl<ScalarSize> AsRef<[u8]> for Signature<ScalarSize>
where
ScalarSize: Add + ArrayLength<u8>,
MaxSize<ScalarSize>: ArrayLength<u8>,
Expand All@@ -193,7 +143,21 @@ where
}
}

impl<ScalarSize> TryFrom<&[u8]> for Document<ScalarSize>
impl<ScalarSize> fmt::Debug for Signature<ScalarSize>
where
ScalarSize: Add + ArrayLength<u8>,
MaxSize<ScalarSize>: ArrayLength<u8>,
<ScalarSize as Add>::Output: Add<MaxOverhead> + ArrayLength<u8>,
{
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("asn1::Signature")
.field("r", &self.r())
.field("s", &self.s())
.finish()
}
}

impl<ScalarSize> TryFrom<&[u8]> for Signature<ScalarSize>
where
ScalarSize: Add + ArrayLength<u8>,
MaxSize<ScalarSize>: ArrayLength<u8>,
Expand All@@ -202,7 +166,65 @@ where
type Error = Error;

fn try_from(bytes: &[u8]) -> Result<Self, Error> {
Self::from_bytes(bytes)
// Signature format is a SEQUENCE of two INTEGER values. We
// support only integers of less than 127 bytes each (signed
// encoding) so the resulting raw signature will have length
// at most 254 bytes.
//
// First byte is SEQUENCE tag.
if bytes[0] != SEQUENCE_TAG as u8 {
return Err(Error::new());
}

// The SEQUENCE length will be encoded over one or two bytes. We
// limit the total SEQUENCE contents to 255 bytes, because it
// makes things simpler; this is enough for subgroup orders up
// to 999 bits.
let mut zlen = bytes[1] as usize;

let offset = if zlen > 0x80 {
if zlen != 0x81 {
return Err(Error::new());
}

zlen = bytes[2] as usize;
3
} else {
2
};

if zlen != bytes.len().checked_sub(offset).unwrap() {
return Err(Error::new());
}

// First INTEGER (r)
let r_range = parse_int(&bytes[offset..], ScalarSize::to_usize())?;
let r_start = offset.checked_add(r_range.start).unwrap();
let r_end = offset.checked_add(r_range.end).unwrap();

// Second INTEGER (s)
let s_range = parse_int(&bytes[r_end..], ScalarSize::to_usize())?;
let s_start = r_end.checked_add(s_range.start).unwrap();
let s_end = r_end.checked_add(s_range.end).unwrap();

if s_end != bytes.as_ref().len() {
return Err(Error::new());
}

let mut byte_arr = DocumentBytes::<ScalarSize>::default();
byte_arr[..s_end].copy_from_slice(bytes.as_ref());

Ok(Signature {
bytes: byte_arr,
r_range: Range {
start: r_start,
end: r_end,
},
s_range: Range {
start: s_start,
end: s_end,
},
})
}
}

Expand Down
10 changes: 5 additions & 5 deletions ecdsa/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,17 +97,17 @@ where
asn1::MaxSize<C::ScalarSize>: ArrayLength<u8>,
<C::ScalarSize as Add>::Output: Add<asn1::MaxOverhead> + ArrayLength<u8>,
{
asn1::Document::<C::ScalarSize>::from_bytes(bytes).map(Into::into)
asn1::Signature::<C::ScalarSize>::try_from(bytes).map(Into::into)
}

/// Serialize this signature as ASN.1 DER
pub fn to_asn1(&self) -> asn1::Document<C::ScalarSize>
pub fn to_asn1(&self) -> asn1::Signature<C::ScalarSize>
where
C::ScalarSize: Add + ArrayLength<u8>,
asn1::MaxSize<C::ScalarSize>: ArrayLength<u8>,
<C::ScalarSize as Add>::Output: Add<asn1::MaxOverhead> + ArrayLength<u8>,
{
asn1::Document::from_scalars(self.r(), self.s())
asn1::Signature::from_scalars(self.r(), self.s())
}

/// Get the `r` component of this signature
Expand DownExpand Up@@ -170,14 +170,14 @@ where
}
}

impl<C> From<asn1::Document<C::ScalarSize>> for Signature<C>
impl<C> From<asn1::Signature<C::ScalarSize>> for Signature<C>
where
C: Curve,
C::ScalarSize: Add + ArrayLength<u8>,
asn1::MaxSize<C::ScalarSize>: ArrayLength<u8>,
<C::ScalarSize as Add>::Output: Add<asn1::MaxOverhead> + ArrayLength<u8>,
{
fn from(doc: asn1::Document<C::ScalarSize>) -> Signature<C> {
fn from(doc: asn1::Signature<C::ScalarSize>) -> Signature<C> {
let mut bytes = SignatureBytes::<C>::default();
let scalar_size = C::ScalarSize::to_usize();
let r_begin = scalar_size.checked_sub(doc.r().len()).unwrap();
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ecdsa: rename asn1::Signature; impl signature trait#102

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

 Merged

tarcieri
merged 1 commit into

from

Jul 23, 2020
 Merged


ecdsa: rename asn1::Signature; impl signature trait
#102
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


172 changes: 97 additions & 75 deletions
ecdsa/src/asn1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,8 @@ use crate::{
 Error,
};
use core::{
 convert::TryFrom,
 convert::{TryFrom, TryInto},
 fmt,
 ops::{Add, Range},
};
use elliptic_curve::{consts::U9, ScalarBytes};
Expand All@@ -35,7 +36,7 @@ pub type MaxOverhead = U9;
/// Maximum size of an ASN.1 DER encoded signature for the given elliptic curve.
pub type MaxSize<ScalarSize> = <<ScalarSize as Add>::Output as Add<MaxOverhead>>::Output;

/// Byte array containing a serialized ASN.1 document
/// Byte array containing a serialized ASN.1 signature
type DocumentBytes<ScalarSize> = GenericArray<u8, MaxSize<ScalarSize>>;

/// ASN.1 `INTEGER` tag
Expand All@@ -44,10 +45,10 @@ const INTEGER_TAG: u8 = 0x02;
/// ASN.1 `SEQUENCE` tag
const SEQUENCE_TAG: u8 = 0x30;

/// Document containing an ASN.1 DER-encoded signature.
/// ASN.1 DER-encoded signature.
///
/// Generic over the scalar size of the elliptic curve.
pub struct Document<ScalarSize>
pub struct Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
Expand All@@ -56,86 +57,33 @@ where
 /// ASN.1 DER-encoded signature data
 bytes: DocumentBytes<ScalarSize>,

 /// Range of the `r` value within the document
 /// Range of the `r` value within the signature
 r_range: Range<usize>,

 /// Range of the `s` value within the document
 /// Range of the `s` value within the signature
 s_range: Range<usize>,
}

#[allow(clippy::len_without_is_empty)]
impl<ScalarSize> Document<ScalarSize>
impl<ScalarSize> signature::Signature for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
 <ScalarSize as Add>::Output: Add<MaxOverhead> + ArrayLength<u8>,
{
 /// Parse an ASN.1 DER-encoded ECDSA signature from a byte slice
 pub fn from_bytes(bytes: impl AsRef<[u8]>) -> Result<Self, Error> {
 let input = bytes.as_ref();

 // Signature format is a SEQUENCE of two INTEGER values. We
 // support only integers of less than 127 bytes each (signed
 // encoding) so the resulting raw signature will have length
 // at most 254 bytes.
 //
 // First byte is SEQUENCE tag.
 if input[0] != SEQUENCE_TAG as u8 {
 return Err(Error::new());
 }

 // The SEQUENCE length will be encoded over one or two bytes. We
 // limit the total SEQUENCE contents to 255 bytes, because it
 // makes things simpler; this is enough for subgroup orders up
 // to 999 bits.
 let mut zlen = input[1] as usize;

 let offset = if zlen > 0x80 {
 if zlen != 0x81 {
 return Err(Error::new());
 }

 zlen = input[2] as usize;
 3
 } else {
 2
 };

 if zlen != input.len().checked_sub(offset).unwrap() {
 return Err(Error::new());
 }

 // First INTEGER (r)
 let r_range = parse_int(&input[offset..], ScalarSize::to_usize())?;
 let r_start = offset.checked_add(r_range.start).unwrap();
 let r_end = offset.checked_add(r_range.end).unwrap();

 // Second INTEGER (s)
 let s_range = parse_int(&input[r_end..], ScalarSize::to_usize())?;
 let s_start = r_end.checked_add(s_range.start).unwrap();
 let s_end = r_end.checked_add(s_range.end).unwrap();

 if s_end != bytes.as_ref().len() {
 return Err(Error::new());
 }

 let mut byte_arr = DocumentBytes::<ScalarSize>::default();
 byte_arr[..s_end].copy_from_slice(bytes.as_ref());

 Ok(Document {
 bytes: byte_arr,
 r_range: Range {
 start: r_start,
 end: r_end,
 },
 s_range: Range {
 start: s_start,
 end: s_end,
 },
 })
 fn from_bytes(bytes: &[u8]) -> Result<Self, Error> {
 bytes.try_into()
 }
}

 /// Get the length of the document
#[allow(clippy::len_without_is_empty)]
impl<ScalarSize> Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
 <ScalarSize as Add>::Output: Add<MaxOverhead> + ArrayLength<u8>,
{
 /// Get the length of the signature in bytes
 pub fn len(&self) -> usize {
 self.s_range.end
 }
Expand DownExpand Up@@ -168,7 +116,9 @@ where
 serialize_int(s.as_slice(), &mut bytes[r_end..], s_len, scalar_size);
 let s_end = r_end.checked_add(2).unwrap().checked_add(s_len).unwrap();

 Self::from_bytes(&bytes[..s_end]).expect("generated invalid ASN.1 DER")
 bytes[..s_end]
 .try_into()
 .expect("generated invalid ASN.1 DER")
 }

 /// Get the `r` component of the signature (leading zeros removed)
Expand All@@ -182,7 +132,7 @@ where
 }
}

impl<ScalarSize> AsRef<[u8]> for Document<ScalarSize>
impl<ScalarSize> AsRef<[u8]> for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
Expand All@@ -193,7 +143,21 @@ where
 }
}

impl<ScalarSize> TryFrom<&[u8]> for Document<ScalarSize>
impl<ScalarSize> fmt::Debug for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
 <ScalarSize as Add>::Output: Add<MaxOverhead> + ArrayLength<u8>,
{
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 f.debug_struct("asn1::Signature")
 .field("r", &self.r())
 .field("s", &self.s())
 .finish()
 }
}

impl<ScalarSize> TryFrom<&[u8]> for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
Expand All@@ -202,7 +166,65 @@ where
 type Error = Error;

 fn try_from(bytes: &[u8]) -> Result<Self, Error> {
 Self::from_bytes(bytes)
 // Signature format is a SEQUENCE of two INTEGER values. We
 // support only integers of less than 127 bytes each (signed
 // encoding) so the resulting raw signature will have length
 // at most 254 bytes.
 //
 // First byte is SEQUENCE tag.
 if bytes[0] != SEQUENCE_TAG as u8 {
 return Err(Error::new());
 }

 // The SEQUENCE length will be encoded over one or two bytes. We
 // limit the total SEQUENCE contents to 255 bytes, because it
 // makes things simpler; this is enough for subgroup orders up
 // to 999 bits.
 let mut zlen = bytes[1] as usize;

 let offset = if zlen > 0x80 {
 if zlen != 0x81 {
 return Err(Error::new());
 }

 zlen = bytes[2] as usize;
 3
 } else {
 2
 };

 if zlen != bytes.len().checked_sub(offset).unwrap() {
 return Err(Error::new());
 }

 // First INTEGER (r)
 let r_range = parse_int(&bytes[offset..], ScalarSize::to_usize())?;
 let r_start = offset.checked_add(r_range.start).unwrap();
 let r_end = offset.checked_add(r_range.end).unwrap();

 // Second INTEGER (s)
 let s_range = parse_int(&bytes[r_end..], ScalarSize::to_usize())?;
 let s_start = r_end.checked_add(s_range.start).unwrap();
 let s_end = r_end.checked_add(s_range.end).unwrap();

 if s_end != bytes.as_ref().len() {
 return Err(Error::new());
 }

 let mut byte_arr = DocumentBytes::<ScalarSize>::default();
 byte_arr[..s_end].copy_from_slice(bytes.as_ref());

 Ok(Signature {
 bytes: byte_arr,
 r_range: Range {
 start: r_start,
 end: r_end,
 },
 s_range: Range {
 start: s_start,
 end: s_end,
 },
 })
 }
}

Expand Down

10 changes: 5 additions & 5 deletions
ecdsa/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,17 +97,17 @@ where
 asn1::MaxSize<C::ScalarSize>: ArrayLength<u8>,
 <C::ScalarSize as Add>::Output: Add<asn1::MaxOverhead> + ArrayLength<u8>,
 {
 asn1::Document::<C::ScalarSize>::from_bytes(bytes).map(Into::into)
 asn1::Signature::<C::ScalarSize>::try_from(bytes).map(Into::into)
 }

 /// Serialize this signature as ASN.1 DER
 pub fn to_asn1(&self) -> asn1::Document<C::ScalarSize>
 pub fn to_asn1(&self) -> asn1::Signature<C::ScalarSize>
 where
 C::ScalarSize: Add + ArrayLength<u8>,
 asn1::MaxSize<C::ScalarSize>: ArrayLength<u8>,
 <C::ScalarSize as Add>::Output: Add<asn1::MaxOverhead> + ArrayLength<u8>,
 {
 asn1::Document::from_scalars(self.r(), self.s())
 asn1::Signature::from_scalars(self.r(), self.s())
 }

 /// Get the `r` component of this signature
Expand DownExpand Up@@ -170,14 +170,14 @@ where
 }
}

impl<C> From<asn1::Document<C::ScalarSize>> for Signature<C>
impl<C> From<asn1::Signature<C::ScalarSize>> for Signature<C>
where
 C: Curve,
 C::ScalarSize: Add + ArrayLength<u8>,
 asn1::MaxSize<C::ScalarSize>: ArrayLength<u8>,
 <C::ScalarSize as Add>::Output: Add<asn1::MaxOverhead> + ArrayLength<u8>,
{
 fn from(doc: asn1::Document<C::ScalarSize>) -> Signature<C> {
 fn from(doc: asn1::Signature<C::ScalarSize>) -> Signature<C> {
 let mut bytes = SignatureBytes::<C>::default();
 let scalar_size = C::ScalarSize::to_usize();
 let r_begin = scalar_size.checked_sub(doc.r().len()).unwrap();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ecdsa: rename asn1::Signature; impl signature trait#102

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

 Merged

tarcieri
merged 1 commit into

from

Jul 23, 2020
 Merged


ecdsa: rename asn1::Signature; impl signature trait
#102
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


172 changes: 97 additions & 75 deletions
ecdsa/src/asn1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,8 @@ use crate::{
 Error,
};
use core::{
 convert::TryFrom,
 convert::{TryFrom, TryInto},
 fmt,
 ops::{Add, Range},
};
use elliptic_curve::{consts::U9, ScalarBytes};
Expand All@@ -35,7 +36,7 @@ pub type MaxOverhead = U9;
/// Maximum size of an ASN.1 DER encoded signature for the given elliptic curve.
pub type MaxSize<ScalarSize> = <<ScalarSize as Add>::Output as Add<MaxOverhead>>::Output;

/// Byte array containing a serialized ASN.1 document
/// Byte array containing a serialized ASN.1 signature
type DocumentBytes<ScalarSize> = GenericArray<u8, MaxSize<ScalarSize>>;

/// ASN.1 `INTEGER` tag
Expand All@@ -44,10 +45,10 @@ const INTEGER_TAG: u8 = 0x02;
/// ASN.1 `SEQUENCE` tag
const SEQUENCE_TAG: u8 = 0x30;

/// Document containing an ASN.1 DER-encoded signature.
/// ASN.1 DER-encoded signature.
///
/// Generic over the scalar size of the elliptic curve.
pub struct Document<ScalarSize>
pub struct Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
Expand All@@ -56,86 +57,33 @@ where
 /// ASN.1 DER-encoded signature data
 bytes: DocumentBytes<ScalarSize>,

 /// Range of the `r` value within the document
 /// Range of the `r` value within the signature
 r_range: Range<usize>,

 /// Range of the `s` value within the document
 /// Range of the `s` value within the signature
 s_range: Range<usize>,
}

#[allow(clippy::len_without_is_empty)]
impl<ScalarSize> Document<ScalarSize>
impl<ScalarSize> signature::Signature for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
 <ScalarSize as Add>::Output: Add<MaxOverhead> + ArrayLength<u8>,
{
 /// Parse an ASN.1 DER-encoded ECDSA signature from a byte slice
 pub fn from_bytes(bytes: impl AsRef<[u8]>) -> Result<Self, Error> {
 let input = bytes.as_ref();

 // Signature format is a SEQUENCE of two INTEGER values. We
 // support only integers of less than 127 bytes each (signed
 // encoding) so the resulting raw signature will have length
 // at most 254 bytes.
 //
 // First byte is SEQUENCE tag.
 if input[0] != SEQUENCE_TAG as u8 {
 return Err(Error::new());
 }

 // The SEQUENCE length will be encoded over one or two bytes. We
 // limit the total SEQUENCE contents to 255 bytes, because it
 // makes things simpler; this is enough for subgroup orders up
 // to 999 bits.
 let mut zlen = input[1] as usize;

 let offset = if zlen > 0x80 {
 if zlen != 0x81 {
 return Err(Error::new());
 }

 zlen = input[2] as usize;
 3
 } else {
 2
 };

 if zlen != input.len().checked_sub(offset).unwrap() {
 return Err(Error::new());
 }

 // First INTEGER (r)
 let r_range = parse_int(&input[offset..], ScalarSize::to_usize())?;
 let r_start = offset.checked_add(r_range.start).unwrap();
 let r_end = offset.checked_add(r_range.end).unwrap();

 // Second INTEGER (s)
 let s_range = parse_int(&input[r_end..], ScalarSize::to_usize())?;
 let s_start = r_end.checked_add(s_range.start).unwrap();
 let s_end = r_end.checked_add(s_range.end).unwrap();

 if s_end != bytes.as_ref().len() {
 return Err(Error::new());
 }

 let mut byte_arr = DocumentBytes::<ScalarSize>::default();
 byte_arr[..s_end].copy_from_slice(bytes.as_ref());

 Ok(Document {
 bytes: byte_arr,
 r_range: Range {
 start: r_start,
 end: r_end,
 },
 s_range: Range {
 start: s_start,
 end: s_end,
 },
 })
 fn from_bytes(bytes: &[u8]) -> Result<Self, Error> {
 bytes.try_into()
 }
}

 /// Get the length of the document
#[allow(clippy::len_without_is_empty)]
impl<ScalarSize> Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
 <ScalarSize as Add>::Output: Add<MaxOverhead> + ArrayLength<u8>,
{
 /// Get the length of the signature in bytes
 pub fn len(&self) -> usize {
 self.s_range.end
 }
Expand DownExpand Up@@ -168,7 +116,9 @@ where
 serialize_int(s.as_slice(), &mut bytes[r_end..], s_len, scalar_size);
 let s_end = r_end.checked_add(2).unwrap().checked_add(s_len).unwrap();

 Self::from_bytes(&bytes[..s_end]).expect("generated invalid ASN.1 DER")
 bytes[..s_end]
 .try_into()
 .expect("generated invalid ASN.1 DER")
 }

 /// Get the `r` component of the signature (leading zeros removed)
Expand All@@ -182,7 +132,7 @@ where
 }
}

impl<ScalarSize> AsRef<[u8]> for Document<ScalarSize>
impl<ScalarSize> AsRef<[u8]> for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
Expand All@@ -193,7 +143,21 @@ where
 }
}

impl<ScalarSize> TryFrom<&[u8]> for Document<ScalarSize>
impl<ScalarSize> fmt::Debug for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
 <ScalarSize as Add>::Output: Add<MaxOverhead> + ArrayLength<u8>,
{
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 f.debug_struct("asn1::Signature")
 .field("r", &self.r())
 .field("s", &self.s())
 .finish()
 }
}

impl<ScalarSize> TryFrom<&[u8]> for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
Expand All@@ -202,7 +166,65 @@ where
 type Error = Error;

 fn try_from(bytes: &[u8]) -> Result<Self, Error> {
 Self::from_bytes(bytes)
 // Signature format is a SEQUENCE of two INTEGER values. We
 // support only integers of less than 127 bytes each (signed
 // encoding) so the resulting raw signature will have length
 // at most 254 bytes.
 //
 // First byte is SEQUENCE tag.
 if bytes[0] != SEQUENCE_TAG as u8 {
 return Err(Error::new());
 }

 // The SEQUENCE length will be encoded over one or two bytes. We
 // limit the total SEQUENCE contents to 255 bytes, because it
 // makes things simpler; this is enough for subgroup orders up
 // to 999 bits.
 let mut zlen = bytes[1] as usize;

 let offset = if zlen > 0x80 {
 if zlen != 0x81 {
 return Err(Error::new());
 }

 zlen = bytes[2] as usize;
 3
 } else {
 2
 };

 if zlen != bytes.len().checked_sub(offset).unwrap() {
 return Err(Error::new());
 }

 // First INTEGER (r)
 let r_range = parse_int(&bytes[offset..], ScalarSize::to_usize())?;
 let r_start = offset.checked_add(r_range.start).unwrap();
 let r_end = offset.checked_add(r_range.end).unwrap();

 // Second INTEGER (s)
 let s_range = parse_int(&bytes[r_end..], ScalarSize::to_usize())?;
 let s_start = r_end.checked_add(s_range.start).unwrap();
 let s_end = r_end.checked_add(s_range.end).unwrap();

 if s_end != bytes.as_ref().len() {
 return Err(Error::new());
 }

 let mut byte_arr = DocumentBytes::<ScalarSize>::default();
 byte_arr[..s_end].copy_from_slice(bytes.as_ref());

 Ok(Signature {
 bytes: byte_arr,
 r_range: Range {
 start: r_start,
 end: r_end,
 },
 s_range: Range {
 start: s_start,
 end: s_end,
 },
 })
 }
}

Expand Down

10 changes: 5 additions & 5 deletions
ecdsa/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,17 +97,17 @@ where
 asn1::MaxSize<C::ScalarSize>: ArrayLength<u8>,
 <C::ScalarSize as Add>::Output: Add<asn1::MaxOverhead> + ArrayLength<u8>,
 {
 asn1::Document::<C::ScalarSize>::from_bytes(bytes).map(Into::into)
 asn1::Signature::<C::ScalarSize>::try_from(bytes).map(Into::into)
 }

 /// Serialize this signature as ASN.1 DER
 pub fn to_asn1(&self) -> asn1::Document<C::ScalarSize>
 pub fn to_asn1(&self) -> asn1::Signature<C::ScalarSize>
 where
 C::ScalarSize: Add + ArrayLength<u8>,
 asn1::MaxSize<C::ScalarSize>: ArrayLength<u8>,
 <C::ScalarSize as Add>::Output: Add<asn1::MaxOverhead> + ArrayLength<u8>,
 {
 asn1::Document::from_scalars(self.r(), self.s())
 asn1::Signature::from_scalars(self.r(), self.s())
 }

 /// Get the `r` component of this signature
Expand DownExpand Up@@ -170,14 +170,14 @@ where
 }
}

impl<C> From<asn1::Document<C::ScalarSize>> for Signature<C>
impl<C> From<asn1::Signature<C::ScalarSize>> for Signature<C>
where
 C: Curve,
 C::ScalarSize: Add + ArrayLength<u8>,
 asn1::MaxSize<C::ScalarSize>: ArrayLength<u8>,
 <C::ScalarSize as Add>::Output: Add<asn1::MaxOverhead> + ArrayLength<u8>,
{
 fn from(doc: asn1::Document<C::ScalarSize>) -> Signature<C> {
 fn from(doc: asn1::Signature<C::ScalarSize>) -> Signature<C> {
 let mut bytes = SignatureBytes::<C>::default();
 let scalar_size = C::ScalarSize::to_usize();
 let r_begin = scalar_size.checked_sub(doc.r().len()).unwrap();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ecdsa: rename asn1::Signature; impl signature trait#102

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

 Merged

tarcieri
merged 1 commit into

from

Jul 23, 2020
 Merged


ecdsa: rename asn1::Signature; impl signature trait
#102
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


172 changes: 97 additions & 75 deletions
ecdsa/src/asn1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,8 @@ use crate::{
 Error,
};
use core::{
 convert::TryFrom,
 convert::{TryFrom, TryInto},
 fmt,
 ops::{Add, Range},
};
use elliptic_curve::{consts::U9, ScalarBytes};
Expand All@@ -35,7 +36,7 @@ pub type MaxOverhead = U9;
/// Maximum size of an ASN.1 DER encoded signature for the given elliptic curve.
pub type MaxSize<ScalarSize> = <<ScalarSize as Add>::Output as Add<MaxOverhead>>::Output;

/// Byte array containing a serialized ASN.1 document
/// Byte array containing a serialized ASN.1 signature
type DocumentBytes<ScalarSize> = GenericArray<u8, MaxSize<ScalarSize>>;

/// ASN.1 `INTEGER` tag
Expand All@@ -44,10 +45,10 @@ const INTEGER_TAG: u8 = 0x02;
/// ASN.1 `SEQUENCE` tag
const SEQUENCE_TAG: u8 = 0x30;

/// Document containing an ASN.1 DER-encoded signature.
/// ASN.1 DER-encoded signature.
///
/// Generic over the scalar size of the elliptic curve.
pub struct Document<ScalarSize>
pub struct Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
Expand All@@ -56,86 +57,33 @@ where
 /// ASN.1 DER-encoded signature data
 bytes: DocumentBytes<ScalarSize>,

 /// Range of the `r` value within the document
 /// Range of the `r` value within the signature
 r_range: Range<usize>,

 /// Range of the `s` value within the document
 /// Range of the `s` value within the signature
 s_range: Range<usize>,
}

#[allow(clippy::len_without_is_empty)]
impl<ScalarSize> Document<ScalarSize>
impl<ScalarSize> signature::Signature for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
 <ScalarSize as Add>::Output: Add<MaxOverhead> + ArrayLength<u8>,
{
 /// Parse an ASN.1 DER-encoded ECDSA signature from a byte slice
 pub fn from_bytes(bytes: impl AsRef<[u8]>) -> Result<Self, Error> {
 let input = bytes.as_ref();

 // Signature format is a SEQUENCE of two INTEGER values. We
 // support only integers of less than 127 bytes each (signed
 // encoding) so the resulting raw signature will have length
 // at most 254 bytes.
 //
 // First byte is SEQUENCE tag.
 if input[0] != SEQUENCE_TAG as u8 {
 return Err(Error::new());
 }

 // The SEQUENCE length will be encoded over one or two bytes. We
 // limit the total SEQUENCE contents to 255 bytes, because it
 // makes things simpler; this is enough for subgroup orders up
 // to 999 bits.
 let mut zlen = input[1] as usize;

 let offset = if zlen > 0x80 {
 if zlen != 0x81 {
 return Err(Error::new());
 }

 zlen = input[2] as usize;
 3
 } else {
 2
 };

 if zlen != input.len().checked_sub(offset).unwrap() {
 return Err(Error::new());
 }

 // First INTEGER (r)
 let r_range = parse_int(&input[offset..], ScalarSize::to_usize())?;
 let r_start = offset.checked_add(r_range.start).unwrap();
 let r_end = offset.checked_add(r_range.end).unwrap();

 // Second INTEGER (s)
 let s_range = parse_int(&input[r_end..], ScalarSize::to_usize())?;
 let s_start = r_end.checked_add(s_range.start).unwrap();
 let s_end = r_end.checked_add(s_range.end).unwrap();

 if s_end != bytes.as_ref().len() {
 return Err(Error::new());
 }

 let mut byte_arr = DocumentBytes::<ScalarSize>::default();
 byte_arr[..s_end].copy_from_slice(bytes.as_ref());

 Ok(Document {
 bytes: byte_arr,
 r_range: Range {
 start: r_start,
 end: r_end,
 },
 s_range: Range {
 start: s_start,
 end: s_end,
 },
 })
 fn from_bytes(bytes: &[u8]) -> Result<Self, Error> {
 bytes.try_into()
 }
}

 /// Get the length of the document
#[allow(clippy::len_without_is_empty)]
impl<ScalarSize> Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
 <ScalarSize as Add>::Output: Add<MaxOverhead> + ArrayLength<u8>,
{
 /// Get the length of the signature in bytes
 pub fn len(&self) -> usize {
 self.s_range.end
 }
Expand DownExpand Up@@ -168,7 +116,9 @@ where
 serialize_int(s.as_slice(), &mut bytes[r_end..], s_len, scalar_size);
 let s_end = r_end.checked_add(2).unwrap().checked_add(s_len).unwrap();

 Self::from_bytes(&bytes[..s_end]).expect("generated invalid ASN.1 DER")
 bytes[..s_end]
 .try_into()
 .expect("generated invalid ASN.1 DER")
 }

 /// Get the `r` component of the signature (leading zeros removed)
Expand All@@ -182,7 +132,7 @@ where
 }
}

impl<ScalarSize> AsRef<[u8]> for Document<ScalarSize>
impl<ScalarSize> AsRef<[u8]> for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
Expand All@@ -193,7 +143,21 @@ where
 }
}

impl<ScalarSize> TryFrom<&[u8]> for Document<ScalarSize>
impl<ScalarSize> fmt::Debug for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
 <ScalarSize as Add>::Output: Add<MaxOverhead> + ArrayLength<u8>,
{
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 f.debug_struct("asn1::Signature")
 .field("r", &self.r())
 .field("s", &self.s())
 .finish()
 }
}

impl<ScalarSize> TryFrom<&[u8]> for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
Expand All@@ -202,7 +166,65 @@ where
 type Error = Error;

 fn try_from(bytes: &[u8]) -> Result<Self, Error> {
 Self::from_bytes(bytes)
 // Signature format is a SEQUENCE of two INTEGER values. We
 // support only integers of less than 127 bytes each (signed
 // encoding) so the resulting raw signature will have length
 // at most 254 bytes.
 //
 // First byte is SEQUENCE tag.
 if bytes[0] != SEQUENCE_TAG as u8 {
 return Err(Error::new());
 }

 // The SEQUENCE length will be encoded over one or two bytes. We
 // limit the total SEQUENCE contents to 255 bytes, because it
 // makes things simpler; this is enough for subgroup orders up
 // to 999 bits.
 let mut zlen = bytes[1] as usize;

 let offset = if zlen > 0x80 {
 if zlen != 0x81 {
 return Err(Error::new());
 }

 zlen = bytes[2] as usize;
 3
 } else {
 2
 };

 if zlen != bytes.len().checked_sub(offset).unwrap() {
 return Err(Error::new());
 }

 // First INTEGER (r)
 let r_range = parse_int(&bytes[offset..], ScalarSize::to_usize())?;
 let r_start = offset.checked_add(r_range.start).unwrap();
 let r_end = offset.checked_add(r_range.end).unwrap();

 // Second INTEGER (s)
 let s_range = parse_int(&bytes[r_end..], ScalarSize::to_usize())?;
 let s_start = r_end.checked_add(s_range.start).unwrap();
 let s_end = r_end.checked_add(s_range.end).unwrap();

 if s_end != bytes.as_ref().len() {
 return Err(Error::new());
 }

 let mut byte_arr = DocumentBytes::<ScalarSize>::default();
 byte_arr[..s_end].copy_from_slice(bytes.as_ref());

 Ok(Signature {
 bytes: byte_arr,
 r_range: Range {
 start: r_start,
 end: r_end,
 },
 s_range: Range {
 start: s_start,
 end: s_end,
 },
 })
 }
}

Expand Down

10 changes: 5 additions & 5 deletions
ecdsa/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,17 +97,17 @@ where
 asn1::MaxSize<C::ScalarSize>: ArrayLength<u8>,
 <C::ScalarSize as Add>::Output: Add<asn1::MaxOverhead> + ArrayLength<u8>,
 {
 asn1::Document::<C::ScalarSize>::from_bytes(bytes).map(Into::into)
 asn1::Signature::<C::ScalarSize>::try_from(bytes).map(Into::into)
 }

 /// Serialize this signature as ASN.1 DER
 pub fn to_asn1(&self) -> asn1::Document<C::ScalarSize>
 pub fn to_asn1(&self) -> asn1::Signature<C::ScalarSize>
 where
 C::ScalarSize: Add + ArrayLength<u8>,
 asn1::MaxSize<C::ScalarSize>: ArrayLength<u8>,
 <C::ScalarSize as Add>::Output: Add<asn1::MaxOverhead> + ArrayLength<u8>,
 {
 asn1::Document::from_scalars(self.r(), self.s())
 asn1::Signature::from_scalars(self.r(), self.s())
 }

 /// Get the `r` component of this signature
Expand DownExpand Up@@ -170,14 +170,14 @@ where
 }
}

impl<C> From<asn1::Document<C::ScalarSize>> for Signature<C>
impl<C> From<asn1::Signature<C::ScalarSize>> for Signature<C>
where
 C: Curve,
 C::ScalarSize: Add + ArrayLength<u8>,
 asn1::MaxSize<C::ScalarSize>: ArrayLength<u8>,
 <C::ScalarSize as Add>::Output: Add<asn1::MaxOverhead> + ArrayLength<u8>,
{
 fn from(doc: asn1::Document<C::ScalarSize>) -> Signature<C> {
 fn from(doc: asn1::Signature<C::ScalarSize>) -> Signature<C> {
 let mut bytes = SignatureBytes::<C>::default();
 let scalar_size = C::ScalarSize::to_usize();
 let r_begin = scalar_size.checked_sub(doc.r().len()).unwrap();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
ecdsa: rename asn1::Signature; impl signature trait#102

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

 Merged

tarcieri
merged 1 commit into

from

Jul 23, 2020
 Merged


ecdsa: rename asn1::Signature; impl signature trait
#102
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


172 changes: 97 additions & 75 deletions
ecdsa/src/asn1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,8 @@ use crate::{
 Error,
};
use core::{
 convert::TryFrom,
 convert::{TryFrom, TryInto},
 fmt,
 ops::{Add, Range},
};
use elliptic_curve::{consts::U9, ScalarBytes};
Expand All@@ -35,7 +36,7 @@ pub type MaxOverhead = U9;
/// Maximum size of an ASN.1 DER encoded signature for the given elliptic curve.
pub type MaxSize<ScalarSize> = <<ScalarSize as Add>::Output as Add<MaxOverhead>>::Output;

/// Byte array containing a serialized ASN.1 document
/// Byte array containing a serialized ASN.1 signature
type DocumentBytes<ScalarSize> = GenericArray<u8, MaxSize<ScalarSize>>;

/// ASN.1 `INTEGER` tag
Expand All@@ -44,10 +45,10 @@ const INTEGER_TAG: u8 = 0x02;
/// ASN.1 `SEQUENCE` tag
const SEQUENCE_TAG: u8 = 0x30;

/// Document containing an ASN.1 DER-encoded signature.
/// ASN.1 DER-encoded signature.
///
/// Generic over the scalar size of the elliptic curve.
pub struct Document<ScalarSize>
pub struct Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
Expand All@@ -56,86 +57,33 @@ where
 /// ASN.1 DER-encoded signature data
 bytes: DocumentBytes<ScalarSize>,

 /// Range of the `r` value within the document
 /// Range of the `r` value within the signature
 r_range: Range<usize>,

 /// Range of the `s` value within the document
 /// Range of the `s` value within the signature
 s_range: Range<usize>,
}

#[allow(clippy::len_without_is_empty)]
impl<ScalarSize> Document<ScalarSize>
impl<ScalarSize> signature::Signature for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
 <ScalarSize as Add>::Output: Add<MaxOverhead> + ArrayLength<u8>,
{
 /// Parse an ASN.1 DER-encoded ECDSA signature from a byte slice
 pub fn from_bytes(bytes: impl AsRef<[u8]>) -> Result<Self, Error> {
 let input = bytes.as_ref();

 // Signature format is a SEQUENCE of two INTEGER values. We
 // support only integers of less than 127 bytes each (signed
 // encoding) so the resulting raw signature will have length
 // at most 254 bytes.
 //
 // First byte is SEQUENCE tag.
 if input[0] != SEQUENCE_TAG as u8 {
 return Err(Error::new());
 }

 // The SEQUENCE length will be encoded over one or two bytes. We
 // limit the total SEQUENCE contents to 255 bytes, because it
 // makes things simpler; this is enough for subgroup orders up
 // to 999 bits.
 let mut zlen = input[1] as usize;

 let offset = if zlen > 0x80 {
 if zlen != 0x81 {
 return Err(Error::new());
 }

 zlen = input[2] as usize;
 3
 } else {
 2
 };

 if zlen != input.len().checked_sub(offset).unwrap() {
 return Err(Error::new());
 }

 // First INTEGER (r)
 let r_range = parse_int(&input[offset..], ScalarSize::to_usize())?;
 let r_start = offset.checked_add(r_range.start).unwrap();
 let r_end = offset.checked_add(r_range.end).unwrap();

 // Second INTEGER (s)
 let s_range = parse_int(&input[r_end..], ScalarSize::to_usize())?;
 let s_start = r_end.checked_add(s_range.start).unwrap();
 let s_end = r_end.checked_add(s_range.end).unwrap();

 if s_end != bytes.as_ref().len() {
 return Err(Error::new());
 }

 let mut byte_arr = DocumentBytes::<ScalarSize>::default();
 byte_arr[..s_end].copy_from_slice(bytes.as_ref());

 Ok(Document {
 bytes: byte_arr,
 r_range: Range {
 start: r_start,
 end: r_end,
 },
 s_range: Range {
 start: s_start,
 end: s_end,
 },
 })
 fn from_bytes(bytes: &[u8]) -> Result<Self, Error> {
 bytes.try_into()
 }
}

 /// Get the length of the document
#[allow(clippy::len_without_is_empty)]
impl<ScalarSize> Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
 <ScalarSize as Add>::Output: Add<MaxOverhead> + ArrayLength<u8>,
{
 /// Get the length of the signature in bytes
 pub fn len(&self) -> usize {
 self.s_range.end
 }
Expand DownExpand Up@@ -168,7 +116,9 @@ where
 serialize_int(s.as_slice(), &mut bytes[r_end..], s_len, scalar_size);
 let s_end = r_end.checked_add(2).unwrap().checked_add(s_len).unwrap();

 Self::from_bytes(&bytes[..s_end]).expect("generated invalid ASN.1 DER")
 bytes[..s_end]
 .try_into()
 .expect("generated invalid ASN.1 DER")
 }

 /// Get the `r` component of the signature (leading zeros removed)
Expand All@@ -182,7 +132,7 @@ where
 }
}

impl<ScalarSize> AsRef<[u8]> for Document<ScalarSize>
impl<ScalarSize> AsRef<[u8]> for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
Expand All@@ -193,7 +143,21 @@ where
 }
}

impl<ScalarSize> TryFrom<&[u8]> for Document<ScalarSize>
impl<ScalarSize> fmt::Debug for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
 <ScalarSize as Add>::Output: Add<MaxOverhead> + ArrayLength<u8>,
{
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 f.debug_struct("asn1::Signature")
 .field("r", &self.r())
 .field("s", &self.s())
 .finish()
 }
}

impl<ScalarSize> TryFrom<&[u8]> for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
Expand All@@ -202,7 +166,65 @@ where
 type Error = Error;

 fn try_from(bytes: &[u8]) -> Result<Self, Error> {
 Self::from_bytes(bytes)
 // Signature format is a SEQUENCE of two INTEGER values. We
 // support only integers of less than 127 bytes each (signed
 // encoding) so the resulting raw signature will have length
 // at most 254 bytes.
 //
 // First byte is SEQUENCE tag.
 if bytes[0] != SEQUENCE_TAG as u8 {
 return Err(Error::new());
 }

 // The SEQUENCE length will be encoded over one or two bytes. We
 // limit the total SEQUENCE contents to 255 bytes, because it
 // makes things simpler; this is enough for subgroup orders up
 // to 999 bits.
 let mut zlen = bytes[1] as usize;

 let offset = if zlen > 0x80 {
 if zlen != 0x81 {
 return Err(Error::new());
 }

 zlen = bytes[2] as usize;
 3
 } else {
 2
 };

 if zlen != bytes.len().checked_sub(offset).unwrap() {
 return Err(Error::new());
 }

 // First INTEGER (r)
 let r_range = parse_int(&bytes[offset..], ScalarSize::to_usize())?;
 let r_start = offset.checked_add(r_range.start).unwrap();
 let r_end = offset.checked_add(r_range.end).unwrap();

 // Second INTEGER (s)
 let s_range = parse_int(&bytes[r_end..], ScalarSize::to_usize())?;
 let s_start = r_end.checked_add(s_range.start).unwrap();
 let s_end = r_end.checked_add(s_range.end).unwrap();

 if s_end != bytes.as_ref().len() {
 return Err(Error::new());
 }

 let mut byte_arr = DocumentBytes::<ScalarSize>::default();
 byte_arr[..s_end].copy_from_slice(bytes.as_ref());

 Ok(Signature {
 bytes: byte_arr,
 r_range: Range {
 start: r_start,
 end: r_end,
 },
 s_range: Range {
 start: s_start,
 end: s_end,
 },
 })
 }
}

Expand Down

10 changes: 5 additions & 5 deletions
ecdsa/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,17 +97,17 @@ where
 asn1::MaxSize<C::ScalarSize>: ArrayLength<u8>,
 <C::ScalarSize as Add>::Output: Add<asn1::MaxOverhead> + ArrayLength<u8>,
 {
 asn1::Document::<C::ScalarSize>::from_bytes(bytes).map(Into::into)
 asn1::Signature::<C::ScalarSize>::try_from(bytes).map(Into::into)
 }

 /// Serialize this signature as ASN.1 DER
 pub fn to_asn1(&self) -> asn1::Document<C::ScalarSize>
 pub fn to_asn1(&self) -> asn1::Signature<C::ScalarSize>
 where
 C::ScalarSize: Add + ArrayLength<u8>,
 asn1::MaxSize<C::ScalarSize>: ArrayLength<u8>,
 <C::ScalarSize as Add>::Output: Add<asn1::MaxOverhead> + ArrayLength<u8>,
 {
 asn1::Document::from_scalars(self.r(), self.s())
 asn1::Signature::from_scalars(self.r(), self.s())
 }

 /// Get the `r` component of this signature
Expand DownExpand Up@@ -170,14 +170,14 @@ where
 }
}

impl<C> From<asn1::Document<C::ScalarSize>> for Signature<C>
impl<C> From<asn1::Signature<C::ScalarSize>> for Signature<C>
where
 C: Curve,
 C::ScalarSize: Add + ArrayLength<u8>,
 asn1::MaxSize<C::ScalarSize>: ArrayLength<u8>,
 <C::ScalarSize as Add>::Output: Add<asn1::MaxOverhead> + ArrayLength<u8>,
{
 fn from(doc: asn1::Document<C::ScalarSize>) -> Signature<C> {
 fn from(doc: asn1::Signature<C::ScalarSize>) -> Signature<C> {
 let mut bytes = SignatureBytes::<C>::default();
 let scalar_size = C::ScalarSize::to_usize();
 let r_begin = scalar_size.checked_sub(doc.r().len()).unwrap();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ecdsa: rename asn1::Signature; impl signature trait#102

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

 Merged

tarcieri
merged 1 commit into

from

Jul 23, 2020
 Merged


ecdsa: rename asn1::Signature; impl signature trait
#102
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


172 changes: 97 additions & 75 deletions
ecdsa/src/asn1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,8 @@ use crate::{
 Error,
};
use core::{
 convert::TryFrom,
 convert::{TryFrom, TryInto},
 fmt,
 ops::{Add, Range},
};
use elliptic_curve::{consts::U9, ScalarBytes};
Expand All@@ -35,7 +36,7 @@ pub type MaxOverhead = U9;
/// Maximum size of an ASN.1 DER encoded signature for the given elliptic curve.
pub type MaxSize<ScalarSize> = <<ScalarSize as Add>::Output as Add<MaxOverhead>>::Output;

/// Byte array containing a serialized ASN.1 document
/// Byte array containing a serialized ASN.1 signature
type DocumentBytes<ScalarSize> = GenericArray<u8, MaxSize<ScalarSize>>;

/// ASN.1 `INTEGER` tag
Expand All@@ -44,10 +45,10 @@ const INTEGER_TAG: u8 = 0x02;
/// ASN.1 `SEQUENCE` tag
const SEQUENCE_TAG: u8 = 0x30;

/// Document containing an ASN.1 DER-encoded signature.
/// ASN.1 DER-encoded signature.
///
/// Generic over the scalar size of the elliptic curve.
pub struct Document<ScalarSize>
pub struct Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
Expand All@@ -56,86 +57,33 @@ where
 /// ASN.1 DER-encoded signature data
 bytes: DocumentBytes<ScalarSize>,

 /// Range of the `r` value within the document
 /// Range of the `r` value within the signature
 r_range: Range<usize>,

 /// Range of the `s` value within the document
 /// Range of the `s` value within the signature
 s_range: Range<usize>,
}

#[allow(clippy::len_without_is_empty)]
impl<ScalarSize> Document<ScalarSize>
impl<ScalarSize> signature::Signature for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
 <ScalarSize as Add>::Output: Add<MaxOverhead> + ArrayLength<u8>,
{
 /// Parse an ASN.1 DER-encoded ECDSA signature from a byte slice
 pub fn from_bytes(bytes: impl AsRef<[u8]>) -> Result<Self, Error> {
 let input = bytes.as_ref();

 // Signature format is a SEQUENCE of two INTEGER values. We
 // support only integers of less than 127 bytes each (signed
 // encoding) so the resulting raw signature will have length
 // at most 254 bytes.
 //
 // First byte is SEQUENCE tag.
 if input[0] != SEQUENCE_TAG as u8 {
 return Err(Error::new());
 }

 // The SEQUENCE length will be encoded over one or two bytes. We
 // limit the total SEQUENCE contents to 255 bytes, because it
 // makes things simpler; this is enough for subgroup orders up
 // to 999 bits.
 let mut zlen = input[1] as usize;

 let offset = if zlen > 0x80 {
 if zlen != 0x81 {
 return Err(Error::new());
 }

 zlen = input[2] as usize;
 3
 } else {
 2
 };

 if zlen != input.len().checked_sub(offset).unwrap() {
 return Err(Error::new());
 }

 // First INTEGER (r)
 let r_range = parse_int(&input[offset..], ScalarSize::to_usize())?;
 let r_start = offset.checked_add(r_range.start).unwrap();
 let r_end = offset.checked_add(r_range.end).unwrap();

 // Second INTEGER (s)
 let s_range = parse_int(&input[r_end..], ScalarSize::to_usize())?;
 let s_start = r_end.checked_add(s_range.start).unwrap();
 let s_end = r_end.checked_add(s_range.end).unwrap();

 if s_end != bytes.as_ref().len() {
 return Err(Error::new());
 }

 let mut byte_arr = DocumentBytes::<ScalarSize>::default();
 byte_arr[..s_end].copy_from_slice(bytes.as_ref());

 Ok(Document {
 bytes: byte_arr,
 r_range: Range {
 start: r_start,
 end: r_end,
 },
 s_range: Range {
 start: s_start,
 end: s_end,
 },
 })
 fn from_bytes(bytes: &[u8]) -> Result<Self, Error> {
 bytes.try_into()
 }
}

 /// Get the length of the document
#[allow(clippy::len_without_is_empty)]
impl<ScalarSize> Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
 <ScalarSize as Add>::Output: Add<MaxOverhead> + ArrayLength<u8>,
{
 /// Get the length of the signature in bytes
 pub fn len(&self) -> usize {
 self.s_range.end
 }
Expand DownExpand Up@@ -168,7 +116,9 @@ where
 serialize_int(s.as_slice(), &mut bytes[r_end..], s_len, scalar_size);
 let s_end = r_end.checked_add(2).unwrap().checked_add(s_len).unwrap();

 Self::from_bytes(&bytes[..s_end]).expect("generated invalid ASN.1 DER")
 bytes[..s_end]
 .try_into()
 .expect("generated invalid ASN.1 DER")
 }

 /// Get the `r` component of the signature (leading zeros removed)
Expand All@@ -182,7 +132,7 @@ where
 }
}

impl<ScalarSize> AsRef<[u8]> for Document<ScalarSize>
impl<ScalarSize> AsRef<[u8]> for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
Expand All@@ -193,7 +143,21 @@ where
 }
}

impl<ScalarSize> TryFrom<&[u8]> for Document<ScalarSize>
impl<ScalarSize> fmt::Debug for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
 <ScalarSize as Add>::Output: Add<MaxOverhead> + ArrayLength<u8>,
{
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 f.debug_struct("asn1::Signature")
 .field("r", &self.r())
 .field("s", &self.s())
 .finish()
 }
}

impl<ScalarSize> TryFrom<&[u8]> for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
Expand All@@ -202,7 +166,65 @@ where
 type Error = Error;

 fn try_from(bytes: &[u8]) -> Result<Self, Error> {
 Self::from_bytes(bytes)
 // Signature format is a SEQUENCE of two INTEGER values. We
 // support only integers of less than 127 bytes each (signed
 // encoding) so the resulting raw signature will have length
 // at most 254 bytes.
 //
 // First byte is SEQUENCE tag.
 if bytes[0] != SEQUENCE_TAG as u8 {
 return Err(Error::new());
 }

 // The SEQUENCE length will be encoded over one or two bytes. We
 // limit the total SEQUENCE contents to 255 bytes, because it
 // makes things simpler; this is enough for subgroup orders up
 // to 999 bits.
 let mut zlen = bytes[1] as usize;

 let offset = if zlen > 0x80 {
 if zlen != 0x81 {
 return Err(Error::new());
 }

 zlen = bytes[2] as usize;
 3
 } else {
 2
 };

 if zlen != bytes.len().checked_sub(offset).unwrap() {
 return Err(Error::new());
 }

 // First INTEGER (r)
 let r_range = parse_int(&bytes[offset..], ScalarSize::to_usize())?;
 let r_start = offset.checked_add(r_range.start).unwrap();
 let r_end = offset.checked_add(r_range.end).unwrap();

 // Second INTEGER (s)
 let s_range = parse_int(&bytes[r_end..], ScalarSize::to_usize())?;
 let s_start = r_end.checked_add(s_range.start).unwrap();
 let s_end = r_end.checked_add(s_range.end).unwrap();

 if s_end != bytes.as_ref().len() {
 return Err(Error::new());
 }

 let mut byte_arr = DocumentBytes::<ScalarSize>::default();
 byte_arr[..s_end].copy_from_slice(bytes.as_ref());

 Ok(Signature {
 bytes: byte_arr,
 r_range: Range {
 start: r_start,
 end: r_end,
 },
 s_range: Range {
 start: s_start,
 end: s_end,
 },
 })
 }
}

Expand Down

10 changes: 5 additions & 5 deletions
ecdsa/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,17 +97,17 @@ where
 asn1::MaxSize<C::ScalarSize>: ArrayLength<u8>,
 <C::ScalarSize as Add>::Output: Add<asn1::MaxOverhead> + ArrayLength<u8>,
 {
 asn1::Document::<C::ScalarSize>::from_bytes(bytes).map(Into::into)
 asn1::Signature::<C::ScalarSize>::try_from(bytes).map(Into::into)
 }

 /// Serialize this signature as ASN.1 DER
 pub fn to_asn1(&self) -> asn1::Document<C::ScalarSize>
 pub fn to_asn1(&self) -> asn1::Signature<C::ScalarSize>
 where
 C::ScalarSize: Add + ArrayLength<u8>,
 asn1::MaxSize<C::ScalarSize>: ArrayLength<u8>,
 <C::ScalarSize as Add>::Output: Add<asn1::MaxOverhead> + ArrayLength<u8>,
 {
 asn1::Document::from_scalars(self.r(), self.s())
 asn1::Signature::from_scalars(self.r(), self.s())
 }

 /// Get the `r` component of this signature
Expand DownExpand Up@@ -170,14 +170,14 @@ where
 }
}

impl<C> From<asn1::Document<C::ScalarSize>> for Signature<C>
impl<C> From<asn1::Signature<C::ScalarSize>> for Signature<C>
where
 C: Curve,
 C::ScalarSize: Add + ArrayLength<u8>,
 asn1::MaxSize<C::ScalarSize>: ArrayLength<u8>,
 <C::ScalarSize as Add>::Output: Add<asn1::MaxOverhead> + ArrayLength<u8>,
{
 fn from(doc: asn1::Document<C::ScalarSize>) -> Signature<C> {
 fn from(doc: asn1::Signature<C::ScalarSize>) -> Signature<C> {
 let mut bytes = SignatureBytes::<C>::default();
 let scalar_size = C::ScalarSize::to_usize();
 let r_begin = scalar_size.checked_sub(doc.r().len()).unwrap();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ecdsa: rename asn1::Signature; impl signature trait#102

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

 Merged

tarcieri
merged 1 commit into

from

Jul 23, 2020
 Merged


ecdsa: rename asn1::Signature; impl signature trait
#102
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


172 changes: 97 additions & 75 deletions
ecdsa/src/asn1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,8 @@ use crate::{
 Error,
};
use core::{
 convert::TryFrom,
 convert::{TryFrom, TryInto},
 fmt,
 ops::{Add, Range},
};
use elliptic_curve::{consts::U9, ScalarBytes};
Expand All@@ -35,7 +36,7 @@ pub type MaxOverhead = U9;
/// Maximum size of an ASN.1 DER encoded signature for the given elliptic curve.
pub type MaxSize<ScalarSize> = <<ScalarSize as Add>::Output as Add<MaxOverhead>>::Output;

/// Byte array containing a serialized ASN.1 document
/// Byte array containing a serialized ASN.1 signature
type DocumentBytes<ScalarSize> = GenericArray<u8, MaxSize<ScalarSize>>;

/// ASN.1 `INTEGER` tag
Expand All@@ -44,10 +45,10 @@ const INTEGER_TAG: u8 = 0x02;
/// ASN.1 `SEQUENCE` tag
const SEQUENCE_TAG: u8 = 0x30;

/// Document containing an ASN.1 DER-encoded signature.
/// ASN.1 DER-encoded signature.
///
/// Generic over the scalar size of the elliptic curve.
pub struct Document<ScalarSize>
pub struct Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
Expand All@@ -56,86 +57,33 @@ where
 /// ASN.1 DER-encoded signature data
 bytes: DocumentBytes<ScalarSize>,

 /// Range of the `r` value within the document
 /// Range of the `r` value within the signature
 r_range: Range<usize>,

 /// Range of the `s` value within the document
 /// Range of the `s` value within the signature
 s_range: Range<usize>,
}

#[allow(clippy::len_without_is_empty)]
impl<ScalarSize> Document<ScalarSize>
impl<ScalarSize> signature::Signature for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
 <ScalarSize as Add>::Output: Add<MaxOverhead> + ArrayLength<u8>,
{
 /// Parse an ASN.1 DER-encoded ECDSA signature from a byte slice
 pub fn from_bytes(bytes: impl AsRef<[u8]>) -> Result<Self, Error> {
 let input = bytes.as_ref();

 // Signature format is a SEQUENCE of two INTEGER values. We
 // support only integers of less than 127 bytes each (signed
 // encoding) so the resulting raw signature will have length
 // at most 254 bytes.
 //
 // First byte is SEQUENCE tag.
 if input[0] != SEQUENCE_TAG as u8 {
 return Err(Error::new());
 }

 // The SEQUENCE length will be encoded over one or two bytes. We
 // limit the total SEQUENCE contents to 255 bytes, because it
 // makes things simpler; this is enough for subgroup orders up
 // to 999 bits.
 let mut zlen = input[1] as usize;

 let offset = if zlen > 0x80 {
 if zlen != 0x81 {
 return Err(Error::new());
 }

 zlen = input[2] as usize;
 3
 } else {
 2
 };

 if zlen != input.len().checked_sub(offset).unwrap() {
 return Err(Error::new());
 }

 // First INTEGER (r)
 let r_range = parse_int(&input[offset..], ScalarSize::to_usize())?;
 let r_start = offset.checked_add(r_range.start).unwrap();
 let r_end = offset.checked_add(r_range.end).unwrap();

 // Second INTEGER (s)
 let s_range = parse_int(&input[r_end..], ScalarSize::to_usize())?;
 let s_start = r_end.checked_add(s_range.start).unwrap();
 let s_end = r_end.checked_add(s_range.end).unwrap();

 if s_end != bytes.as_ref().len() {
 return Err(Error::new());
 }

 let mut byte_arr = DocumentBytes::<ScalarSize>::default();
 byte_arr[..s_end].copy_from_slice(bytes.as_ref());

 Ok(Document {
 bytes: byte_arr,
 r_range: Range {
 start: r_start,
 end: r_end,
 },
 s_range: Range {
 start: s_start,
 end: s_end,
 },
 })
 fn from_bytes(bytes: &[u8]) -> Result<Self, Error> {
 bytes.try_into()
 }
}

 /// Get the length of the document
#[allow(clippy::len_without_is_empty)]
impl<ScalarSize> Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
 <ScalarSize as Add>::Output: Add<MaxOverhead> + ArrayLength<u8>,
{
 /// Get the length of the signature in bytes
 pub fn len(&self) -> usize {
 self.s_range.end
 }
Expand DownExpand Up@@ -168,7 +116,9 @@ where
 serialize_int(s.as_slice(), &mut bytes[r_end..], s_len, scalar_size);
 let s_end = r_end.checked_add(2).unwrap().checked_add(s_len).unwrap();

 Self::from_bytes(&bytes[..s_end]).expect("generated invalid ASN.1 DER")
 bytes[..s_end]
 .try_into()
 .expect("generated invalid ASN.1 DER")
 }

 /// Get the `r` component of the signature (leading zeros removed)
Expand All@@ -182,7 +132,7 @@ where
 }
}

impl<ScalarSize> AsRef<[u8]> for Document<ScalarSize>
impl<ScalarSize> AsRef<[u8]> for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
Expand All@@ -193,7 +143,21 @@ where
 }
}

impl<ScalarSize> TryFrom<&[u8]> for Document<ScalarSize>
impl<ScalarSize> fmt::Debug for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
 <ScalarSize as Add>::Output: Add<MaxOverhead> + ArrayLength<u8>,
{
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 f.debug_struct("asn1::Signature")
 .field("r", &self.r())
 .field("s", &self.s())
 .finish()
 }
}

impl<ScalarSize> TryFrom<&[u8]> for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
Expand All@@ -202,7 +166,65 @@ where
 type Error = Error;

 fn try_from(bytes: &[u8]) -> Result<Self, Error> {
 Self::from_bytes(bytes)
 // Signature format is a SEQUENCE of two INTEGER values. We
 // support only integers of less than 127 bytes each (signed
 // encoding) so the resulting raw signature will have length
 // at most 254 bytes.
 //
 // First byte is SEQUENCE tag.
 if bytes[0] != SEQUENCE_TAG as u8 {
 return Err(Error::new());
 }

 // The SEQUENCE length will be encoded over one or two bytes. We
 // limit the total SEQUENCE contents to 255 bytes, because it
 // makes things simpler; this is enough for subgroup orders up
 // to 999 bits.
 let mut zlen = bytes[1] as usize;

 let offset = if zlen > 0x80 {
 if zlen != 0x81 {
 return Err(Error::new());
 }

 zlen = bytes[2] as usize;
 3
 } else {
 2
 };

 if zlen != bytes.len().checked_sub(offset).unwrap() {
 return Err(Error::new());
 }

 // First INTEGER (r)
 let r_range = parse_int(&bytes[offset..], ScalarSize::to_usize())?;
 let r_start = offset.checked_add(r_range.start).unwrap();
 let r_end = offset.checked_add(r_range.end).unwrap();

 // Second INTEGER (s)
 let s_range = parse_int(&bytes[r_end..], ScalarSize::to_usize())?;
 let s_start = r_end.checked_add(s_range.start).unwrap();
 let s_end = r_end.checked_add(s_range.end).unwrap();

 if s_end != bytes.as_ref().len() {
 return Err(Error::new());
 }

 let mut byte_arr = DocumentBytes::<ScalarSize>::default();
 byte_arr[..s_end].copy_from_slice(bytes.as_ref());

 Ok(Signature {
 bytes: byte_arr,
 r_range: Range {
 start: r_start,
 end: r_end,
 },
 s_range: Range {
 start: s_start,
 end: s_end,
 },
 })
 }
}

Expand Down

10 changes: 5 additions & 5 deletions
ecdsa/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,17 +97,17 @@ where
 asn1::MaxSize<C::ScalarSize>: ArrayLength<u8>,
 <C::ScalarSize as Add>::Output: Add<asn1::MaxOverhead> + ArrayLength<u8>,
 {
 asn1::Document::<C::ScalarSize>::from_bytes(bytes).map(Into::into)
 asn1::Signature::<C::ScalarSize>::try_from(bytes).map(Into::into)
 }

 /// Serialize this signature as ASN.1 DER
 pub fn to_asn1(&self) -> asn1::Document<C::ScalarSize>
 pub fn to_asn1(&self) -> asn1::Signature<C::ScalarSize>
 where
 C::ScalarSize: Add + ArrayLength<u8>,
 asn1::MaxSize<C::ScalarSize>: ArrayLength<u8>,
 <C::ScalarSize as Add>::Output: Add<asn1::MaxOverhead> + ArrayLength<u8>,
 {
 asn1::Document::from_scalars(self.r(), self.s())
 asn1::Signature::from_scalars(self.r(), self.s())
 }

 /// Get the `r` component of this signature
Expand DownExpand Up@@ -170,14 +170,14 @@ where
 }
}

impl<C> From<asn1::Document<C::ScalarSize>> for Signature<C>
impl<C> From<asn1::Signature<C::ScalarSize>> for Signature<C>
where
 C: Curve,
 C::ScalarSize: Add + ArrayLength<u8>,
 asn1::MaxSize<C::ScalarSize>: ArrayLength<u8>,
 <C::ScalarSize as Add>::Output: Add<asn1::MaxOverhead> + ArrayLength<u8>,
{
 fn from(doc: asn1::Document<C::ScalarSize>) -> Signature<C> {
 fn from(doc: asn1::Signature<C::ScalarSize>) -> Signature<C> {
 let mut bytes = SignatureBytes::<C>::default();
 let scalar_size = C::ScalarSize::to_usize();
 let r_begin = scalar_size.checked_sub(doc.r().len()).unwrap();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
ecdsa: rename asn1::Signature; impl signature trait#102

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

 Merged

tarcieri
merged 1 commit into

from

Jul 23, 2020
 Merged


ecdsa: rename asn1::Signature; impl signature trait
#102
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


172 changes: 97 additions & 75 deletions
ecdsa/src/asn1.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,8 @@ use crate::{
 Error,
};
use core::{
 convert::TryFrom,
 convert::{TryFrom, TryInto},
 fmt,
 ops::{Add, Range},
};
use elliptic_curve::{consts::U9, ScalarBytes};
Expand All@@ -35,7 +36,7 @@ pub type MaxOverhead = U9;
/// Maximum size of an ASN.1 DER encoded signature for the given elliptic curve.
pub type MaxSize<ScalarSize> = <<ScalarSize as Add>::Output as Add<MaxOverhead>>::Output;

/// Byte array containing a serialized ASN.1 document
/// Byte array containing a serialized ASN.1 signature
type DocumentBytes<ScalarSize> = GenericArray<u8, MaxSize<ScalarSize>>;

/// ASN.1 `INTEGER` tag
Expand All@@ -44,10 +45,10 @@ const INTEGER_TAG: u8 = 0x02;
/// ASN.1 `SEQUENCE` tag
const SEQUENCE_TAG: u8 = 0x30;

/// Document containing an ASN.1 DER-encoded signature.
/// ASN.1 DER-encoded signature.
///
/// Generic over the scalar size of the elliptic curve.
pub struct Document<ScalarSize>
pub struct Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
Expand All@@ -56,86 +57,33 @@ where
 /// ASN.1 DER-encoded signature data
 bytes: DocumentBytes<ScalarSize>,

 /// Range of the `r` value within the document
 /// Range of the `r` value within the signature
 r_range: Range<usize>,

 /// Range of the `s` value within the document
 /// Range of the `s` value within the signature
 s_range: Range<usize>,
}

#[allow(clippy::len_without_is_empty)]
impl<ScalarSize> Document<ScalarSize>
impl<ScalarSize> signature::Signature for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
 <ScalarSize as Add>::Output: Add<MaxOverhead> + ArrayLength<u8>,
{
 /// Parse an ASN.1 DER-encoded ECDSA signature from a byte slice
 pub fn from_bytes(bytes: impl AsRef<[u8]>) -> Result<Self, Error> {
 let input = bytes.as_ref();

 // Signature format is a SEQUENCE of two INTEGER values. We
 // support only integers of less than 127 bytes each (signed
 // encoding) so the resulting raw signature will have length
 // at most 254 bytes.
 //
 // First byte is SEQUENCE tag.
 if input[0] != SEQUENCE_TAG as u8 {
 return Err(Error::new());
 }

 // The SEQUENCE length will be encoded over one or two bytes. We
 // limit the total SEQUENCE contents to 255 bytes, because it
 // makes things simpler; this is enough for subgroup orders up
 // to 999 bits.
 let mut zlen = input[1] as usize;

 let offset = if zlen > 0x80 {
 if zlen != 0x81 {
 return Err(Error::new());
 }

 zlen = input[2] as usize;
 3
 } else {
 2
 };

 if zlen != input.len().checked_sub(offset).unwrap() {
 return Err(Error::new());
 }

 // First INTEGER (r)
 let r_range = parse_int(&input[offset..], ScalarSize::to_usize())?;
 let r_start = offset.checked_add(r_range.start).unwrap();
 let r_end = offset.checked_add(r_range.end).unwrap();

 // Second INTEGER (s)
 let s_range = parse_int(&input[r_end..], ScalarSize::to_usize())?;
 let s_start = r_end.checked_add(s_range.start).unwrap();
 let s_end = r_end.checked_add(s_range.end).unwrap();

 if s_end != bytes.as_ref().len() {
 return Err(Error::new());
 }

 let mut byte_arr = DocumentBytes::<ScalarSize>::default();
 byte_arr[..s_end].copy_from_slice(bytes.as_ref());

 Ok(Document {
 bytes: byte_arr,
 r_range: Range {
 start: r_start,
 end: r_end,
 },
 s_range: Range {
 start: s_start,
 end: s_end,
 },
 })
 fn from_bytes(bytes: &[u8]) -> Result<Self, Error> {
 bytes.try_into()
 }
}

 /// Get the length of the document
#[allow(clippy::len_without_is_empty)]
impl<ScalarSize> Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
 <ScalarSize as Add>::Output: Add<MaxOverhead> + ArrayLength<u8>,
{
 /// Get the length of the signature in bytes
 pub fn len(&self) -> usize {
 self.s_range.end
 }
Expand DownExpand Up@@ -168,7 +116,9 @@ where
 serialize_int(s.as_slice(), &mut bytes[r_end..], s_len, scalar_size);
 let s_end = r_end.checked_add(2).unwrap().checked_add(s_len).unwrap();

 Self::from_bytes(&bytes[..s_end]).expect("generated invalid ASN.1 DER")
 bytes[..s_end]
 .try_into()
 .expect("generated invalid ASN.1 DER")
 }

 /// Get the `r` component of the signature (leading zeros removed)
Expand All@@ -182,7 +132,7 @@ where
 }
}

impl<ScalarSize> AsRef<[u8]> for Document<ScalarSize>
impl<ScalarSize> AsRef<[u8]> for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
Expand All@@ -193,7 +143,21 @@ where
 }
}

impl<ScalarSize> TryFrom<&[u8]> for Document<ScalarSize>
impl<ScalarSize> fmt::Debug for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
 <ScalarSize as Add>::Output: Add<MaxOverhead> + ArrayLength<u8>,
{
 fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
 f.debug_struct("asn1::Signature")
 .field("r", &self.r())
 .field("s", &self.s())
 .finish()
 }
}

impl<ScalarSize> TryFrom<&[u8]> for Signature<ScalarSize>
where
 ScalarSize: Add + ArrayLength<u8>,
 MaxSize<ScalarSize>: ArrayLength<u8>,
Expand All@@ -202,7 +166,65 @@ where
 type Error = Error;

 fn try_from(bytes: &[u8]) -> Result<Self, Error> {
 Self::from_bytes(bytes)
 // Signature format is a SEQUENCE of two INTEGER values. We
 // support only integers of less than 127 bytes each (signed
 // encoding) so the resulting raw signature will have length
 // at most 254 bytes.
 //
 // First byte is SEQUENCE tag.
 if bytes[0] != SEQUENCE_TAG as u8 {
 return Err(Error::new());
 }

 // The SEQUENCE length will be encoded over one or two bytes. We
 // limit the total SEQUENCE contents to 255 bytes, because it
 // makes things simpler; this is enough for subgroup orders up
 // to 999 bits.
 let mut zlen = bytes[1] as usize;

 let offset = if zlen > 0x80 {
 if zlen != 0x81 {
 return Err(Error::new());
 }

 zlen = bytes[2] as usize;
 3
 } else {
 2
 };

 if zlen != bytes.len().checked_sub(offset).unwrap() {
 return Err(Error::new());
 }

 // First INTEGER (r)
 let r_range = parse_int(&bytes[offset..], ScalarSize::to_usize())?;
 let r_start = offset.checked_add(r_range.start).unwrap();
 let r_end = offset.checked_add(r_range.end).unwrap();

 // Second INTEGER (s)
 let s_range = parse_int(&bytes[r_end..], ScalarSize::to_usize())?;
 let s_start = r_end.checked_add(s_range.start).unwrap();
 let s_end = r_end.checked_add(s_range.end).unwrap();

 if s_end != bytes.as_ref().len() {
 return Err(Error::new());
 }

 let mut byte_arr = DocumentBytes::<ScalarSize>::default();
 byte_arr[..s_end].copy_from_slice(bytes.as_ref());

 Ok(Signature {
 bytes: byte_arr,
 r_range: Range {
 start: r_start,
 end: r_end,
 },
 s_range: Range {
 start: s_start,
 end: s_end,
 },
 })
 }
}

Expand Down

10 changes: 5 additions & 5 deletions
ecdsa/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,17 +97,17 @@ where
 asn1::MaxSize<C::ScalarSize>: ArrayLength<u8>,
 <C::ScalarSize as Add>::Output: Add<asn1::MaxOverhead> + ArrayLength<u8>,
 {
 asn1::Document::<C::ScalarSize>::from_bytes(bytes).map(Into::into)
 asn1::Signature::<C::ScalarSize>::try_from(bytes).map(Into::into)
 }

 /// Serialize this signature as ASN.1 DER
 pub fn to_asn1(&self) -> asn1::Document<C::ScalarSize>
 pub fn to_asn1(&self) -> asn1::Signature<C::ScalarSize>
 where
 C::ScalarSize: Add + ArrayLength<u8>,
 asn1::MaxSize<C::ScalarSize>: ArrayLength<u8>,
 <C::ScalarSize as Add>::Output: Add<asn1::MaxOverhead> + ArrayLength<u8>,
 {
 asn1::Document::from_scalars(self.r(), self.s())
 asn1::Signature::from_scalars(self.r(), self.s())
 }

 /// Get the `r` component of this signature
Expand DownExpand Up@@ -170,14 +170,14 @@ where
 }
}

impl<C> From<asn1::Document<C::ScalarSize>> for Signature<C>
impl<C> From<asn1::Signature<C::ScalarSize>> for Signature<C>
where
 C: Curve,
 C::ScalarSize: Add + ArrayLength<u8>,
 asn1::MaxSize<C::ScalarSize>: ArrayLength<u8>,
 <C::ScalarSize as Add>::Output: Add<asn1::MaxOverhead> + ArrayLength<u8>,
{
 fn from(doc: asn1::Document<C::ScalarSize>) -> Signature<C> {
 fn from(doc: asn1::Signature<C::ScalarSize>) -> Signature<C> {
 let mut bytes = SignatureBytes::<C>::default();
 let scalar_size = C::ScalarSize::to_usize();
 let r_begin = scalar_size.checked_sub(doc.r().len()).unwrap();
Expand Down