summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libssl/s3_srvr.c6
-rw-r--r--src/lib/libssl/src/ssl/s3_srvr.c6
2 files changed, 8 insertions, 4 deletions
diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c
index c37cd421dc..cab034d18f 100644
--- a/src/lib/libssl/s3_srvr.c
+++ b/src/lib/libssl/s3_srvr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s3_srvr.c,v 1.64 2014/06/12 15:49:31 deraadt Exp $ */ 1/* $OpenBSD: s3_srvr.c,v 1.65 2014/06/18 04:51:31 miod Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -2960,8 +2960,10 @@ ssl3_send_newsession_ticket(SSL *s)
2960 */ 2960 */
2961 if (!BUF_MEM_grow(s->init_buf, 2961 if (!BUF_MEM_grow(s->init_buf,
2962 26 + EVP_MAX_IV_LENGTH + EVP_MAX_BLOCK_LENGTH + 2962 26 + EVP_MAX_IV_LENGTH + EVP_MAX_BLOCK_LENGTH +
2963 EVP_MAX_MD_SIZE + slen)) 2963 EVP_MAX_MD_SIZE + slen)) {
2964 free(senc);
2964 return (-1); 2965 return (-1);
2966 }
2965 2967
2966 p = (unsigned char *)s->init_buf->data; 2968 p = (unsigned char *)s->init_buf->data;
2967 /* do the header */ 2969 /* do the header */
diff --git a/src/lib/libssl/src/ssl/s3_srvr.c b/src/lib/libssl/src/ssl/s3_srvr.c
index c37cd421dc..cab034d18f 100644
--- a/src/lib/libssl/src/ssl/s3_srvr.c
+++ b/src/lib/libssl/src/ssl/s3_srvr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s3_srvr.c,v 1.64 2014/06/12 15:49:31 deraadt Exp $ */ 1/* $OpenBSD: s3_srvr.c,v 1.65 2014/06/18 04:51:31 miod Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -2960,8 +2960,10 @@ ssl3_send_newsession_ticket(SSL *s)
2960 */ 2960 */
2961 if (!BUF_MEM_grow(s->init_buf, 2961 if (!BUF_MEM_grow(s->init_buf,
2962 26 + EVP_MAX_IV_LENGTH + EVP_MAX_BLOCK_LENGTH + 2962 26 + EVP_MAX_IV_LENGTH + EVP_MAX_BLOCK_LENGTH +
2963 EVP_MAX_MD_SIZE + slen)) 2963 EVP_MAX_MD_SIZE + slen)) {
2964 free(senc);
2964 return (-1); 2965 return (-1);
2966 }
2965 2967
2966 p = (unsigned char *)s->init_buf->data; 2968 p = (unsigned char *)s->init_buf->data;
2967 /* do the header */ 2969 /* do the header */