summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Thomson <martin.thomson@gmail.com>2015-03-09 12:09:01 -0700
committerMartin Thomson <martin.thomson@gmail.com>2015-03-09 12:09:01 -0700
commit1c0828f2e39680dda95183144fe33124df06e2ca (patch)
treec51238031d643f2212c84dbdff9b688764490797
parentb6f405eacc2c7c3803b93723f428b5bb22312c3d (diff)
downloadnss-hg-1c0828f2e39680dda95183144fe33124df06e2ca.tar.gz
Bug 753136 - Fixing ssl3_HandleSupportedPointFormatsXtn, r=ekr
-rw-r--r--lib/ssl/ssl3ecc.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/ssl/ssl3ecc.c b/lib/ssl/ssl3ecc.c
index a6ff782f9..aca2b74d4 100644
--- a/lib/ssl/ssl3ecc.c
+++ b/lib/ssl/ssl3ecc.c
@@ -1185,8 +1185,7 @@ ssl3_HandleSupportedPointFormatsXtn(sslSocket *ss, PRUint16 ex_type,
if (data->len < 2 || data->len > 255 || !data->data ||
data->len != (unsigned int)data->data[0] + 1) {
- /* malformed */
- goto loser;
+ return ssl3_DecodeError(ss);
}
for (i = data->len; --i > 0; ) {
if (data->data[i] == 0) {
@@ -1197,10 +1196,10 @@ ssl3_HandleSupportedPointFormatsXtn(sslSocket *ss, PRUint16 ex_type,
return rv;
}
}
-loser:
+
/* evil client doesn't support uncompressed */
ssl3_DisableECCSuites(ss, ecSuites);
- return SECFailure;
+ return SECSuccess;
}