commit 1f10d9c8e12965f7bfbe3f2054135b0788be608d
author David Benjamin <davidben@chromium.org> Sat Nov 08 11:41:14 2014 -0500
committer Adam Langley <agl@google.com> Mon Nov 10 23:02:11 2014 +0000
tree c46a5cdadb9ee6b0b5ce5124d3a1ea1f5b978d92
parent 1df112448b41c3568477f3fcd3b8fc820ce80066

Remove redundant PSK length check.

If psk_len were 0, it would already have been an error earlier. The PSK cipher
suites don't lose the other_secret || psk construction if the PSK happens to be
empty.

Change-Id: I1917236720d0862658562bc8f014cb827ee9aed5
Reviewed-on: https://boringssl-review.googlesource.com/2233
Reviewed-by: Adam Langley <agl@google.com>

ssl/s3_clnt.c

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 54dbbd7..adbc683 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -2184,7 +2184,7 @@
 
 		/* For a PSK cipher suite, other_secret is combined
 		 * with the pre-shared key. */
-		if ((alg_a & SSL_aPSK) && psk_len != 0)
+		if (alg_a & SSL_aPSK)
 			{
 			CBB cbb, child;
 			uint8_t *new_pms;