diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-06-10 12:40:32 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-06-10 12:40:32 -0400 |
| commit | a60d9023c34a2c77b2211bb213b165a0e5bd4439 (patch) | |
| tree | 410d14a5a0d8ba6a13738bb03eb5cd50d0427979 | |
| parent | 95bcd2dc151ba59fe3b9a4ae4725874cf67dc698 (diff) | |
| parent | e870f6285d8c490536f62c6923ad0aca9844079d (diff) | |
| download | tor-a60d9023c34a2c77b2211bb213b165a0e5bd4439.tar.gz tor-a60d9023c34a2c77b2211bb213b165a0e5bd4439.zip | |
Merge remote-tracking branch 'teor/bug16343-master-key-assert'
| -rw-r--r-- | src/common/tortls.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c index 4cfe94e182..98840c15cf 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -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; } |