arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Whitespace check-in

pull/871/head
Jeffrey Walton 2019-08-03 02:41:27 -04:00
parent 9366be5615
commit 0163c52588
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
4 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ec2n.cpp
View File

@ -16,7 +16,8 @@ ANONYMOUS_NAMESPACE_BEGIN
using CryptoPP::EC2N; using CryptoPP::EC2N;
#if defined(HAVE_GCC_INIT_PRIORITY) #if defined(HAVE_GCC_INIT_PRIORITY)
const EC2N::Point g_identity __attribute__ ((init_priority (CRYPTOPP_INIT_PRIORITY + 50))) = EC2N::Point(); #define INIT_ATTRIBUTE __attribute__ ((init_priority (CRYPTOPP_INIT_PRIORITY + 51)))
const EC2N::Point g_identity INIT_ATTRIBUTE = EC2N::Point();
#elif defined(HAVE_MSC_INIT_PRIORITY) #elif defined(HAVE_MSC_INIT_PRIORITY)
#pragma warning(disable: 4075) #pragma warning(disable: 4075)
#pragma init_seg(".CRT$XCU") #pragma init_seg(".CRT$XCU")
@ -51,8 +52,8 @@ void EC2N::DEREncode(BufferedTransformation &bt) const
{ {
m_field->DEREncode(bt); m_field->DEREncode(bt);
DERSequenceEncoder seq(bt); DERSequenceEncoder seq(bt);
m_field->DEREncodeElement(seq, m_a); m_field->DEREncodeElement(seq, m_a);
m_field->DEREncodeElement(seq, m_b); m_field->DEREncodeElement(seq, m_b);
seq.MessageEnd(); seq.MessageEnd();
} }
@ -260,7 +261,7 @@ const EC2N::Point& EC2N::Double(const Point &P) const
// ******************************************************** // ********************************************************
/* #if 0
EcPrecomputation<EC2N>& EcPrecomputation<EC2N>::operator=(const EcPrecomputation<EC2N> &rhs) EcPrecomputation<EC2N>& EcPrecomputation<EC2N>::operator=(const EcPrecomputation<EC2N> &rhs)
{ {
m_ec = rhs.m_ec; m_ec = rhs.m_ec;
@ -312,7 +313,7 @@ EC2N::Point EcPrecomputation<EC2N>::CascadeExponentiate(const Integer &exponent,
{ {
return m_ep.CascadeExponentiate(exponent, static_cast<const EcPrecomputation<EC2N> &>(pc2).m_ep, exponent2); return m_ep.CascadeExponentiate(exponent, static_cast<const EcPrecomputation<EC2N> &>(pc2).m_ep, exponent2);
} }
*/ #endif
NAMESPACE_END NAMESPACE_END

1
ec2n.h
View File

@ -3,7 +3,6 @@
/// \file ec2n.h /// \file ec2n.h
/// \brief Classes for Elliptic Curves over binary fields /// \brief Classes for Elliptic Curves over binary fields
#ifndef CRYPTOPP_EC2N_H #ifndef CRYPTOPP_EC2N_H
#define CRYPTOPP_EC2N_H #define CRYPTOPP_EC2N_H

60
ecp.cpp
View File

@ -18,7 +18,8 @@ using CryptoPP::ECP;
using CryptoPP::ModularArithmetic; using CryptoPP::ModularArithmetic;
#if defined(HAVE_GCC_INIT_PRIORITY) #if defined(HAVE_GCC_INIT_PRIORITY)
const ECP::Point g_identity __attribute__ ((init_priority (CRYPTOPP_INIT_PRIORITY + 51))) = ECP::Point(); #define INIT_ATTRIBUTE __attribute__ ((init_priority (CRYPTOPP_INIT_PRIORITY + 50)))
const ECP::Point g_identity INIT_ATTRIBUTE = ECP::Point();
#elif defined(HAVE_MSC_INIT_PRIORITY) #elif defined(HAVE_MSC_INIT_PRIORITY)
#pragma warning(disable: 4075) #pragma warning(disable: 4075)
#pragma init_seg(".CRT$XCU") #pragma init_seg(".CRT$XCU")
@ -244,15 +245,13 @@ const ECP::Point& ECP::Inverse(const Point &P) const
const ECP::Point& ECP::Add(const Point &P, const Point &Q) const const ECP::Point& ECP::Add(const Point &P, const Point &Q) const
{ {
AdditionFunction add(*this); AdditionFunction add(*this);
m_R = add(P, Q); return (m_R = add(P, Q));
return m_R;
} }
const ECP::Point& ECP::Double(const Point &P) const const ECP::Point& ECP::Double(const Point &P) const
{ {
AdditionFunction add(*this); AdditionFunction add(*this);
m_R = add(P); return (m_R = add(P));
return m_R;
} }
template <class T, class Iterator> void ParallelInvert(const AbstractRing<T> &ring, Iterator begin, Iterator end) template <class T, class Iterator> void ParallelInvert(const AbstractRing<T> &ring, Iterator begin, Iterator end)
@ -305,7 +304,7 @@ class ProjectiveDoubling
{ {
public: public:
ProjectiveDoubling(const ModularArithmetic &m_mr, const Integer &m_a, const Integer &m_b, const ECPPoint &Q) ProjectiveDoubling(const ModularArithmetic &m_mr, const Integer &m_a, const Integer &m_b, const ECPPoint &Q)
: mr(m_mr), firstDoubling(true), negated(false) : mr(m_mr)
{ {
CRYPTOPP_UNUSED(m_b); CRYPTOPP_UNUSED(m_b);
if (Q.identity) if (Q.identity)
@ -342,7 +341,6 @@ public:
const ModularArithmetic &mr; const ModularArithmetic &mr;
ProjectivePoint P; ProjectivePoint P;
bool firstDoubling, negated;
Integer sixteenY4, aZ4, twoY, fourY2, S, M; Integer sixteenY4, aZ4, twoY, fourY2, S, M;
}; };
@ -523,6 +521,10 @@ ECP::Point ECP::AdditionFunction::operator()(const Point& P) const
{ {
if (m_alpha == A_3) if (m_alpha == A_3)
{ {
const ECP::Field& field = m_ecp.GetField();
const FieldElement& a = m_ecp.m_a;
const FieldElement& b = m_ecp.m_b;
// Gyrations attempt to maintain constant-timeness // Gyrations attempt to maintain constant-timeness
// We need either (P.x, P.y, 1) or (0, 1, 0). // We need either (P.x, P.y, 1) or (0, 1, 0).
const Integer x = P.x * !P.identity; const Integer x = P.x * !P.identity;
@ -530,10 +532,6 @@ ECP::Point ECP::AdditionFunction::operator()(const Point& P) const
const Integer z = 1 * !P.identity; const Integer z = 1 * !P.identity;
ProjectivePoint p(x, y, z), r; ProjectivePoint p(x, y, z), r;
const ECP::Field& field = m_ecp.GetField();
const FieldElement& a = m_ecp.m_a;
const FieldElement& b = m_ecp.m_b;
FieldElement t0 = field.Square(X); FieldElement t0 = field.Square(X);
FieldElement t1 = field.Square(Y); FieldElement t1 = field.Square(Y);
@ -580,6 +578,10 @@ ECP::Point ECP::AdditionFunction::operator()(const Point& P) const
} }
else if (m_alpha == A_0) else if (m_alpha == A_0)
{ {
const ECP::Field& field = m_ecp.GetField();
const FieldElement& a = m_ecp.m_a;
const FieldElement b3 = field.Multiply(m_ecp.m_b, 3);
// Gyrations attempt to maintain constant-timeness // Gyrations attempt to maintain constant-timeness
// We need either (P.x, P.y, 1) or (0, 1, 0). // We need either (P.x, P.y, 1) or (0, 1, 0).
const Integer x = P.x * !P.identity; const Integer x = P.x * !P.identity;
@ -587,10 +589,6 @@ ECP::Point ECP::AdditionFunction::operator()(const Point& P) const
const Integer z = 1 * !P.identity; const Integer z = 1 * !P.identity;
ProjectivePoint p(x, y, z), r; ProjectivePoint p(x, y, z), r;
const ECP::Field& field = m_ecp.GetField();
const FieldElement& a = m_ecp.m_a;
const FieldElement b3 = field.Multiply(m_ecp.m_b, 3);
FieldElement t0 = field.Square(Y); FieldElement t0 = field.Square(Y);
Z3 = field.Add(t0,t0); Z3 = field.Add(t0,t0);
@ -621,6 +619,10 @@ ECP::Point ECP::AdditionFunction::operator()(const Point& P) const
} }
else if (m_alpha == A_Star) else if (m_alpha == A_Star)
{ {
const ECP::Field& field = m_ecp.GetField();
const FieldElement& a = m_ecp.m_a;
const FieldElement b3 = field.Multiply(m_ecp.m_b, 3);
// Gyrations attempt to maintain constant-timeness // Gyrations attempt to maintain constant-timeness
// We need either (P.x, P.y, 1) or (0, 1, 0). // We need either (P.x, P.y, 1) or (0, 1, 0).
const Integer x = P.x * !P.identity; const Integer x = P.x * !P.identity;
@ -628,10 +630,6 @@ ECP::Point ECP::AdditionFunction::operator()(const Point& P) const
const Integer z = 1 * !P.identity; const Integer z = 1 * !P.identity;
ProjectivePoint p(x, y, z), r; ProjectivePoint p(x, y, z), r;
const ECP::Field& field = m_ecp.GetField();
const FieldElement& a = m_ecp.m_a;
const FieldElement b3 = field.Multiply(m_ecp.m_b, 3);
FieldElement t0 = field.Square(Y); FieldElement t0 = field.Square(Y);
Z3 = field.Add(t0,t0); Z3 = field.Add(t0,t0);
@ -684,6 +682,10 @@ ECP::Point ECP::AdditionFunction::operator()(const Point& P, const Point& Q) con
// Disabled at the moment due to HMQV and FHMQV failures // Disabled at the moment due to HMQV and FHMQV failures
if (m_alpha == A_3 && false) if (m_alpha == A_3 && false)
{ {
const ECP::Field& field = m_ecp.GetField();
const FieldElement& a = m_ecp.m_a;
const FieldElement& b = m_ecp.m_b;
// Gyrations attempt to maintain constant-timeness // Gyrations attempt to maintain constant-timeness
// We need either (P.x, P.y, 1) or (0, 1, 0). // We need either (P.x, P.y, 1) or (0, 1, 0).
const Integer x1 = P.x * !P.identity; const Integer x1 = P.x * !P.identity;
@ -695,10 +697,6 @@ ECP::Point ECP::AdditionFunction::operator()(const Point& P, const Point& Q) con
const Integer z2 = 1 * !Q.identity; const Integer z2 = 1 * !Q.identity;
ProjectivePoint p(x1, y1, z1), q(x2, y2, z2), r; ProjectivePoint p(x1, y1, z1), q(x2, y2, z2), r;
const ECP::Field& field = m_ecp.GetField();
const FieldElement& a = m_ecp.m_a;
const FieldElement& b = m_ecp.m_b;
FieldElement t0 = field.Multiply(X1,X2); FieldElement t0 = field.Multiply(X1,X2);
FieldElement t1 = field.Multiply(Y1,Y2); FieldElement t1 = field.Multiply(Y1,Y2);
@ -754,6 +752,10 @@ ECP::Point ECP::AdditionFunction::operator()(const Point& P, const Point& Q) con
} }
else if (m_alpha == A_0) else if (m_alpha == A_0)
{ {
const ECP::Field& field = m_ecp.GetField();
const FieldElement& a = m_ecp.m_a;
const FieldElement b3 = field.Multiply(m_ecp.m_b, 3);
// Gyrations attempt to maintain constant-timeness // Gyrations attempt to maintain constant-timeness
// We need either (P.x, P.y, 1) or (0, 1, 0). // We need either (P.x, P.y, 1) or (0, 1, 0).
const Integer x1 = P.x * !P.identity; const Integer x1 = P.x * !P.identity;
@ -765,10 +767,6 @@ ECP::Point ECP::AdditionFunction::operator()(const Point& P, const Point& Q) con
const Integer z2 = 1 * !Q.identity; const Integer z2 = 1 * !Q.identity;
ProjectivePoint p(x1, y1, z1), q(x2, y2, z2), r; ProjectivePoint p(x1, y1, z1), q(x2, y2, z2), r;
const ECP::Field& field = m_ecp.GetField();
const FieldElement& a = m_ecp.m_a;
const FieldElement b3 = field.Multiply(m_ecp.m_b, 3);
FieldElement t0 = field.Square(Y); FieldElement t0 = field.Square(Y);
Z3 = field.Add(t0,t0); Z3 = field.Add(t0,t0);
@ -799,6 +797,10 @@ ECP::Point ECP::AdditionFunction::operator()(const Point& P, const Point& Q) con
} }
else if (m_alpha == A_Star) else if (m_alpha == A_Star)
{ {
const ECP::Field& field = m_ecp.GetField();
const FieldElement& a = m_ecp.m_a;
const FieldElement b3 = field.Multiply(m_ecp.m_b, 3);
// Gyrations attempt to maintain constant-timeness // Gyrations attempt to maintain constant-timeness
// We need either (P.x, P.y, 1) or (0, 1, 0). // We need either (P.x, P.y, 1) or (0, 1, 0).
const Integer x1 = P.x * !P.identity; const Integer x1 = P.x * !P.identity;
@ -810,10 +812,6 @@ ECP::Point ECP::AdditionFunction::operator()(const Point& P, const Point& Q) con
const Integer z2 = 1 * !Q.identity; const Integer z2 = 1 * !Q.identity;
ProjectivePoint p(x1, y1, z1), q(x2, y2, z2), r; ProjectivePoint p(x1, y1, z1), q(x2, y2, z2), r;
const ECP::Field& field = m_ecp.GetField();
const FieldElement& a = m_ecp.m_a;
const FieldElement b3 = field.Multiply(m_ecp.m_b, 3);
FieldElement t0 = field.Multiply(X1,X2); FieldElement t0 = field.Multiply(X1,X2);
FieldElement t1 = field.Multiply(Y1,Y2); FieldElement t1 = field.Multiply(Y1,Y2);

5
ecp.h
View File

@ -120,12 +120,10 @@ protected:
Point operator()(const Point& P, const Point& Q) const; Point operator()(const Point& P, const Point& Q) const;
protected: protected:
const ECP& m_ecp;
/// \brief Parameters and representation for Addition /// \brief Parameters and representation for Addition
/// \details Addition and Doubling will use different algorithms, /// \details Addition and Doubling will use different algorithms,
/// depending on the <tt>A</tt> coefficient and the representation /// depending on the <tt>A</tt> coefficient and the representation
/// (Affine or Montgomery). /// (Affine or Montgomery with precomputation).
enum Alpha { enum Alpha {
/// \brief Coefficient A is 0 /// \brief Coefficient A is 0
A_0=1, A_0=1,
@ -137,6 +135,7 @@ protected:
A_Montgomery=8 A_Montgomery=8
}; };
const ECP& m_ecp;
Alpha m_alpha; Alpha m_alpha;
}; };