summaryrefslogtreecommitdiffstats
path: root/vendor/elliptic-curve/src/sec1.rs
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/elliptic-curve/src/sec1.rs')
-rw-r--r--vendor/elliptic-curve/src/sec1.rs24
1 files changed, 12 insertions, 12 deletions
diff --git a/vendor/elliptic-curve/src/sec1.rs b/vendor/elliptic-curve/src/sec1.rs
index 3e1635941..7673386b8 100644
--- a/vendor/elliptic-curve/src/sec1.rs
+++ b/vendor/elliptic-curve/src/sec1.rs
@@ -4,27 +4,27 @@
pub use sec1::point::{Coordinates, ModulusSize, Tag};
-use crate::{Curve, FieldSize, Result, SecretKey};
+use crate::{Curve, FieldBytesSize, Result, SecretKey};
use generic_array::GenericArray;
use subtle::CtOption;
#[cfg(feature = "arithmetic")]
-use crate::{AffinePoint, Error, ProjectiveArithmetic};
+use crate::{AffinePoint, CurveArithmetic, Error};
/// Encoded elliptic curve point with point compression.
pub type CompressedPoint<C> = GenericArray<u8, CompressedPointSize<C>>;
/// Size of a compressed elliptic curve point.
-pub type CompressedPointSize<C> = <FieldSize<C> as ModulusSize>::CompressedPointSize;
+pub type CompressedPointSize<C> = <FieldBytesSize<C> as ModulusSize>::CompressedPointSize;
/// Encoded elliptic curve point sized appropriately for a given curve.
-pub type EncodedPoint<C> = sec1::point::EncodedPoint<FieldSize<C>>;
+pub type EncodedPoint<C> = sec1::point::EncodedPoint<FieldBytesSize<C>>;
/// Encoded elliptic curve point *without* point compression.
pub type UncompressedPoint<C> = GenericArray<u8, UncompressedPointSize<C>>;
/// Size of an uncompressed elliptic curve point.
-pub type UncompressedPointSize<C> = <FieldSize<C> as ModulusSize>::UncompressedPointSize;
+pub type UncompressedPointSize<C> = <FieldBytesSize<C> as ModulusSize>::UncompressedPointSize;
/// Trait for deserializing a value from a SEC1 encoded curve point.
///
@@ -33,7 +33,7 @@ pub trait FromEncodedPoint<C>
where
Self: Sized,
C: Curve,
- FieldSize<C>: ModulusSize,
+ FieldBytesSize<C>: ModulusSize,
{
/// Deserialize the type this trait is impl'd on from an [`EncodedPoint`].
fn from_encoded_point(point: &EncodedPoint<C>) -> CtOption<Self>;
@@ -45,7 +45,7 @@ where
pub trait ToEncodedPoint<C>
where
C: Curve,
- FieldSize<C>: ModulusSize,
+ FieldBytesSize<C>: ModulusSize,
{
/// Serialize this value as a SEC1 [`EncodedPoint`], optionally applying
/// point compression.
@@ -58,7 +58,7 @@ where
pub trait ToCompactEncodedPoint<C>
where
C: Curve,
- FieldSize<C>: ModulusSize,
+ FieldBytesSize<C>: ModulusSize,
{
/// Serialize this value as a SEC1 [`EncodedPoint`], optionally applying
/// point compression.
@@ -68,12 +68,12 @@ where
/// Validate that the given [`EncodedPoint`] represents the encoded public key
/// value of the given secret.
///
-/// Curve implementations which also impl [`ProjectiveArithmetic`] will receive
+/// Curve implementations which also impl [`CurveArithmetic`] will receive
/// a blanket default impl of this trait.
pub trait ValidatePublicKey
where
Self: Curve,
- FieldSize<Self>: ModulusSize,
+ FieldBytesSize<Self>: ModulusSize,
{
/// Validate that the given [`EncodedPoint`] is a valid public key for the
/// provided secret value.
@@ -96,9 +96,9 @@ where
#[cfg(all(feature = "arithmetic"))]
impl<C> ValidatePublicKey for C
where
- C: Curve + ProjectiveArithmetic,
+ C: CurveArithmetic,
AffinePoint<C>: FromEncodedPoint<C> + ToEncodedPoint<C>,
- FieldSize<C>: ModulusSize,
+ FieldBytesSize<C>: ModulusSize,
{
fn validate_public_key(secret_key: &SecretKey<C>, public_key: &EncodedPoint<C>) -> Result<()> {
let pk = secret_key