diff options
| author | Ben Laurie <ben@links.org> | 2014-04-23 18:13:20 +0100 |
|---|---|---|
| committer | Ben Laurie <ben@links.org> | 2014-07-02 00:11:10 +0100 |
| commit | 22a10c89d7c3f951339c385d57cc8fd23c0a800b (patch) | |
| tree | 85d178342cb7610a2660e2fe971a5bfeb0d80c9e /ssl/ssl_locl.h | |
| parent | e67ddd19af4f3e987a3c97de3c9baf436fd40ad1 (diff) | |
| download | openssl-new-22a10c89d7c3f951339c385d57cc8fd23c0a800b.tar.gz | |
Fix possible buffer overrun.
(cherry picked from commit 2db3ea29298bdc347f15fbfab6d5746022f05101)
Conflicts:
ssl/t1_lib.c
Diffstat (limited to 'ssl/ssl_locl.h')
| -rw-r--r-- | ssl/ssl_locl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 261ba0d7b8..0b48c735ae 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -1284,8 +1284,8 @@ int tls1_shared_list(SSL *s, const unsigned char *l1, size_t l1len, const unsigned char *l2, size_t l2len, int nmatch); -unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned char *limit, int *al); -unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned char *limit, int *al); +unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *buf, unsigned char *limit, int *al); +unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *buf, unsigned char *limit, int *al); int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **data, unsigned char *d, int n); int ssl_check_clienthello_tlsext_late(SSL *s); int ssl_parse_serverhello_tlsext(SSL *s, unsigned char **data, unsigned char *d, int n); |