From 2c8b3d65f2020cfcb3b3745d962cc00f8457ee12 Mon Sep 17 00:00:00 2001 From: Peter Dettman Date: Wed, 29 Jan 2014 20:53:18 +0700 Subject: Cleanup various warnings, and reformatting --- crypto/src/math/ec/ECCurve.cs | 3 ++- crypto/src/math/ec/abc/Tnaf.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'crypto/src/math/ec') diff --git a/crypto/src/math/ec/ECCurve.cs b/crypto/src/math/ec/ECCurve.cs index 0c150848a..82cf1367b 100644 --- a/crypto/src/math/ec/ECCurve.cs +++ b/crypto/src/math/ec/ECCurve.cs @@ -340,7 +340,7 @@ namespace Org.BouncyCastle.Math.EC BigInteger X1 = new BigInteger(1, encoded, 1, expectedLength); BigInteger Y1 = new BigInteger(1, encoded, 1 + expectedLength, expectedLength); - p = CreatePoint(X1, Y1, false); + p = CreatePoint(X1, Y1); break; } @@ -777,6 +777,7 @@ namespace Org.BouncyCastle.Math.EC return new F2mFieldElement(this.m, this.k1, this.k2, this.k3, x); } + [Obsolete("Per-point compression property will be removed")] public override ECPoint CreatePoint(BigInteger x, BigInteger y, bool withCompression) { ECFieldElement X = FromBigInteger(x), Y = FromBigInteger(y); diff --git a/crypto/src/math/ec/abc/Tnaf.cs b/crypto/src/math/ec/abc/Tnaf.cs index 0ba414e68..9f16886f5 100644 --- a/crypto/src/math/ec/abc/Tnaf.cs +++ b/crypto/src/math/ec/abc/Tnaf.cs @@ -534,7 +534,7 @@ namespace Org.BouncyCastle.Math.EC.Abc int m = curve.M; int a = curve.A.ToBigInteger().IntValue; sbyte mu = curve.GetMu(); - int h = curve.H.IntValue; + int h = curve.Cofactor.IntValue; int index = m + 3 - a; BigInteger[] ui = GetLucas(mu, index, false); -- cgit 1.5.1