From 4825e091730c3fd453ccee87913ae1f738a4ed55 Mon Sep 17 00:00:00 2001 From: Peter Dettman Date: Thu, 13 Mar 2014 15:12:55 +0700 Subject: Rename parameters --- core/src/main/java/org/bouncycastle/math/ec/ECAlgorithms.java | 4 ++-- core/src/main/java/org/bouncycastle/math/ec/WNafUtil.java | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'core/src/main/java/org') diff --git a/core/src/main/java/org/bouncycastle/math/ec/ECAlgorithms.java b/core/src/main/java/org/bouncycastle/math/ec/ECAlgorithms.java index aaec5276..6d2a60b2 100644 --- a/core/src/main/java/org/bouncycastle/math/ec/ECAlgorithms.java +++ b/core/src/main/java/org/bouncycastle/math/ec/ECAlgorithms.java @@ -200,7 +200,7 @@ public class ECAlgorithms return implShamirsTrickWNaf(preCompP, preCompNegP, wnafP, preCompQ, preCompNegQ, wnafQ); } - static ECPoint implShamirsTrickWNaf(ECPoint P, BigInteger k, ECPointMap mapQ, BigInteger l) + static ECPoint implShamirsTrickWNaf(ECPoint P, BigInteger k, ECPointMap pointMapQ, BigInteger l) { boolean negK = k.signum() < 0, negL = l.signum() < 0; @@ -209,7 +209,7 @@ public class ECAlgorithms int width = Math.max(2, Math.min(16, WNafUtil.getWindowSize(Math.max(k.bitLength(), l.bitLength())))); - ECPoint Q = WNafUtil.mapPointWithPrecomp(P, width, true, mapQ); + ECPoint Q = WNafUtil.mapPointWithPrecomp(P, width, true, pointMapQ); WNafPreCompInfo infoP = WNafUtil.getWNafPreCompInfo(P); WNafPreCompInfo infoQ = WNafUtil.getWNafPreCompInfo(Q); diff --git a/core/src/main/java/org/bouncycastle/math/ec/WNafUtil.java b/core/src/main/java/org/bouncycastle/math/ec/WNafUtil.java index ff4eec33..e1868f4d 100644 --- a/core/src/main/java/org/bouncycastle/math/ec/WNafUtil.java +++ b/core/src/main/java/org/bouncycastle/math/ec/WNafUtil.java @@ -329,18 +329,19 @@ public abstract class WNafUtil return w + 2; } - public static ECPoint mapPointWithPrecomp(ECPoint p, int width, boolean includeNegated, ECPointMap map) + public static ECPoint mapPointWithPrecomp(ECPoint p, int width, boolean includeNegated, + ECPointMap pointMap) { ECCurve c = p.getCurve(); WNafPreCompInfo wnafPreCompP = precompute(p, width, includeNegated); - ECPoint q = map.map(p); + ECPoint q = pointMap.map(p); WNafPreCompInfo wnafPreCompQ = getWNafPreCompInfo(c.getPreCompInfo(q, PRECOMP_NAME)); ECPoint twiceP = wnafPreCompP.getTwice(); if (twiceP != null) { - ECPoint twiceQ = map.map(twiceP); + ECPoint twiceQ = pointMap.map(twiceP); wnafPreCompQ.setTwice(twiceQ); } @@ -348,7 +349,7 @@ public abstract class WNafUtil ECPoint[] preCompQ = new ECPoint[preCompP.length]; for (int i = 0; i < preCompP.length; ++i) { - preCompQ[i] = map.map(preCompP[i]); + preCompQ[i] = pointMap.map(preCompP[i]); } wnafPreCompQ.setPreComp(preCompQ); -- cgit v1.2.3