diff options
| author | Peter Dettman <peter.dettman@bouncycastle.org> | 2016-04-29 17:25:09 +0700 |
|---|---|---|
| committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2016-04-29 17:25:09 +0700 |
| commit | 744747862b6d5f0357eec0ecddc3a51939f91c38 (patch) | |
| tree | f05f6efeb118b291bb9c32d7d4ac3153b219782d /crypto/src/crypto/tls | |
| parent | Fix test class name (diff) | |
| download | BouncyCastle.NET-ed25519-744747862b6d5f0357eec0ecddc3a51939f91c38.tar.xz | |
Update various parameter classes following Java API
Diffstat (limited to '')
| -rw-r--r-- | crypto/src/crypto/tls/TlsDHUtilities.cs | 3 | ||||
| -rw-r--r-- | crypto/src/crypto/tls/TlsEccUtilities.cs | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crypto/src/crypto/tls/TlsDHUtilities.cs b/crypto/src/crypto/tls/TlsDHUtilities.cs index 019d084e3..7a44670fd 100644 --- a/crypto/src/crypto/tls/TlsDHUtilities.cs +++ b/crypto/src/crypto/tls/TlsDHUtilities.cs @@ -391,7 +391,8 @@ namespace Org.BouncyCastle.Crypto.Tls public static bool AreCompatibleParameters(DHParameters a, DHParameters b) { - return a.P.Equals(b.P) && a.G.Equals(b.G); + return a.P.Equals(b.P) && a.G.Equals(b.G) + && (a.Q == null || b.Q == null || a.Q.Equals(b.Q)); } public static byte[] CalculateDHBasicAgreement(DHPublicKeyParameters publicKey, diff --git a/crypto/src/crypto/tls/TlsEccUtilities.cs b/crypto/src/crypto/tls/TlsEccUtilities.cs index 706ebfd3c..a5c8fa910 100644 --- a/crypto/src/crypto/tls/TlsEccUtilities.cs +++ b/crypto/src/crypto/tls/TlsEccUtilities.cs @@ -279,8 +279,7 @@ namespace Org.BouncyCastle.Crypto.Tls public static bool AreOnSameCurve(ECDomainParameters a, ECDomainParameters b) { - // TODO Move to ECDomainParameters.Equals() or other utility method? - return a.Curve.Equals(b.Curve) && a.G.Equals(b.G) && a.N.Equals(b.N) && a.H.Equals(b.H); + return a != null && a.Equals(b); } public static bool IsSupportedNamedCurve(int namedCurve) |