portability updates, updated version number

3 files changed, 10 insertions, 10 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 78577b78..c9a85fe1 100644
--- a/core/src/main/java/org/bouncycastle/math/ec/ECCurve.java
+++ b/core/src/main/java/org/bouncycastle/math/ec/ECCurve.java
@@ -844,7 +844,7 @@ public abstract class ECCurve
             {
                 if (X.isZero())
                 {
-                    if (!Y.square().equals(getB()))
+                    if (!Y.square().equals(this.getB()))
                     {
                         throw new IllegalArgumentException();
                     }
diff --git a/core/src/main/java/org/bouncycastle/math/ec/ECFieldElement.java b/core/src/main/java/org/bouncycastle/math/ec/ECFieldElement.java
index 175844e3..59438826 100644
--- a/core/src/main/java/org/bouncycastle/math/ec/ECFieldElement.java
+++ b/core/src/main/java/org/bouncycastle/math/ec/ECFieldElement.java
@@ -222,7 +222,7 @@ public abstract class ECFieldElement
          */
         public ECFieldElement sqrt()
         {
-            if (isZero() || isOne())
+            if (this.isZero() || this.isOne()) // earlier JDK compatibility
             {
                 return this;
             }
diff --git a/core/src/main/java/org/bouncycastle/math/ec/ECPoint.java b/core/src/main/java/org/bouncycastle/math/ec/ECPoint.java
index 2aa0fd21..e48244f4 100644
--- a/core/src/main/java/org/bouncycastle/math/ec/ECPoint.java
+++ b/core/src/main/java/org/bouncycastle/math/ec/ECPoint.java
@@ -532,7 +532,7 @@ public abstract class ECPoint
 
         protected ECPoint detach()
         {
-            return new ECPoint.Fp(null, getAffineXCoord(), getAffineYCoord());
+            return new ECPoint.Fp(null, this.getAffineXCoord(), this.getAffineYCoord());
         }
 
         protected boolean getCompressionYTilde()
@@ -1311,7 +1311,7 @@ public abstract class ECPoint
 
         protected ECPoint detach()
         {
-            return new ECPoint.F2m(null, getAffineXCoord(), getAffineYCoord());
+            return new ECPoint.F2m(null, this.getAffineXCoord(), this.getAffineYCoord()); // earlier JDK
         }
 
         public ECFieldElement getYCoord()
@@ -1363,24 +1363,24 @@ public abstract class ECPoint
             case ECCurve.COORD_LAMBDA_AFFINE:
             {
                 // Y is actually Lambda (X + Y/X) here
-                ECFieldElement X = getRawXCoord(), L = getRawYCoord();
+                ECFieldElement X = this.getRawXCoord(), L = this.getRawYCoord(); // earlier JDK
 
                 ECFieldElement X2 = X.multiply(scale);
                 ECFieldElement L2 = L.add(X).divide(scale).add(X2);
 
-                return getCurve().createRawPoint(X, L2, getRawZCoords(), this.withCompression);
+                return this.getCurve().createRawPoint(X, L2, this.getRawZCoords(), this.withCompression); // earlier JDK
             }
             case ECCurve.COORD_LAMBDA_PROJECTIVE:
             {
                 // Y is actually Lambda (X + Y/X) here
-                ECFieldElement X = getRawXCoord(), L = getRawYCoord(), Z = getRawZCoords()[0];
+                ECFieldElement X = this.getRawXCoord(), L = this.getRawYCoord(), Z = this.getRawZCoords()[0]; // earlier JDK
 
                 // We scale the Z coordinate also, to avoid an inversion
                 ECFieldElement X2 = X.multiply(scale.square());
                 ECFieldElement L2 = L.add(X).add(X2);
                 ECFieldElement Z2 = Z.multiply(scale);
 
-                return getCurve().createRawPoint(X2, L2, new ECFieldElement[]{ Z2 }, this.withCompression);
+                return this.getCurve().createRawPoint(X2, L2, new ECFieldElement[]{ Z2 }, this.withCompression); // earlier JDK
             }
             default:
             {
@@ -1403,12 +1403,12 @@ public abstract class ECPoint
             case ECCurve.COORD_LAMBDA_AFFINE:
             case ECCurve.COORD_LAMBDA_PROJECTIVE:
             {
-                ECFieldElement X = getRawXCoord(), L = getRawYCoord();
+                ECFieldElement X = this.getRawXCoord(), L = this.getRawYCoord(); // earlier JDK
 
                 // Y is actually Lambda (X + Y/X) here
                 ECFieldElement L2 = L.add(X).multiply(scale).add(X);
 
-                return getCurve().createRawPoint(X, L2, getRawZCoords(), this.withCompression);
+                return this.getCurve().createRawPoint(X, L2, this.getRawZCoords(), this.withCompression); // earlier JDK
             }
             default:
             {