From a4c778ec2284d35583edfcd328febe90e51ee32d Mon Sep 17 00:00:00 2001
From: Peter Dettman <peter.dettman@bouncycastle.org>
Date: Thu, 13 Mar 2014 14:02:05 +0700
Subject: Move 2 classes into math.ec.endo

---
 core/src/main/java/org/bouncycastle/math/ec/ECCurve.java       |  2 ++
 .../src/main/java/org/bouncycastle/math/ec/ECEndomorphism.java |  8 --------
 .../main/java/org/bouncycastle/math/ec/GLVEndomorphism.java    |  8 --------
 core/src/main/java/org/bouncycastle/math/ec/GLVMultiplier.java |  2 ++
 .../java/org/bouncycastle/math/ec/endo/ECEndomorphism.java     | 10 ++++++++++
 .../java/org/bouncycastle/math/ec/endo/GLVEndomorphism.java    |  8 ++++++++
 .../org/bouncycastle/math/ec/endo/GLVTypeBEndomorphism.java    |  1 -
 7 files changed, 22 insertions(+), 17 deletions(-)
 delete mode 100644 core/src/main/java/org/bouncycastle/math/ec/ECEndomorphism.java
 delete mode 100644 core/src/main/java/org/bouncycastle/math/ec/GLVEndomorphism.java
 create mode 100644 core/src/main/java/org/bouncycastle/math/ec/endo/ECEndomorphism.java
 create mode 100644 core/src/main/java/org/bouncycastle/math/ec/endo/GLVEndomorphism.java

(limited to 'core/src/main/java/org/bouncycastle')

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 3bb8d600..7e4834d2 100644
--- a/core/src/main/java/org/bouncycastle/math/ec/ECCurve.java
+++ b/core/src/main/java/org/bouncycastle/math/ec/ECCurve.java
@@ -4,6 +4,8 @@ import java.math.BigInteger;
 import java.util.Hashtable;
 import java.util.Random;
 
+import org.bouncycastle.math.ec.endo.ECEndomorphism;
+import org.bouncycastle.math.ec.endo.GLVEndomorphism;
 import org.bouncycastle.math.field.FiniteField;
 import org.bouncycastle.math.field.FiniteFields;
 import org.bouncycastle.util.BigIntegers;
diff --git a/core/src/main/java/org/bouncycastle/math/ec/ECEndomorphism.java b/core/src/main/java/org/bouncycastle/math/ec/ECEndomorphism.java
deleted file mode 100644
index 110bd2ab..00000000
--- a/core/src/main/java/org/bouncycastle/math/ec/ECEndomorphism.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.bouncycastle.math.ec;
-
-public interface ECEndomorphism
-{
-    ECPointMap getPointMap();
-
-    boolean hasEfficientPointMap();
-}
diff --git a/core/src/main/java/org/bouncycastle/math/ec/GLVEndomorphism.java b/core/src/main/java/org/bouncycastle/math/ec/GLVEndomorphism.java
deleted file mode 100644
index bf576908..00000000
--- a/core/src/main/java/org/bouncycastle/math/ec/GLVEndomorphism.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.bouncycastle.math.ec;
-
-import java.math.BigInteger;
-
-public interface GLVEndomorphism extends ECEndomorphism
-{
-    BigInteger[] decomposeScalar(BigInteger k);
-}
diff --git a/core/src/main/java/org/bouncycastle/math/ec/GLVMultiplier.java b/core/src/main/java/org/bouncycastle/math/ec/GLVMultiplier.java
index 4a6b2343..09b83668 100644
--- a/core/src/main/java/org/bouncycastle/math/ec/GLVMultiplier.java
+++ b/core/src/main/java/org/bouncycastle/math/ec/GLVMultiplier.java
@@ -2,6 +2,8 @@ package org.bouncycastle.math.ec;
 
 import java.math.BigInteger;
 
+import org.bouncycastle.math.ec.endo.GLVEndomorphism;
+
 public class GLVMultiplier extends AbstractECMultiplier
 {
     protected final ECCurve curve;
diff --git a/core/src/main/java/org/bouncycastle/math/ec/endo/ECEndomorphism.java b/core/src/main/java/org/bouncycastle/math/ec/endo/ECEndomorphism.java
new file mode 100644
index 00000000..2be0c01d
--- /dev/null
+++ b/core/src/main/java/org/bouncycastle/math/ec/endo/ECEndomorphism.java
@@ -0,0 +1,10 @@
+package org.bouncycastle.math.ec.endo;
+
+import org.bouncycastle.math.ec.ECPointMap;
+
+public interface ECEndomorphism
+{
+    ECPointMap getPointMap();
+
+    boolean hasEfficientPointMap();
+}
diff --git a/core/src/main/java/org/bouncycastle/math/ec/endo/GLVEndomorphism.java b/core/src/main/java/org/bouncycastle/math/ec/endo/GLVEndomorphism.java
new file mode 100644
index 00000000..8897bb38
--- /dev/null
+++ b/core/src/main/java/org/bouncycastle/math/ec/endo/GLVEndomorphism.java
@@ -0,0 +1,8 @@
+package org.bouncycastle.math.ec.endo;
+
+import java.math.BigInteger;
+
+public interface GLVEndomorphism extends ECEndomorphism
+{
+    BigInteger[] decomposeScalar(BigInteger k);
+}
diff --git a/core/src/main/java/org/bouncycastle/math/ec/endo/GLVTypeBEndomorphism.java b/core/src/main/java/org/bouncycastle/math/ec/endo/GLVTypeBEndomorphism.java
index f690e918..ab710d1a 100644
--- a/core/src/main/java/org/bouncycastle/math/ec/endo/GLVTypeBEndomorphism.java
+++ b/core/src/main/java/org/bouncycastle/math/ec/endo/GLVTypeBEndomorphism.java
@@ -5,7 +5,6 @@ import java.math.BigInteger;
 import org.bouncycastle.math.ec.ECConstants;
 import org.bouncycastle.math.ec.ECCurve;
 import org.bouncycastle.math.ec.ECPointMap;
-import org.bouncycastle.math.ec.GLVEndomorphism;
 import org.bouncycastle.math.ec.ScaleXPointMap;
 
 public class GLVTypeBEndomorphism implements GLVEndomorphism
-- 
cgit v1.2.3