diff options
| author | jkim <jkim@FreeBSD.org> | 2015-06-12 16:48:26 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2015-06-12 16:48:26 +0000 |
| commit | 810d2d455b06365f1b2e6b80f884f09866661a2c (patch) | |
| tree | 30afbd4ee9c4cc81ca58529f47aa416d46fba9eb /crypto/openssl/ssl | |
| parent | 9532b4863e03e26ef6172a50a91dcf19783a687f (diff) | |
| download | FreeBSD-src-810d2d455b06365f1b2e6b80f884f09866661a2c.zip FreeBSD-src-810d2d455b06365f1b2e6b80f884f09866661a2c.tar.gz | |
Merge OpenSSL 1.0.1o.
Diffstat (limited to 'crypto/openssl/ssl')
| -rw-r--r-- | crypto/openssl/ssl/t1_lib.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crypto/openssl/ssl/t1_lib.c b/crypto/openssl/ssl/t1_lib.c index c2d7d72..d70b93f 100644 --- a/crypto/openssl/ssl/t1_lib.c +++ b/crypto/openssl/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)) |
