diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-11-08 16:48:04 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-11-08 16:48:04 -0500 |
| commit | 81deddb08c6b8bf644f663dcdc31720e365f68dc (patch) | |
| tree | 9e67efdfb4451dcc169727dc0e64f8f5bfca95b8 /src/common/tortls.c | |
| parent | 9f3f5372b880b3372fd7b9fc98bd3d78f969390a (diff) | |
| parent | 9ad4776e6150a29fdfff607721599eb04c6e76d7 (diff) | |
| download | tor-81deddb08c6b8bf644f663dcdc31720e365f68dc.tar.gz tor-81deddb08c6b8bf644f663dcdc31720e365f68dc.zip | |
Merge remote-tracking branch 'origin/maint-0.2.3'
Conflicts:
src/common/crypto.c
src/or/rendservice.c
Diffstat (limited to 'src/common/tortls.c')
| -rw-r--r-- | src/common/tortls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c index d4f02d3d38..76924b3177 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -713,7 +713,7 @@ tor_cert_free(tor_cert_t *cert) if (cert->cert) X509_free(cert->cert); tor_free(cert->encoded); - memset(cert, 0x03, sizeof(*cert)); + memwipe(cert, 0x03, sizeof(*cert)); tor_free(cert); } @@ -2450,7 +2450,7 @@ tor_tls_get_tlssecrets(tor_tls_t *tls, uint8_t *secrets_out) (char*)tls->ssl->session->master_key, tls->ssl->session->master_key_length, buf, len); - memset(buf, 0, sizeof(buf)); + memwipe(buf, 0, sizeof(buf)); return 0; } |