kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tidy up finish_message logic.

Browse Source 
dtls1_finish_message should NULL *out_msg before calling OPENSSL_free,
rather than asking ssl3_complete_message to do it. ssl3_finish_message
has no need to call it at all.

Change-Id: I22054217073690ab391cd19bf9993b1ceada41fd
Reviewed-on: https://boringssl-review.googlesource.com/12231
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
Reviewed-by: Steven Valdez <svaldez@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
This commit is contained in:
David Benjamin 2016-11-12 14:26:19 +09:00 committed by CQ bot account: commit-bot@chromium.org
parent 5eead165fc
commit ba1660b282
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ssl/d1_both.c
View File

@ -738,6 +738,7 @@ int dtls1_init_message(SSL *ssl, CBB *cbb, CBB *body, uint8_t type) {
int dtls1_finish_message(SSL *ssl, CBB *cbb, uint8_t **out_msg, int dtls1_finish_message(SSL *ssl, CBB *cbb, uint8_t **out_msg,
size_t *out_len) { size_t *out_len) {
*out_msg = NULL;
if (!CBB_finish(cbb, out_msg, out_len) || if (!CBB_finish(cbb, out_msg, out_len) ||
*out_len < DTLS1_HM_HEADER_LENGTH) { *out_len < DTLS1_HM_HEADER_LENGTH) {
OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR); OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);

4
ssl/s3_both.c
View File

@ -209,9 +209,9 @@ int ssl3_finish_message(SSL *ssl, CBB *cbb, uint8_t **out_msg,
size_t *out_len) { size_t *out_len) {
if (!CBB_finish(cbb, out_msg, out_len)) { if (!CBB_finish(cbb, out_msg, out_len)) {
OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR); OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);
OPENSSL_free(*out_msg);
return 0; return 0;
} }
return 1; return 1;
} }
@ -231,7 +231,7 @@ int ssl3_queue_message(SSL *ssl, uint8_t *msg, size_t len) {
} }
int ssl_complete_message(SSL *ssl, CBB *cbb) { int ssl_complete_message(SSL *ssl, CBB *cbb) {
uint8_t *msg = NULL; uint8_t *msg;
size_t len; size_t len;
if (!ssl->method->finish_message(ssl, cbb, &msg, &len) || if (!ssl->method->finish_message(ssl, cbb, &msg, &len) ||
!ssl->method->queue_message(ssl, msg, len)) { !ssl->method->queue_message(ssl, msg, len)) {