From 4cae61d422d16b90149884f7e73bd0fda0f9cb95 Mon Sep 17 00:00:00 2001
From: Peter Dettman <peter.dettman@bouncycastle.org>
Date: Mon, 16 Sep 2013 14:11:00 +0700
Subject: [PATCH] Check dhParameters is set before using

---
 .../java/org/bouncycastle/crypto/tls/TlsPSKKeyExchange.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/src/main/java/org/bouncycastle/crypto/tls/TlsPSKKeyExchange.java b/core/src/main/java/org/bouncycastle/crypto/tls/TlsPSKKeyExchange.java
index 49566d081d..7217bac6a3 100644
--- 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);
         }