Skip to content

elliptic-curve: add encoding module#247

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
Aug 4, 2020
Merged

elliptic-curve: add encoding module #247

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
23 changes: 23 additions & 0 deletions elliptic-curve/src/encoding.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
//! Traits for decoding/encoding elliptic curve elements (i.e. base and scalar
//! field elements) as bytes.

use generic_array::{ArrayLength, GenericArray};
use subtle::{ConditionallySelectable, CtOption};

/// Try to decode the given bytes into a curve element
pub trait FromBytes: ConditionallySelectable + Sized {
/// Size of the serialized byte array
type Size: ArrayLength<u8>;

/// Try to decode this object from bytes
fn from_bytes(bytes: &GenericArray<u8, Self::Size>) -> CtOption<Self>;
}

/// Encode this curve element as bytes
pub trait ToBytes {
/// Size of the serialized byte array
type Size: ArrayLength<u8>;

/// Encode this object to bytes
fn to_bytes(&self) -> GenericArray<u8, Self::Size>;
}
3 changes: 2 additions & 1 deletion elliptic-curve/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
#[cfg(feature = "std")]
extern crate std;

pub mod encoding;
pub mod error;
pub mod ops;
pub mod point;
Expand DownExpand Up@@ -77,7 +78,7 @@ pub trait Arithmetic: Curve {
type Scalar: ConditionallySelectable
+ ConstantTimeEq
+ Default
+ secret_key::FromSecretKey<Self>;
+ encoding::FromBytes<Size = Self::ElementSize>;

/// Affine point type for a given curve
type AffinePoint: ConditionallySelectable + Mul<scalar::NonZeroScalar<Self>> + point::Generator;
Expand Down
9 changes: 0 additions & 9 deletions elliptic-curve/src/secret_key.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ use core::{
fmt::{self, Debug},
};
use generic_array::{typenum::Unsigned, GenericArray};
use subtle::CtOption;

#[cfg(feature = "rand_core")]
use {
Expand DownExpand Up@@ -91,11 +90,3 @@ impl<C: Curve> Drop for SecretKey<C> {
self.scalar.zeroize();
}
}

/// Trait for deserializing a value from a secret key.
///
/// This is intended for use with the `Scalar` type for a given elliptic curve.
pub trait FromSecretKey<C: Curve>: Sized {
/// Deserialize this value from a [`SecretKey`]
fn from_secret_key(secret_key: &SecretKey<C>) -> CtOption<Self>;
}
2 changes: 1 addition & 1 deletion elliptic-curve/src/weierstrass.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ pub mod public_key;

pub use self::{
point::{CompressedPoint, CompressedPointSize, UncompressedPoint, UncompressedPointSize},
public_key::{FromPublicKey, PublicKey},
public_key::PublicKey,
};

/// Marker trait for elliptic curves in short Weierstrass form
Expand Down
24 changes: 2 additions & 22 deletions elliptic-curve/src/weierstrass/public_key.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,7 @@ use super::{
Curve,
};
use crate::{
point::Generator, scalar::NonZeroScalar, secret_key::FromSecretKey, Arithmetic, Error,
SecretKey,
encoding::FromBytes, point::Generator, scalar::NonZeroScalar, Arithmetic, Error, SecretKey,
};
use core::{
fmt::{self, Debug},
Expand All@@ -17,7 +16,6 @@ use generic_array::{
typenum::{Unsigned, U1},
ArrayLength, GenericArray,
};
use subtle::CtOption;

/// Size of an untagged point for given elliptic curve.
pub type UntaggedPointSize<C> = <<C as crate::Curve>::ElementSize as Add>::Output;
Expand DownExpand Up@@ -133,7 +131,7 @@ where
///
/// The `compress` flag requests point compression.
pub fn from_secret_key(secret_key: &SecretKey<C>, compress: bool) -> Result<Self, Error> {
let ct_option = C::Scalar::from_secret_key(&secret_key).and_then(NonZeroScalar::new);
let ct_option = C::Scalar::from_bytes(secret_key.as_bytes()).and_then(NonZeroScalar::new);

if ct_option.is_none().into() {
return Err(Error);
Expand DownExpand Up@@ -208,21 +206,3 @@ where
PublicKey::Uncompressed(point)
}
}

/// Trait for deserializing a value from a public key.
///
/// This is intended for use with the `AffinePoint` type for a given elliptic curve.
pub trait FromPublicKey<C: Curve>: Sized
where
C::ElementSize: Add<U1>,
<C::ElementSize as Add>::Output: Add<U1>,
CompressedPointSize<C>: ArrayLength<u8>,
UncompressedPointSize<C>: ArrayLength<u8>,
{
/// Deserialize this value from a [`PublicKey`]
///
/// # Returns
///
/// `None` if the public key is not on the curve.
fn from_public_key(public_key: &PublicKey<C>) -> CtOption<Self>;
}
, '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" + '
elliptic-curve: add `encoding` module by tarcieri · Pull Request #247 · RustCrypto/traits · GitHub
Skip to content
elliptic-curve: add encoding module#247

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

Aug 4, 2020
 Merged


elliptic-curve: add encoding module
#247
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


23 changes: 23 additions & 0 deletions
elliptic-curve/src/encoding.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
//! Traits for decoding/encoding elliptic curve elements (i.e. base and scalar
//! field elements) as bytes.

use generic_array::{ArrayLength, GenericArray};
use subtle::{ConditionallySelectable, CtOption};

/// Try to decode the given bytes into a curve element
pub trait FromBytes: ConditionallySelectable + Sized {
 /// Size of the serialized byte array
 type Size: ArrayLength<u8>;

 /// Try to decode this object from bytes
 fn from_bytes(bytes: &GenericArray<u8, Self::Size>) -> CtOption<Self>;
}

/// Encode this curve element as bytes
pub trait ToBytes {
 /// Size of the serialized byte array
 type Size: ArrayLength<u8>;

 /// Encode this object to bytes
 fn to_bytes(&self) -> GenericArray<u8, Self::Size>;
}

3 changes: 2 additions & 1 deletion
elliptic-curve/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
#[cfg(feature = "std")]
extern crate std;

pub mod encoding;
pub mod error;
pub mod ops;
pub mod point;
Expand DownExpand Up@@ -77,7 +78,7 @@ pub trait Arithmetic: Curve {
 type Scalar: ConditionallySelectable
 + ConstantTimeEq
 + Default
 + secret_key::FromSecretKey<Self>;
 + encoding::FromBytes<Size = Self::ElementSize>;

 /// Affine point type for a given curve
 type AffinePoint: ConditionallySelectable + Mul<scalar::NonZeroScalar<Self>> + point::Generator;
Expand Down

9 changes: 0 additions & 9 deletions
elliptic-curve/src/secret_key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ use core::{
 fmt::{self, Debug},
};
use generic_array::{typenum::Unsigned, GenericArray};
use subtle::CtOption;

#[cfg(feature = "rand_core")]
use {
Expand DownExpand Up@@ -91,11 +90,3 @@ impl<C: Curve> Drop for SecretKey<C> {
 self.scalar.zeroize();
 }
}

/// Trait for deserializing a value from a secret key.
///
/// This is intended for use with the `Scalar` type for a given elliptic curve.
pub trait FromSecretKey<C: Curve>: Sized {
 /// Deserialize this value from a [`SecretKey`]
 fn from_secret_key(secret_key: &SecretKey<C>) -> CtOption<Self>;
}

2 changes: 1 addition & 1 deletion
elliptic-curve/src/weierstrass.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ pub mod public_key;

pub use self::{
 point::{CompressedPoint, CompressedPointSize, UncompressedPoint, UncompressedPointSize},
 public_key::{FromPublicKey, PublicKey},
 public_key::PublicKey,
};

/// Marker trait for elliptic curves in short Weierstrass form
Expand Down

24 changes: 2 additions & 22 deletions
elliptic-curve/src/weierstrass/public_key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,7 @@ use super::{
 Curve,
};
use crate::{
 point::Generator, scalar::NonZeroScalar, secret_key::FromSecretKey, Arithmetic, Error,
 SecretKey,
 encoding::FromBytes, point::Generator, scalar::NonZeroScalar, Arithmetic, Error, SecretKey,
};
use core::{
 fmt::{self, Debug},
Expand All@@ -17,7 +16,6 @@ use generic_array::{
 typenum::{Unsigned, U1},
 ArrayLength, GenericArray,
};
use subtle::CtOption;

/// Size of an untagged point for given elliptic curve.
pub type UntaggedPointSize<C> = <<C as crate::Curve>::ElementSize as Add>::Output;
Expand DownExpand Up@@ -133,7 +131,7 @@ where
 ///
 /// The `compress` flag requests point compression.
 pub fn from_secret_key(secret_key: &SecretKey<C>, compress: bool) -> Result<Self, Error> {
 let ct_option = C::Scalar::from_secret_key(&secret_key).and_then(NonZeroScalar::new);
 let ct_option = C::Scalar::from_bytes(secret_key.as_bytes()).and_then(NonZeroScalar::new);

 if ct_option.is_none().into() {
 return Err(Error);
Expand DownExpand Up@@ -208,21 +206,3 @@ where
 PublicKey::Uncompressed(point)
 }
}

/// Trait for deserializing a value from a public key.
///
/// This is intended for use with the `AffinePoint` type for a given elliptic curve.
pub trait FromPublicKey<C: Curve>: Sized
where
 C::ElementSize: Add<U1>,
 <C::ElementSize as Add>::Output: Add<U1>,
 CompressedPointSize<C>: ArrayLength<u8>,
 UncompressedPointSize<C>: ArrayLength<u8>,
{
 /// Deserialize this value from a [`PublicKey`]
 ///
 /// # Returns
 ///
 /// `None` if the public key is not on the curve.
 fn from_public_key(public_key: &PublicKey<C>) -> CtOption<Self>;
}

, '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('^' + ".*" + '
elliptic-curve: add `encoding` module by tarcieri · Pull Request #247 · RustCrypto/traits · GitHub
Skip to content
elliptic-curve: add encoding module#247

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

Aug 4, 2020
 Merged


elliptic-curve: add encoding module
#247
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


23 changes: 23 additions & 0 deletions
elliptic-curve/src/encoding.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
//! Traits for decoding/encoding elliptic curve elements (i.e. base and scalar
//! field elements) as bytes.

use generic_array::{ArrayLength, GenericArray};
use subtle::{ConditionallySelectable, CtOption};

/// Try to decode the given bytes into a curve element
pub trait FromBytes: ConditionallySelectable + Sized {
 /// Size of the serialized byte array
 type Size: ArrayLength<u8>;

 /// Try to decode this object from bytes
 fn from_bytes(bytes: &GenericArray<u8, Self::Size>) -> CtOption<Self>;
}

/// Encode this curve element as bytes
pub trait ToBytes {
 /// Size of the serialized byte array
 type Size: ArrayLength<u8>;

 /// Encode this object to bytes
 fn to_bytes(&self) -> GenericArray<u8, Self::Size>;
}

3 changes: 2 additions & 1 deletion
elliptic-curve/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
#[cfg(feature = "std")]
extern crate std;

pub mod encoding;
pub mod error;
pub mod ops;
pub mod point;
Expand DownExpand Up@@ -77,7 +78,7 @@ pub trait Arithmetic: Curve {
 type Scalar: ConditionallySelectable
 + ConstantTimeEq
 + Default
 + secret_key::FromSecretKey<Self>;
 + encoding::FromBytes<Size = Self::ElementSize>;

 /// Affine point type for a given curve
 type AffinePoint: ConditionallySelectable + Mul<scalar::NonZeroScalar<Self>> + point::Generator;
Expand Down

9 changes: 0 additions & 9 deletions
elliptic-curve/src/secret_key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ use core::{
 fmt::{self, Debug},
};
use generic_array::{typenum::Unsigned, GenericArray};
use subtle::CtOption;

#[cfg(feature = "rand_core")]
use {
Expand DownExpand Up@@ -91,11 +90,3 @@ impl<C: Curve> Drop for SecretKey<C> {
 self.scalar.zeroize();
 }
}

/// Trait for deserializing a value from a secret key.
///
/// This is intended for use with the `Scalar` type for a given elliptic curve.
pub trait FromSecretKey<C: Curve>: Sized {
 /// Deserialize this value from a [`SecretKey`]
 fn from_secret_key(secret_key: &SecretKey<C>) -> CtOption<Self>;
}

2 changes: 1 addition & 1 deletion
elliptic-curve/src/weierstrass.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ pub mod public_key;

pub use self::{
 point::{CompressedPoint, CompressedPointSize, UncompressedPoint, UncompressedPointSize},
 public_key::{FromPublicKey, PublicKey},
 public_key::PublicKey,
};

/// Marker trait for elliptic curves in short Weierstrass form
Expand Down

24 changes: 2 additions & 22 deletions
elliptic-curve/src/weierstrass/public_key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,7 @@ use super::{
 Curve,
};
use crate::{
 point::Generator, scalar::NonZeroScalar, secret_key::FromSecretKey, Arithmetic, Error,
 SecretKey,
 encoding::FromBytes, point::Generator, scalar::NonZeroScalar, Arithmetic, Error, SecretKey,
};
use core::{
 fmt::{self, Debug},
Expand All@@ -17,7 +16,6 @@ use generic_array::{
 typenum::{Unsigned, U1},
 ArrayLength, GenericArray,
};
use subtle::CtOption;

/// Size of an untagged point for given elliptic curve.
pub type UntaggedPointSize<C> = <<C as crate::Curve>::ElementSize as Add>::Output;
Expand DownExpand Up@@ -133,7 +131,7 @@ where
 ///
 /// The `compress` flag requests point compression.
 pub fn from_secret_key(secret_key: &SecretKey<C>, compress: bool) -> Result<Self, Error> {
 let ct_option = C::Scalar::from_secret_key(&secret_key).and_then(NonZeroScalar::new);
 let ct_option = C::Scalar::from_bytes(secret_key.as_bytes()).and_then(NonZeroScalar::new);

 if ct_option.is_none().into() {
 return Err(Error);
Expand DownExpand Up@@ -208,21 +206,3 @@ where
 PublicKey::Uncompressed(point)
 }
}

/// Trait for deserializing a value from a public key.
///
/// This is intended for use with the `AffinePoint` type for a given elliptic curve.
pub trait FromPublicKey<C: Curve>: Sized
where
 C::ElementSize: Add<U1>,
 <C::ElementSize as Add>::Output: Add<U1>,
 CompressedPointSize<C>: ArrayLength<u8>,
 UncompressedPointSize<C>: ArrayLength<u8>,
{
 /// Deserialize this value from a [`PublicKey`]
 ///
 /// # Returns
 ///
 /// `None` if the public key is not on the curve.
 fn from_public_key(public_key: &PublicKey<C>) -> CtOption<Self>;
}

, '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('^' + ".*" + '
elliptic-curve: add `encoding` module by tarcieri · Pull Request #247 · RustCrypto/traits · GitHub
Skip to content
elliptic-curve: add encoding module#247

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

Aug 4, 2020
 Merged


elliptic-curve: add encoding module
#247
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


23 changes: 23 additions & 0 deletions
elliptic-curve/src/encoding.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
//! Traits for decoding/encoding elliptic curve elements (i.e. base and scalar
//! field elements) as bytes.

use generic_array::{ArrayLength, GenericArray};
use subtle::{ConditionallySelectable, CtOption};

/// Try to decode the given bytes into a curve element
pub trait FromBytes: ConditionallySelectable + Sized {
 /// Size of the serialized byte array
 type Size: ArrayLength<u8>;

 /// Try to decode this object from bytes
 fn from_bytes(bytes: &GenericArray<u8, Self::Size>) -> CtOption<Self>;
}

/// Encode this curve element as bytes
pub trait ToBytes {
 /// Size of the serialized byte array
 type Size: ArrayLength<u8>;

 /// Encode this object to bytes
 fn to_bytes(&self) -> GenericArray<u8, Self::Size>;
}

3 changes: 2 additions & 1 deletion
elliptic-curve/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
#[cfg(feature = "std")]
extern crate std;

pub mod encoding;
pub mod error;
pub mod ops;
pub mod point;
Expand DownExpand Up@@ -77,7 +78,7 @@ pub trait Arithmetic: Curve {
 type Scalar: ConditionallySelectable
 + ConstantTimeEq
 + Default
 + secret_key::FromSecretKey<Self>;
 + encoding::FromBytes<Size = Self::ElementSize>;

 /// Affine point type for a given curve
 type AffinePoint: ConditionallySelectable + Mul<scalar::NonZeroScalar<Self>> + point::Generator;
Expand Down

9 changes: 0 additions & 9 deletions
elliptic-curve/src/secret_key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ use core::{
 fmt::{self, Debug},
};
use generic_array::{typenum::Unsigned, GenericArray};
use subtle::CtOption;

#[cfg(feature = "rand_core")]
use {
Expand DownExpand Up@@ -91,11 +90,3 @@ impl<C: Curve> Drop for SecretKey<C> {
 self.scalar.zeroize();
 }
}

/// Trait for deserializing a value from a secret key.
///
/// This is intended for use with the `Scalar` type for a given elliptic curve.
pub trait FromSecretKey<C: Curve>: Sized {
 /// Deserialize this value from a [`SecretKey`]
 fn from_secret_key(secret_key: &SecretKey<C>) -> CtOption<Self>;
}

2 changes: 1 addition & 1 deletion
elliptic-curve/src/weierstrass.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ pub mod public_key;

pub use self::{
 point::{CompressedPoint, CompressedPointSize, UncompressedPoint, UncompressedPointSize},
 public_key::{FromPublicKey, PublicKey},
 public_key::PublicKey,
};

/// Marker trait for elliptic curves in short Weierstrass form
Expand Down

24 changes: 2 additions & 22 deletions
elliptic-curve/src/weierstrass/public_key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,7 @@ use super::{
 Curve,
};
use crate::{
 point::Generator, scalar::NonZeroScalar, secret_key::FromSecretKey, Arithmetic, Error,
 SecretKey,
 encoding::FromBytes, point::Generator, scalar::NonZeroScalar, Arithmetic, Error, SecretKey,
};
use core::{
 fmt::{self, Debug},
Expand All@@ -17,7 +16,6 @@ use generic_array::{
 typenum::{Unsigned, U1},
 ArrayLength, GenericArray,
};
use subtle::CtOption;

/// Size of an untagged point for given elliptic curve.
pub type UntaggedPointSize<C> = <<C as crate::Curve>::ElementSize as Add>::Output;
Expand DownExpand Up@@ -133,7 +131,7 @@ where
 ///
 /// The `compress` flag requests point compression.
 pub fn from_secret_key(secret_key: &SecretKey<C>, compress: bool) -> Result<Self, Error> {
 let ct_option = C::Scalar::from_secret_key(&secret_key).and_then(NonZeroScalar::new);
 let ct_option = C::Scalar::from_bytes(secret_key.as_bytes()).and_then(NonZeroScalar::new);

 if ct_option.is_none().into() {
 return Err(Error);
Expand DownExpand Up@@ -208,21 +206,3 @@ where
 PublicKey::Uncompressed(point)
 }
}

/// Trait for deserializing a value from a public key.
///
/// This is intended for use with the `AffinePoint` type for a given elliptic curve.
pub trait FromPublicKey<C: Curve>: Sized
where
 C::ElementSize: Add<U1>,
 <C::ElementSize as Add>::Output: Add<U1>,
 CompressedPointSize<C>: ArrayLength<u8>,
 UncompressedPointSize<C>: ArrayLength<u8>,
{
 /// Deserialize this value from a [`PublicKey`]
 ///
 /// # Returns
 ///
 /// `None` if the public key is not on the curve.
 fn from_public_key(public_key: &PublicKey<C>) -> CtOption<Self>;
}

, '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" + '
elliptic-curve: add `encoding` module by tarcieri · Pull Request #247 · RustCrypto/traits · GitHub
Skip to content
elliptic-curve: add encoding module#247

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

Aug 4, 2020
 Merged


elliptic-curve: add encoding module
#247
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


23 changes: 23 additions & 0 deletions
elliptic-curve/src/encoding.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
//! Traits for decoding/encoding elliptic curve elements (i.e. base and scalar
//! field elements) as bytes.

use generic_array::{ArrayLength, GenericArray};
use subtle::{ConditionallySelectable, CtOption};

/// Try to decode the given bytes into a curve element
pub trait FromBytes: ConditionallySelectable + Sized {
 /// Size of the serialized byte array
 type Size: ArrayLength<u8>;

 /// Try to decode this object from bytes
 fn from_bytes(bytes: &GenericArray<u8, Self::Size>) -> CtOption<Self>;
}

/// Encode this curve element as bytes
pub trait ToBytes {
 /// Size of the serialized byte array
 type Size: ArrayLength<u8>;

 /// Encode this object to bytes
 fn to_bytes(&self) -> GenericArray<u8, Self::Size>;
}

3 changes: 2 additions & 1 deletion
elliptic-curve/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
#[cfg(feature = "std")]
extern crate std;

pub mod encoding;
pub mod error;
pub mod ops;
pub mod point;
Expand DownExpand Up@@ -77,7 +78,7 @@ pub trait Arithmetic: Curve {
 type Scalar: ConditionallySelectable
 + ConstantTimeEq
 + Default
 + secret_key::FromSecretKey<Self>;
 + encoding::FromBytes<Size = Self::ElementSize>;

 /// Affine point type for a given curve
 type AffinePoint: ConditionallySelectable + Mul<scalar::NonZeroScalar<Self>> + point::Generator;
Expand Down

9 changes: 0 additions & 9 deletions
elliptic-curve/src/secret_key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ use core::{
 fmt::{self, Debug},
};
use generic_array::{typenum::Unsigned, GenericArray};
use subtle::CtOption;

#[cfg(feature = "rand_core")]
use {
Expand DownExpand Up@@ -91,11 +90,3 @@ impl<C: Curve> Drop for SecretKey<C> {
 self.scalar.zeroize();
 }
}

/// Trait for deserializing a value from a secret key.
///
/// This is intended for use with the `Scalar` type for a given elliptic curve.
pub trait FromSecretKey<C: Curve>: Sized {
 /// Deserialize this value from a [`SecretKey`]
 fn from_secret_key(secret_key: &SecretKey<C>) -> CtOption<Self>;
}

2 changes: 1 addition & 1 deletion
elliptic-curve/src/weierstrass.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ pub mod public_key;

pub use self::{
 point::{CompressedPoint, CompressedPointSize, UncompressedPoint, UncompressedPointSize},
 public_key::{FromPublicKey, PublicKey},
 public_key::PublicKey,
};

/// Marker trait for elliptic curves in short Weierstrass form
Expand Down

24 changes: 2 additions & 22 deletions
elliptic-curve/src/weierstrass/public_key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,7 @@ use super::{
 Curve,
};
use crate::{
 point::Generator, scalar::NonZeroScalar, secret_key::FromSecretKey, Arithmetic, Error,
 SecretKey,
 encoding::FromBytes, point::Generator, scalar::NonZeroScalar, Arithmetic, Error, SecretKey,
};
use core::{
 fmt::{self, Debug},
Expand All@@ -17,7 +16,6 @@ use generic_array::{
 typenum::{Unsigned, U1},
 ArrayLength, GenericArray,
};
use subtle::CtOption;

/// Size of an untagged point for given elliptic curve.
pub type UntaggedPointSize<C> = <<C as crate::Curve>::ElementSize as Add>::Output;
Expand DownExpand Up@@ -133,7 +131,7 @@ where
 ///
 /// The `compress` flag requests point compression.
 pub fn from_secret_key(secret_key: &SecretKey<C>, compress: bool) -> Result<Self, Error> {
 let ct_option = C::Scalar::from_secret_key(&secret_key).and_then(NonZeroScalar::new);
 let ct_option = C::Scalar::from_bytes(secret_key.as_bytes()).and_then(NonZeroScalar::new);

 if ct_option.is_none().into() {
 return Err(Error);
Expand DownExpand Up@@ -208,21 +206,3 @@ where
 PublicKey::Uncompressed(point)
 }
}

/// Trait for deserializing a value from a public key.
///
/// This is intended for use with the `AffinePoint` type for a given elliptic curve.
pub trait FromPublicKey<C: Curve>: Sized
where
 C::ElementSize: Add<U1>,
 <C::ElementSize as Add>::Output: Add<U1>,
 CompressedPointSize<C>: ArrayLength<u8>,
 UncompressedPointSize<C>: ArrayLength<u8>,
{
 /// Deserialize this value from a [`PublicKey`]
 ///
 /// # Returns
 ///
 /// `None` if the public key is not on the curve.
 fn from_public_key(public_key: &PublicKey<C>) -> CtOption<Self>;
}

, '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('^' + ".*" + '
elliptic-curve: add `encoding` module by tarcieri · Pull Request #247 · RustCrypto/traits · GitHub
Skip to content
elliptic-curve: add encoding module#247

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

Aug 4, 2020
 Merged


elliptic-curve: add encoding module
#247
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


23 changes: 23 additions & 0 deletions
elliptic-curve/src/encoding.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
//! Traits for decoding/encoding elliptic curve elements (i.e. base and scalar
//! field elements) as bytes.

use generic_array::{ArrayLength, GenericArray};
use subtle::{ConditionallySelectable, CtOption};

/// Try to decode the given bytes into a curve element
pub trait FromBytes: ConditionallySelectable + Sized {
 /// Size of the serialized byte array
 type Size: ArrayLength<u8>;

 /// Try to decode this object from bytes
 fn from_bytes(bytes: &GenericArray<u8, Self::Size>) -> CtOption<Self>;
}

/// Encode this curve element as bytes
pub trait ToBytes {
 /// Size of the serialized byte array
 type Size: ArrayLength<u8>;

 /// Encode this object to bytes
 fn to_bytes(&self) -> GenericArray<u8, Self::Size>;
}

3 changes: 2 additions & 1 deletion
elliptic-curve/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
#[cfg(feature = "std")]
extern crate std;

pub mod encoding;
pub mod error;
pub mod ops;
pub mod point;
Expand DownExpand Up@@ -77,7 +78,7 @@ pub trait Arithmetic: Curve {
 type Scalar: ConditionallySelectable
 + ConstantTimeEq
 + Default
 + secret_key::FromSecretKey<Self>;
 + encoding::FromBytes<Size = Self::ElementSize>;

 /// Affine point type for a given curve
 type AffinePoint: ConditionallySelectable + Mul<scalar::NonZeroScalar<Self>> + point::Generator;
Expand Down

9 changes: 0 additions & 9 deletions
elliptic-curve/src/secret_key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ use core::{
 fmt::{self, Debug},
};
use generic_array::{typenum::Unsigned, GenericArray};
use subtle::CtOption;

#[cfg(feature = "rand_core")]
use {
Expand DownExpand Up@@ -91,11 +90,3 @@ impl<C: Curve> Drop for SecretKey<C> {
 self.scalar.zeroize();
 }
}

/// Trait for deserializing a value from a secret key.
///
/// This is intended for use with the `Scalar` type for a given elliptic curve.
pub trait FromSecretKey<C: Curve>: Sized {
 /// Deserialize this value from a [`SecretKey`]
 fn from_secret_key(secret_key: &SecretKey<C>) -> CtOption<Self>;
}

2 changes: 1 addition & 1 deletion
elliptic-curve/src/weierstrass.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ pub mod public_key;

pub use self::{
 point::{CompressedPoint, CompressedPointSize, UncompressedPoint, UncompressedPointSize},
 public_key::{FromPublicKey, PublicKey},
 public_key::PublicKey,
};

/// Marker trait for elliptic curves in short Weierstrass form
Expand Down

24 changes: 2 additions & 22 deletions
elliptic-curve/src/weierstrass/public_key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,7 @@ use super::{
 Curve,
};
use crate::{
 point::Generator, scalar::NonZeroScalar, secret_key::FromSecretKey, Arithmetic, Error,
 SecretKey,
 encoding::FromBytes, point::Generator, scalar::NonZeroScalar, Arithmetic, Error, SecretKey,
};
use core::{
 fmt::{self, Debug},
Expand All@@ -17,7 +16,6 @@ use generic_array::{
 typenum::{Unsigned, U1},
 ArrayLength, GenericArray,
};
use subtle::CtOption;

/// Size of an untagged point for given elliptic curve.
pub type UntaggedPointSize<C> = <<C as crate::Curve>::ElementSize as Add>::Output;
Expand DownExpand Up@@ -133,7 +131,7 @@ where
 ///
 /// The `compress` flag requests point compression.
 pub fn from_secret_key(secret_key: &SecretKey<C>, compress: bool) -> Result<Self, Error> {
 let ct_option = C::Scalar::from_secret_key(&secret_key).and_then(NonZeroScalar::new);
 let ct_option = C::Scalar::from_bytes(secret_key.as_bytes()).and_then(NonZeroScalar::new);

 if ct_option.is_none().into() {
 return Err(Error);
Expand DownExpand Up@@ -208,21 +206,3 @@ where
 PublicKey::Uncompressed(point)
 }
}

/// Trait for deserializing a value from a public key.
///
/// This is intended for use with the `AffinePoint` type for a given elliptic curve.
pub trait FromPublicKey<C: Curve>: Sized
where
 C::ElementSize: Add<U1>,
 <C::ElementSize as Add>::Output: Add<U1>,
 CompressedPointSize<C>: ArrayLength<u8>,
 UncompressedPointSize<C>: ArrayLength<u8>,
{
 /// Deserialize this value from a [`PublicKey`]
 ///
 /// # Returns
 ///
 /// `None` if the public key is not on the curve.
 fn from_public_key(public_key: &PublicKey<C>) -> CtOption<Self>;
}

, '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('^' + ".*" + '
elliptic-curve: add `encoding` module by tarcieri · Pull Request #247 · RustCrypto/traits · GitHub
Skip to content
elliptic-curve: add encoding module#247

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

Aug 4, 2020
 Merged


elliptic-curve: add encoding module
#247
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


23 changes: 23 additions & 0 deletions
elliptic-curve/src/encoding.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
//! Traits for decoding/encoding elliptic curve elements (i.e. base and scalar
//! field elements) as bytes.

use generic_array::{ArrayLength, GenericArray};
use subtle::{ConditionallySelectable, CtOption};

/// Try to decode the given bytes into a curve element
pub trait FromBytes: ConditionallySelectable + Sized {
 /// Size of the serialized byte array
 type Size: ArrayLength<u8>;

 /// Try to decode this object from bytes
 fn from_bytes(bytes: &GenericArray<u8, Self::Size>) -> CtOption<Self>;
}

/// Encode this curve element as bytes
pub trait ToBytes {
 /// Size of the serialized byte array
 type Size: ArrayLength<u8>;

 /// Encode this object to bytes
 fn to_bytes(&self) -> GenericArray<u8, Self::Size>;
}

3 changes: 2 additions & 1 deletion
elliptic-curve/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
#[cfg(feature = "std")]
extern crate std;

pub mod encoding;
pub mod error;
pub mod ops;
pub mod point;
Expand DownExpand Up@@ -77,7 +78,7 @@ pub trait Arithmetic: Curve {
 type Scalar: ConditionallySelectable
 + ConstantTimeEq
 + Default
 + secret_key::FromSecretKey<Self>;
 + encoding::FromBytes<Size = Self::ElementSize>;

 /// Affine point type for a given curve
 type AffinePoint: ConditionallySelectable + Mul<scalar::NonZeroScalar<Self>> + point::Generator;
Expand Down

9 changes: 0 additions & 9 deletions
elliptic-curve/src/secret_key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ use core::{
 fmt::{self, Debug},
};
use generic_array::{typenum::Unsigned, GenericArray};
use subtle::CtOption;

#[cfg(feature = "rand_core")]
use {
Expand DownExpand Up@@ -91,11 +90,3 @@ impl<C: Curve> Drop for SecretKey<C> {
 self.scalar.zeroize();
 }
}

/// Trait for deserializing a value from a secret key.
///
/// This is intended for use with the `Scalar` type for a given elliptic curve.
pub trait FromSecretKey<C: Curve>: Sized {
 /// Deserialize this value from a [`SecretKey`]
 fn from_secret_key(secret_key: &SecretKey<C>) -> CtOption<Self>;
}

2 changes: 1 addition & 1 deletion
elliptic-curve/src/weierstrass.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ pub mod public_key;

pub use self::{
 point::{CompressedPoint, CompressedPointSize, UncompressedPoint, UncompressedPointSize},
 public_key::{FromPublicKey, PublicKey},
 public_key::PublicKey,
};

/// Marker trait for elliptic curves in short Weierstrass form
Expand Down

24 changes: 2 additions & 22 deletions
elliptic-curve/src/weierstrass/public_key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,7 @@ use super::{
 Curve,
};
use crate::{
 point::Generator, scalar::NonZeroScalar, secret_key::FromSecretKey, Arithmetic, Error,
 SecretKey,
 encoding::FromBytes, point::Generator, scalar::NonZeroScalar, Arithmetic, Error, SecretKey,
};
use core::{
 fmt::{self, Debug},
Expand All@@ -17,7 +16,6 @@ use generic_array::{
 typenum::{Unsigned, U1},
 ArrayLength, GenericArray,
};
use subtle::CtOption;

/// Size of an untagged point for given elliptic curve.
pub type UntaggedPointSize<C> = <<C as crate::Curve>::ElementSize as Add>::Output;
Expand DownExpand Up@@ -133,7 +131,7 @@ where
 ///
 /// The `compress` flag requests point compression.
 pub fn from_secret_key(secret_key: &SecretKey<C>, compress: bool) -> Result<Self, Error> {
 let ct_option = C::Scalar::from_secret_key(&secret_key).and_then(NonZeroScalar::new);
 let ct_option = C::Scalar::from_bytes(secret_key.as_bytes()).and_then(NonZeroScalar::new);

 if ct_option.is_none().into() {
 return Err(Error);
Expand DownExpand Up@@ -208,21 +206,3 @@ where
 PublicKey::Uncompressed(point)
 }
}

/// Trait for deserializing a value from a public key.
///
/// This is intended for use with the `AffinePoint` type for a given elliptic curve.
pub trait FromPublicKey<C: Curve>: Sized
where
 C::ElementSize: Add<U1>,
 <C::ElementSize as Add>::Output: Add<U1>,
 CompressedPointSize<C>: ArrayLength<u8>,
 UncompressedPointSize<C>: ArrayLength<u8>,
{
 /// Deserialize this value from a [`PublicKey`]
 ///
 /// # Returns
 ///
 /// `None` if the public key is not on the curve.
 fn from_public_key(public_key: &PublicKey<C>) -> CtOption<Self>;
}

, '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); }
})();
})();
elliptic-curve: add `encoding` module by tarcieri · Pull Request #247 · RustCrypto/traits · GitHub
Skip to content
elliptic-curve: add encoding module#247

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

Aug 4, 2020
 Merged


elliptic-curve: add encoding module
#247
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


23 changes: 23 additions & 0 deletions
elliptic-curve/src/encoding.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
//! Traits for decoding/encoding elliptic curve elements (i.e. base and scalar
//! field elements) as bytes.

use generic_array::{ArrayLength, GenericArray};
use subtle::{ConditionallySelectable, CtOption};

/// Try to decode the given bytes into a curve element
pub trait FromBytes: ConditionallySelectable + Sized {
 /// Size of the serialized byte array
 type Size: ArrayLength<u8>;

 /// Try to decode this object from bytes
 fn from_bytes(bytes: &GenericArray<u8, Self::Size>) -> CtOption<Self>;
}

/// Encode this curve element as bytes
pub trait ToBytes {
 /// Size of the serialized byte array
 type Size: ArrayLength<u8>;

 /// Encode this object to bytes
 fn to_bytes(&self) -> GenericArray<u8, Self::Size>;
}

3 changes: 2 additions & 1 deletion
elliptic-curve/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@
#[cfg(feature = "std")]
extern crate std;

pub mod encoding;
pub mod error;
pub mod ops;
pub mod point;
Expand DownExpand Up@@ -77,7 +78,7 @@ pub trait Arithmetic: Curve {
 type Scalar: ConditionallySelectable
 + ConstantTimeEq
 + Default
 + secret_key::FromSecretKey<Self>;
 + encoding::FromBytes<Size = Self::ElementSize>;

 /// Affine point type for a given curve
 type AffinePoint: ConditionallySelectable + Mul<scalar::NonZeroScalar<Self>> + point::Generator;
Expand Down

9 changes: 0 additions & 9 deletions
elliptic-curve/src/secret_key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,6 @@ use core::{
 fmt::{self, Debug},
};
use generic_array::{typenum::Unsigned, GenericArray};
use subtle::CtOption;

#[cfg(feature = "rand_core")]
use {
Expand DownExpand Up@@ -91,11 +90,3 @@ impl<C: Curve> Drop for SecretKey<C> {
 self.scalar.zeroize();
 }
}

/// Trait for deserializing a value from a secret key.
///
/// This is intended for use with the `Scalar` type for a given elliptic curve.
pub trait FromSecretKey<C: Curve>: Sized {
 /// Deserialize this value from a [`SecretKey`]
 fn from_secret_key(secret_key: &SecretKey<C>) -> CtOption<Self>;
}

2 changes: 1 addition & 1 deletion
elliptic-curve/src/weierstrass.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ pub mod public_key;

pub use self::{
 point::{CompressedPoint, CompressedPointSize, UncompressedPoint, UncompressedPointSize},
 public_key::{FromPublicKey, PublicKey},
 public_key::PublicKey,
};

/// Marker trait for elliptic curves in short Weierstrass form
Expand Down

24 changes: 2 additions & 22 deletions
elliptic-curve/src/weierstrass/public_key.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,8 +6,7 @@ use super::{
 Curve,
};
use crate::{
 point::Generator, scalar::NonZeroScalar, secret_key::FromSecretKey, Arithmetic, Error,
 SecretKey,
 encoding::FromBytes, point::Generator, scalar::NonZeroScalar, Arithmetic, Error, SecretKey,
};
use core::{
 fmt::{self, Debug},
Expand All@@ -17,7 +16,6 @@ use generic_array::{
 typenum::{Unsigned, U1},
 ArrayLength, GenericArray,
};
use subtle::CtOption;

/// Size of an untagged point for given elliptic curve.
pub type UntaggedPointSize<C> = <<C as crate::Curve>::ElementSize as Add>::Output;
Expand DownExpand Up@@ -133,7 +131,7 @@ where
 ///
 /// The `compress` flag requests point compression.
 pub fn from_secret_key(secret_key: &SecretKey<C>, compress: bool) -> Result<Self, Error> {
 let ct_option = C::Scalar::from_secret_key(&secret_key).and_then(NonZeroScalar::new);
 let ct_option = C::Scalar::from_bytes(secret_key.as_bytes()).and_then(NonZeroScalar::new);

 if ct_option.is_none().into() {
 return Err(Error);
Expand DownExpand Up@@ -208,21 +206,3 @@ where
 PublicKey::Uncompressed(point)
 }
}

/// Trait for deserializing a value from a public key.
///
/// This is intended for use with the `AffinePoint` type for a given elliptic curve.
pub trait FromPublicKey<C: Curve>: Sized
where
 C::ElementSize: Add<U1>,
 <C::ElementSize as Add>::Output: Add<U1>,
 CompressedPointSize<C>: ArrayLength<u8>,
 UncompressedPointSize<C>: ArrayLength<u8>,
{
 /// Deserialize this value from a [`PublicKey`]
 ///
 /// # Returns
 ///
 /// `None` if the public key is not on the curve.
 fn from_public_key(public_key: &PublicKey<C>) -> CtOption<Self>;
}