yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename ECDSAParameters to ECDSAVerificationAlgorithm.

Browse Source 
This is in preparation for adding `ECDSASigningAlgorithm`.
This commit is contained in:
Brian Smith 2017-04-30 10:09:29 -10:00
parent 2f4c6ea86e
commit a3ad8815a3
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/ec/suite_b/ecdsa.rs
View File

@ -22,7 +22,7 @@ use super::public_key::*;
use untrusted;
/// Parameters for ECDSA signing and verification.
pub struct ECDSAParameters {
pub struct ECDSAVerificationAlgorithm {
ops: &'static PublicScalarOps,
digest_alg: &'static digest::Algorithm,
split_rs:
@ -31,7 +31,7 @@ pub struct ECDSAParameters {
error::Unspecified>,
}
impl signature::VerificationAlgorithm for ECDSAParameters {
impl signature::VerificationAlgorithm for ECDSAVerificationAlgorithm {
// Verify an ECDSA signature as documented in the NSA Suite B Implementer's
// Guide to ECDSA Section 3.4.2: ECDSA Signature Verification.
fn verify(&self, public_key: untrusted::Input, msg: untrusted::Input,
@ -130,7 +130,7 @@ impl signature::VerificationAlgorithm for ECDSAParameters {
}
}
impl private::Private for ECDSAParameters {}
impl private::Private for ECDSAVerificationAlgorithm {}
fn split_rs_fixed<'a>(
ops: &'static ScalarOps, input: &mut untrusted::Reader<'a>)
@ -214,7 +214,8 @@ fn twin_mul(ops: &PrivateKeyOps, g_scalar: &Scalar, p_scalar: &Scalar,
///
/// See "`ECDSA_*_FIXED` Details" in `ring::signature`'s module-level
/// documentation for more details.
pub static ECDSA_P256_SHA256_FIXED: ECDSAParameters = ECDSAParameters {
pub static ECDSA_P256_SHA256_FIXED: ECDSAVerificationAlgorithm =
ECDSAVerificationAlgorithm {
ops: &p256::PUBLIC_SCALAR_OPS,
digest_alg: &digest::SHA256,
split_rs: split_rs_fixed,
@ -225,7 +226,8 @@ pub static ECDSA_P256_SHA256_FIXED: ECDSAParameters = ECDSAParameters {
///
/// See "`ECDSA_*_FIXED` Details" in `ring::signature`'s module-level
/// documentation for more details.
pub static ECDSA_P384_SHA384_FIXED: ECDSAParameters = ECDSAParameters {
pub static ECDSA_P384_SHA384_FIXED: ECDSAVerificationAlgorithm =
ECDSAVerificationAlgorithm {
ops: &p384::PUBLIC_SCALAR_OPS,
digest_alg: &digest::SHA384,
split_rs: split_rs_fixed,
@ -236,7 +238,8 @@ pub static ECDSA_P384_SHA384_FIXED: ECDSAParameters = ECDSAParameters {
///
/// See "`ECDSA_*_ASN1` Details" in `ring::signature`'s module-level
/// documentation for more details.
pub static ECDSA_P256_SHA256_ASN1: ECDSAParameters = ECDSAParameters {
pub static ECDSA_P256_SHA256_ASN1: ECDSAVerificationAlgorithm =
ECDSAVerificationAlgorithm {
ops: &p256::PUBLIC_SCALAR_OPS,
digest_alg: &digest::SHA256,
split_rs: split_rs_asn1,
@ -252,7 +255,8 @@ pub static ECDSA_P256_SHA256_ASN1: ECDSAParameters = ECDSAParameters {
///
/// See "`ECDSA_*_ASN1` Details" in `ring::signature`'s module-level
/// documentation for more details.
pub static ECDSA_P256_SHA384_ASN1: ECDSAParameters = ECDSAParameters {
pub static ECDSA_P256_SHA384_ASN1: ECDSAVerificationAlgorithm =
ECDSAVerificationAlgorithm {
ops: &p256::PUBLIC_SCALAR_OPS,
digest_alg: &digest::SHA384,
split_rs: split_rs_asn1,
@ -268,7 +272,8 @@ pub static ECDSA_P256_SHA384_ASN1: ECDSAParameters = ECDSAParameters {
///
/// See "`ECDSA_*_ASN1` Details" in `ring::signature`'s module-level
/// documentation for more details.
pub static ECDSA_P384_SHA256_ASN1: ECDSAParameters = ECDSAParameters {
pub static ECDSA_P384_SHA256_ASN1: ECDSAVerificationAlgorithm =
ECDSAVerificationAlgorithm {
ops: &p384::PUBLIC_SCALAR_OPS,
digest_alg: &digest::SHA256,
split_rs: split_rs_asn1,
@ -279,7 +284,8 @@ pub static ECDSA_P384_SHA256_ASN1: ECDSAParameters = ECDSAParameters {
///
/// See "`ECDSA_*_ASN1` Details" in `ring::signature`'s module-level
/// documentation for more details.
pub static ECDSA_P384_SHA384_ASN1: ECDSAParameters = ECDSAParameters {
pub static ECDSA_P384_SHA384_ASN1: ECDSAVerificationAlgorithm =
ECDSAVerificationAlgorithm {
ops: &p384::PUBLIC_SCALAR_OPS,
digest_alg: &digest::SHA384,
split_rs: split_rs_asn1,

2
src/signature.rs
View File

@ -263,7 +263,7 @@ use {error, init, private};
use untrusted;
pub use ec::suite_b::ecdsa::{
ECDSAParameters,
ECDSAVerificationAlgorithm,
ECDSA_P256_SHA256_ASN1, ECDSA_P256_SHA256_FIXED,
ECDSA_P256_SHA384_ASN1,