mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 23:21:38 +01:00
Code Issues Projects Releases Wiki Activity

Add a magic field to tor_tls_t to catch exdata corruption bugs, if any appear.

Browse source
This commit is contained in:
Nick Mathewson 2011-03-03 23:41:34 -05:00
parent 4d21fe2870
commit 8ae179deec
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/common/tortls.c
View file

@ -103,10 +103,13 @@ typedef struct tor_tls_context_t {
crypto_pk_env_t *key; crypto_pk_env_t *key;
} tor_tls_context_t; } tor_tls_context_t;
#define TOR_TLS_MAGIC 0x71571571
/** Holds a SSL object and its associated data. Members are only /** Holds a SSL object and its associated data. Members are only
* accessed from within tortls.c. * accessed from within tortls.c.
*/ */
struct tor_tls_t { struct tor_tls_t {
uint32_t magic;
tor_tls_context_t *context; /** A link to the context object for this tls. */ tor_tls_context_t *context; /** A link to the context object for this tls. */
SSL *ssl; /**< An OpenSSL SSL object. */ SSL *ssl; /**< An OpenSSL SSL object. */
int socket; /**< The underlying file descriptor for this TLS connection. */ int socket; /**< The underlying file descriptor for this TLS connection. */
@ -171,7 +174,10 @@ tor_tls_allocate_tor_tls_object_ex_data_index()
static INLINE tor_tls_t * static INLINE tor_tls_t *
tor_tls_get_by_ssl(const SSL *ssl) tor_tls_get_by_ssl(const SSL *ssl)
{ {
return SSL_get_ex_data(ssl, tor_tls_object_ex_data_index); tor_tls_t *result = SSL_get_ex_data(ssl, tor_tls_object_ex_data_index);
if (result)
tor_assert(result->magic == TOR_TLS_MAGIC);
return result;
} }
static void tor_tls_context_decref(tor_tls_context_t *ctx); static void tor_tls_context_decref(tor_tls_context_t *ctx);
@ -918,6 +924,7 @@ tor_tls_server_info_callback(const SSL *ssl, int type, int val)
++tls->server_handshake_count; ++tls->server_handshake_count;
} else { } else {
log_warn(LD_BUG, "Couldn't look up the tls for an SSL*. How odd!"); log_warn(LD_BUG, "Couldn't look up the tls for an SSL*. How odd!");
return;
} }
/* Now check the cipher list. */ /* Now check the cipher list. */
@ -1025,6 +1032,7 @@ tor_tls_new(int sock, int isServer)
tor_tls_t *result = tor_malloc_zero(sizeof(tor_tls_t)); tor_tls_t *result = tor_malloc_zero(sizeof(tor_tls_t));
tor_tls_context_t *context = isServer ? server_tls_context : tor_tls_context_t *context = isServer ? server_tls_context :
client_tls_context; client_tls_context;
result->magic = TOR_TLS_MAGIC;
tor_assert(context); /* make sure somebody made it first */ tor_assert(context); /* make sure somebody made it first */
if (!(result->ssl = SSL_new(context->ctx))) { if (!(result->ssl = SSL_new(context->ctx))) {
@ -1195,6 +1203,7 @@ tor_tls_free(tor_tls_t *tls)
if (tls->context) if (tls->context)
tor_tls_context_decref(tls->context); tor_tls_context_decref(tls->context);
tor_free(tls->address); tor_free(tls->address);
tls->magic = 0x99999999;
tor_free(tls); tor_free(tls);
} }