From 255d285ef267a1f035a9ff32e1590bd001307d57 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sun, 16 Oct 2016 03:33:48 -0400 Subject: [PATCH] Change curve25519 and curve448 to friendlier names --- eccrypto.h | 8 ++++---- oids.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eccrypto.h b/eccrypto.h index b9178d2d..904a35cf 100644 --- a/eccrypto.h +++ b/eccrypto.h @@ -38,13 +38,13 @@ public: typedef Point Element; typedef IncompatibleCofactorMultiplication DefaultCofactorOption; - DL_GroupParameters_EC() : m_compress(false), m_encodeAsOID(false) {} + DL_GroupParameters_EC() : m_compress(false), m_encodeAsOID(true) {} DL_GroupParameters_EC(const OID &oid) - : m_compress(false), m_encodeAsOID(false) {Initialize(oid);} + : m_compress(false), m_encodeAsOID(true) {Initialize(oid);} DL_GroupParameters_EC(const EllipticCurve &ec, const Point &G, const Integer &n, const Integer &k = Integer::Zero()) - : m_compress(false), m_encodeAsOID(false) {Initialize(ec, G, n, k);} + : m_compress(false), m_encodeAsOID(true) {Initialize(ec, G, n, k);} DL_GroupParameters_EC(BufferedTransformation &bt) - : m_compress(false), m_encodeAsOID(false) {BERDecode(bt);} + : m_compress(false), m_encodeAsOID(true) {BERDecode(bt);} void Initialize(const EllipticCurve &ec, const Point &G, const Integer &n, const Integer &k = Integer::Zero()) { diff --git a/oids.h b/oids.h index ddc1a490..99b66117 100644 --- a/oids.h +++ b/oids.h @@ -48,10 +48,10 @@ DEFINE_OID(1, iso) DEFINE_OID(internet_private()+1, enterprise) DEFINE_OID(enterprise()+11591,GNU) DEFINE_OID(GNU()+15,ellipticCurve) - DEFINE_OID(ellipticCurve()+1,id_curve25519) - DEFINE_OID(ellipticCurve()+2,id_curve448) - DEFINE_OID(ellipticCurve()+3,id_curve25519ph) - DEFINE_OID(ellipticCurve()+4,id_curve448ph) + DEFINE_OID(ellipticCurve()+1,curve25519) + DEFINE_OID(ellipticCurve()+2,curve448) + DEFINE_OID(ellipticCurve()+3,curve25519ph) + DEFINE_OID(ellipticCurve()+4,curve448ph) DEFINE_OID(identified_organization()+14, oiw); DEFINE_OID(oiw()+3, oiw_secsig); DEFINE_OID(oiw_secsig()+2, oiw_secsig_algorithms);