diff options
| author | David Hook <dgh@cryptoworkshop.com> | 2013-11-15 10:53:03 +0400 |
|---|---|---|
| committer | David Hook <dgh@cryptoworkshop.com> | 2013-11-15 10:53:03 +0400 |
| commit | 3e7f55745c18119e852bd31ce491c28f53c3387b (patch) | |
| tree | 50ef09bab8d82938d2402d429b850ac4c328cc2b /core/src | |
| parent | 854c6c4445d43a87d3cd173dbf0f704e786a7a5c (diff) | |
added normalization
Diffstat (limited to 'core/src')
5 files changed, 5 insertions, 6 deletions
diff --git a/core/src/main/java/org/bouncycastle/crypto/ec/ECElGamalDecryptor.java b/core/src/main/java/org/bouncycastle/crypto/ec/ECElGamalDecryptor.java index c8c548ec..19c0beb7 100644 --- a/core/src/main/java/org/bouncycastle/crypto/ec/ECElGamalDecryptor.java +++ b/core/src/main/java/org/bouncycastle/crypto/ec/ECElGamalDecryptor.java @@ -43,6 +43,6 @@ public class ECElGamalDecryptor ECPoint tmp = pair.getX().multiply(key.getD()); - return pair.getY().add(tmp.negate()); + return pair.getY().add(tmp.negate()).normalize(); } } diff --git a/core/src/main/java/org/bouncycastle/crypto/ec/ECElGamalEncryptor.java b/core/src/main/java/org/bouncycastle/crypto/ec/ECElGamalEncryptor.java index e5569a8d..2a0b78db 100644 --- a/core/src/main/java/org/bouncycastle/crypto/ec/ECElGamalEncryptor.java +++ b/core/src/main/java/org/bouncycastle/crypto/ec/ECElGamalEncryptor.java @@ -6,7 +6,6 @@ import java.security.SecureRandom; import org.bouncycastle.crypto.CipherParameters; import org.bouncycastle.crypto.params.ECPublicKeyParameters; import org.bouncycastle.crypto.params.ParametersWithRandom; -import org.bouncycastle.math.ec.ECConstants; import org.bouncycastle.math.ec.ECPoint; /** @@ -69,6 +68,6 @@ public class ECElGamalEncryptor ECPoint gamma = g.multiply(k); ECPoint phi = key.getQ().multiply(k).add(point); - return new ECPair(gamma, phi); + return new ECPair(gamma.normalize(), phi.normalize()); } } diff --git a/core/src/main/java/org/bouncycastle/crypto/ec/ECFixedTransform.java b/core/src/main/java/org/bouncycastle/crypto/ec/ECFixedTransform.java index 3df04910..e35e077c 100644 --- a/core/src/main/java/org/bouncycastle/crypto/ec/ECFixedTransform.java +++ b/core/src/main/java/org/bouncycastle/crypto/ec/ECFixedTransform.java @@ -56,7 +56,7 @@ public class ECFixedTransform ECPoint gamma = g.multiply(k); ECPoint phi = key.getQ().multiply(k).add(cipherText.getY()); - return new ECPair(cipherText.getX().add(gamma), phi); + return new ECPair(cipherText.getX().add(gamma).normalize(), phi.normalize()); } /** diff --git a/core/src/main/java/org/bouncycastle/crypto/ec/ECNewPublicKeyTransform.java b/core/src/main/java/org/bouncycastle/crypto/ec/ECNewPublicKeyTransform.java index 32ba0706..74016c18 100644 --- a/core/src/main/java/org/bouncycastle/crypto/ec/ECNewPublicKeyTransform.java +++ b/core/src/main/java/org/bouncycastle/crypto/ec/ECNewPublicKeyTransform.java @@ -69,6 +69,6 @@ public class ECNewPublicKeyTransform ECPoint gamma = g.multiply(k); ECPoint phi = key.getQ().multiply(k).add(cipherText.getY()); - return new ECPair(gamma, phi); + return new ECPair(gamma.normalize(), phi.normalize()); } } diff --git a/core/src/main/java/org/bouncycastle/crypto/ec/ECNewRandomnessTransform.java b/core/src/main/java/org/bouncycastle/crypto/ec/ECNewRandomnessTransform.java index bce8f8c3..b293759a 100644 --- a/core/src/main/java/org/bouncycastle/crypto/ec/ECNewRandomnessTransform.java +++ b/core/src/main/java/org/bouncycastle/crypto/ec/ECNewRandomnessTransform.java @@ -75,7 +75,7 @@ public class ECNewRandomnessTransform lastK = k; - return new ECPair(cipherText.getX().add(gamma), phi); + return new ECPair(cipherText.getX().add(gamma).normalize(), phi.normalize()); } /** |