torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'teor/bug16343-master-key-assert'

Browse Source
This commit is contained in:
Nick Mathewson
2015-06-10 12:40:32 -04:00
parent 95bcd2dc15 e870f6285d
commit a60d9023c3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/tortls.c
+2 -1
View File
@@ -2631,10 +2631,11 @@ SSL_get_server_random(SSL *s, uint8_t *out, size_t len)
static size_t
SSL_SESSION_get_master_key(SSL_SESSION *s, uint8_t *out, size_t len)
{
tor_assert(s);
if (len == 0)
return s->master_key_length;
tor_assert(len == (size_t)s->master_key_length);
tor_assert(s->master_key);
tor_assert(out);
memcpy(out, s->master_key, len);
return len;
}