diff options
author | Peter Dettman <peter.dettman@bouncycastle.org> | 2013-06-18 13:23:42 +0400 |
---|---|---|
committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2013-06-18 13:23:42 +0400 |
commit | 1190848be88884358ae50d46c6266ce680492688 (patch) | |
tree | 1cda862732dd59218c367a02232360efc949099f /core/src/main/java/org/bouncycastle/crypto/tls/TlsDHEKeyExchange.java | |
parent | 0c04e0d702ed4afc3f3428f44fb833eeef3cf7d7 (diff) |
More work on server-side DHE key exchange
Diffstat (limited to 'core/src/main/java/org/bouncycastle/crypto/tls/TlsDHEKeyExchange.java')
-rw-r--r-- | core/src/main/java/org/bouncycastle/crypto/tls/TlsDHEKeyExchange.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/src/main/java/org/bouncycastle/crypto/tls/TlsDHEKeyExchange.java b/core/src/main/java/org/bouncycastle/crypto/tls/TlsDHEKeyExchange.java index 57376592..ed654730 100644 --- a/core/src/main/java/org/bouncycastle/crypto/tls/TlsDHEKeyExchange.java +++ b/core/src/main/java/org/bouncycastle/crypto/tls/TlsDHEKeyExchange.java @@ -13,12 +13,12 @@ import org.bouncycastle.crypto.generators.DHKeyPairGenerator; import org.bouncycastle.crypto.io.SignerInputStream; import org.bouncycastle.crypto.params.DHKeyGenerationParameters; import org.bouncycastle.crypto.params.DHParameters; +import org.bouncycastle.crypto.params.DHPrivateKeyParameters; import org.bouncycastle.crypto.params.DHPublicKeyParameters; public class TlsDHEKeyExchange extends TlsDHKeyExchange { - protected TlsSignerCredentials serverCredentials = null; public TlsDHEKeyExchange(int keyExchange, Vector supportedSignatureAlgorithms, DHParameters dhParameters) @@ -29,7 +29,6 @@ public class TlsDHEKeyExchange public void processServerCredentials(TlsCredentials serverCredentials) throws IOException { - if (!(serverCredentials instanceof TlsSignerCredentials)) { throw new TlsFatalAlert(AlertDescription.internal_error); @@ -43,7 +42,6 @@ public class TlsDHEKeyExchange public byte[] generateServerKeyExchange() throws IOException { - if (this.dhParameters == null) { throw new TlsFatalAlert(AlertDescription.internal_error); @@ -54,6 +52,7 @@ public class TlsDHEKeyExchange DHKeyPairGenerator kpg = new DHKeyPairGenerator(); kpg.init(new DHKeyGenerationParameters(context.getSecureRandom(), this.dhParameters)); AsymmetricCipherKeyPair kp = kpg.generateKeyPair(); + this.dhAgreeServerPrivateKey = (DHPrivateKeyParameters)kp.getPrivate(); BigInteger Ys = ((DHPublicKeyParameters)kp.getPublic()).getY(); @@ -84,7 +83,6 @@ public class TlsDHEKeyExchange public void processServerKeyExchange(InputStream input) throws IOException { - SecurityParameters securityParameters = context.getSecurityParameters(); Signer signer = initVerifyer(tlsSigner, securityParameters); |