diff options
| author | jkim <jkim@FreeBSD.org> | 2015-06-12 17:10:19 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2015-06-12 17:10:19 +0000 |
| commit | 11074f6b1e6b24bcac4e18463aedabbe359b370b (patch) | |
| tree | c0577c1c6d2f6563e1e25655fecedee7cfb8feb0 /crypto/openssl/ssl | |
| parent | c51db5833881d75f8efb47db219de90e6fa4fc7c (diff) | |
| download | FreeBSD-src-11074f6b1e6b24bcac4e18463aedabbe359b370b.zip FreeBSD-src-11074f6b1e6b24bcac4e18463aedabbe359b370b.tar.gz | |
MFC: r284329
Merge OpenSSL 1.0.1o.
Note it is instantly merged because it restores ABI compatibility broken by
the previous OpenSSL 1.0.1n.
Relnotes: yes
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)) |
