aboutsummaryrefslogtreecommitdiffstats
path: root/ssl/t1_lib.c
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2015-06-12 16:33:55 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2015-06-12 16:33:55 +0000
commit15533bcc3525a52ecfe00631bc36167d65c6b187 (patch)
tree68067a8cb2fa4cbe2fcc27f062dc580d6ab1bc33 /ssl/t1_lib.c
parenta9745f9a849725cad34f84351bed202839aade59 (diff)
downloadsrc-15533bcc3525a52ecfe00631bc36167d65c6b187.tar.gz
src-15533bcc3525a52ecfe00631bc36167d65c6b187.zip
Import OpenSSL 1.0.1o.vendor/openssl/1.0.1o
Notes
Notes: svn path=/vendor-crypto/openssl/dist/; revision=284327 svn path=/vendor-crypto/openssl/1.0.1o/; revision=284328; tag=vendor/openssl/1.0.1o
Diffstat (limited to 'ssl/t1_lib.c')
-rw-r--r--ssl/t1_lib.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index c2d7d720712a..d70b93feadf0 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -1016,12 +1016,12 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d,
s->srtp_profile = NULL;
- if (data >= (d + n - 2)) {
- if (data != d + n)
- goto err;
- else
- goto ri_check;
- }
+ if (data == d + n)
+ goto ri_check;
+
+ if (data > (d + n - 2))
+ goto err;
+
n2s(data, len);
if (data > (d + n - len))