diff options
| author | David Hook <dgh@cryptoworkshop.com> | 2014-07-23 14:10:21 +0400 |
|---|---|---|
| committer | David Hook <dgh@cryptoworkshop.com> | 2014-07-23 14:10:21 +0400 |
| commit | e727ea1d39213304eb91c079dcabf56a1c51fa6d (patch) | |
| tree | baff826707ed3ffada397f816b85e60942dccb78 | |
| parent | b8c576988d525f4818d7025afa03971dcf851075 (diff) | |
| parent | f49a49786fb569b2b0e08904e23c50792be4f478 (diff) | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | core/src/main/java/org/bouncycastle/crypto/tls/TlsECCUtils.java | 6 | ||||
| -rw-r--r-- | core/src/main/java/org/bouncycastle/util/Arrays.java | 2 |
2 files changed, 4 insertions, 4 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 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) { |