From 99dd396dcc9dca8440ac1ae30510a209de36a7e2 Mon Sep 17 00:00:00 2001 From: Peter Dettman Date: Wed, 23 Jul 2014 16:26:29 +0700 Subject: Fix argument type --- core/src/main/java/org/bouncycastle/util/Arrays.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/org/bouncycastle/util/Arrays.java b/core/src/main/java/org/bouncycastle/util/Arrays.java index 3de0f7a2..64ce17c1 100644 --- a/core/src/main/java/org/bouncycastle/util/Arrays.java +++ b/core/src/main/java/org/bouncycastle/util/Arrays.java @@ -923,7 +923,7 @@ public final class Arrays return result; } - public static short[] prepend(short[] a, byte b) + public static short[] prepend(short[] a, short b) { if (a == null) { -- cgit v1.2.3 From f49a49786fb569b2b0e08904e23c50792be4f478 Mon Sep 17 00:00:00 2001 From: Peter Dettman Date: Wed, 23 Jul 2014 16:26:48 +0700 Subject: Remove unnecessary static references --- core/src/main/java/org/bouncycastle/crypto/tls/TlsECCUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/org/bouncycastle/crypto/tls/TlsECCUtils.java b/core/src/main/java/org/bouncycastle/crypto/tls/TlsECCUtils.java index a045fdbb..e9f96f06 100644 --- a/core/src/main/java/org/bouncycastle/crypto/tls/TlsECCUtils.java +++ b/core/src/main/java/org/bouncycastle/crypto/tls/TlsECCUtils.java @@ -460,7 +460,7 @@ public class TlsECCUtils public static ECPrivateKeyParameters generateEphemeralClientKeyExchange(SecureRandom random, short[] ecPointFormats, ECDomainParameters ecParams, OutputStream output) throws IOException { - AsymmetricCipherKeyPair kp = TlsECCUtils.generateECKeyPair(random, ecParams); + AsymmetricCipherKeyPair kp = generateECKeyPair(random, ecParams); ECPublicKeyParameters ecPublicKey = (ECPublicKeyParameters) kp.getPublic(); writeECPoint(ecPointFormats, ecPublicKey.getQ(), output); @@ -569,7 +569,7 @@ public class TlsECCUtils checkNamedCurve(namedCurves, namedCurve); - return TlsECCUtils.getParametersForNamedCurve(namedCurve); + return getParametersForNamedCurve(namedCurve); } default: throw new TlsFatalAlert(AlertDescription.illegal_parameter); @@ -668,7 +668,7 @@ public class TlsECCUtils public static void writeECPoint(short[] ecPointFormats, ECPoint point, OutputStream output) throws IOException { - TlsUtils.writeOpaque8(TlsECCUtils.serializeECPoint(ecPointFormats, point), output); + TlsUtils.writeOpaque8(serializeECPoint(ecPointFormats, point), output); } public static void writeNamedECParameters(int namedCurve, OutputStream output) throws IOException -- cgit v1.2.3