wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

this change will prevent undefined behavior when src and dst are equal (memcpy), effectively allowing setting length only in both functions.

Browse source 
CLA: trivial

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2750)
This commit is contained in:
Roberto Guimaraes 2017-02-26 15:47:40 -08:00 committed by Rich Salz
parent 4f7b76bf0f
commit 6aad939368
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ssl/ssl_sess.c
View file

@ -835,7 +835,8 @@ int SSL_SESSION_set1_id(SSL_SESSION *s, const unsigned char *sid,
return 0;
}
s->session_id_length = sid_len;
memcpy(s->session_id, sid, sid_len);
if (sid != s->session_id)
memcpy(s->session_id, sid, sid_len);
return 1;
}
@ -921,7 +922,8 @@ int SSL_SESSION_set1_id_context(SSL_SESSION *s, const unsigned char *sid_ctx,
return 0;
}
s->sid_ctx_length = sid_ctx_len;
memcpy(s->sid_ctx, sid_ctx, sid_ctx_len);
if (sid_ctx != s->sid_ctx)
memcpy(s->sid_ctx, sid_ctx, sid_ctx_len);
return 1;
}