Check dhParameters is set before using

ecsec · Sep 16, 2013 · 4cae61d · 4cae61d
1 parent 7a452ef
commit 4cae61d
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/core/src/main/java/org/bouncycastle/crypto/tls/TlsPSKKeyExchange.java b/core/src/main/java/org/bouncycastle/crypto/tls/TlsPSKKeyExchange.java
@@ -104,6 +104,11 @@ public byte[] generateServerKeyExchange() throws IOException
 
         if (this.keyExchange == KeyExchangeAlgorithm.DHE_PSK)
         {
+            if (this.dhParameters == null)
+            {
+                throw new TlsFatalAlert(AlertDescription.internal_error);
+            }
+
             this.dhAgreePrivateKey = TlsDHUtils.generateEphemeralServerKeyExchange(context.getSecureRandom(),
                 this.dhParameters, buf);
         }