From 7facdbd66f19f4a87cf2a5a335568c879772d92f Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 28 Sep 2016 13:33:41 +0100 Subject: [PATCH] Fix a bug in the construction of the ClienHello SRTP extension Reviewed-by: Rich Salz --- ssl/t1_lib.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index 501bf24fb1..230fe66da4 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -1302,7 +1302,7 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al) } #ifndef OPENSSL_NO_SRTP if (SSL_IS_DTLS(s) && SSL_get_srtp_profiles(s)) { - STACK_OF(SRTP_PROTECTION_PROFILE) *clnt = 0; + STACK_OF(SRTP_PROTECTION_PROFILE) *clnt = SSL_get_srtp_profiles(s); SRTP_PROTECTION_PROFILE *prof; int i, ct; @@ -1322,7 +1322,10 @@ int ssl_add_clienthello_tlsext(SSL *s, WPACKET *pkt, int *al) return 0; } } - if (!WPACKET_close(pkt) || !WPACKET_close(pkt)) { + if (!WPACKET_close(pkt) + /* Add an empty use_mki value */ + || !WPACKET_put_bytes_u8(pkt, 0) + || !WPACKET_close(pkt)) { SSLerr(SSL_F_SSL_ADD_CLIENTHELLO_TLSEXT, ERR_R_INTERNAL_ERROR); return 0; } -- 2.40.0