From 3ffb9534f1f2346a27e24014a0dbd6674f3754c9 Mon Sep 17 00:00:00 2001 From: Peter Dettman Date: Fri, 25 Jul 2014 15:19:17 +0700 Subject: Refactor --- .../main/java/org/bouncycastle/math/ec/ECCurve.java | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/core/src/main/java/org/bouncycastle/math/ec/ECCurve.java b/core/src/main/java/org/bouncycastle/math/ec/ECCurve.java index cd0593c9..4c658f20 100644 --- a/core/src/main/java/org/bouncycastle/math/ec/ECCurve.java +++ b/core/src/main/java/org/bouncycastle/math/ec/ECCurve.java @@ -353,6 +353,11 @@ public abstract class ECCurve BigInteger X = BigIntegers.fromUnsignedByteArray(encoded, 1, expectedLength); p = decompressPoint(yTilde, X); + if (!p.satisfiesCofactor()) + { + throw new IllegalArgumentException("Invalid point"); + } + break; } case 0x04: // uncompressed @@ -472,12 +477,7 @@ public abstract class ECCurve y = y.negate(); } - ECPoint p = this.createRawPoint(x, y, true); - if (!p.satisfiesCofactor()) - { - throw new IllegalArgumentException("Invalid point"); - } - return p; + return this.createRawPoint(x, y, true); } } @@ -1017,13 +1017,7 @@ public abstract class ECCurve throw new IllegalArgumentException("Invalid point compression"); } - ECPoint p = this.createRawPoint(x, y, true); - if (!p.satisfiesCofactor()) - { - throw new IllegalArgumentException("Invalid point"); - } - - return p; + return this.createRawPoint(x, y, true); } /** -- cgit v1.2.3