diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-05-30 06:23:44 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-05-30 06:23:44 +0000 |
| commit | 1bf0f99b66569d5ac818acf4c60bf404c61edca7 (patch) | |
| tree | 4d2bbf6fb8fe21e66d60f7323f85f4bdc56f7b54 | |
| parent | 9000a5aff1a08085593378ea3ac2e8b6eccec252 (diff) | |
| download | tor-1bf0f99b66569d5ac818acf4c60bf404c61edca7.tar.gz tor-1bf0f99b66569d5ac818acf4c60bf404c61edca7.zip | |
connection_t kept the identity_pkey but all it did was store it and
free it. perhaps we don't need it after all?
svn:r6518
| -rw-r--r-- | src/or/connection.c | 2 | ||||
| -rw-r--r-- | src/or/connection_or.c | 1 | ||||
| -rw-r--r-- | src/or/or.h | 5 |
3 files changed, 2 insertions, 6 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 3135c61584..59685e482c 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -224,8 +224,6 @@ _connection_free(connection_t *conn) } } - if (conn->identity_pkey) - crypto_free_pk_env(conn->identity_pkey); tor_free(conn->nickname); tor_free(conn->socks_request); tor_free(conn->incoming_cmd); diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 946cefbb29..08006e914d 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -319,7 +319,6 @@ connection_or_init_conn_from_router(connection_t *conn, routerinfo_t *router) conn->addr = router->addr; conn->port = router->or_port; conn->receiver_bucket = conn->bandwidth = (int)options->BandwidthBurst; - conn->identity_pkey = crypto_pk_dup_key(router->identity_pkey); connection_or_set_identity_digest(conn, router->cache_info.identity_digest); conn->nickname = tor_strdup(router->nickname); tor_free(conn->address); diff --git a/src/or/or.h b/src/or/or.h index 6201e825ec..9e0200752e 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -652,9 +652,8 @@ struct connection_t { char *address; /**< FQDN (or IP) of the guy on the other end. * strdup into this, because free_connection frees it. */ - crypto_pk_env_t *identity_pkey; /**< Public RSA key for the other side's - * signing key. */ - char identity_digest[DIGEST_LEN]; /**< Hash of identity_pkey */ + char identity_digest[DIGEST_LEN]; /**< Hash of the public RSA key for + * the other side's signing key. */ char *nickname; /**< Nickname of OR on other side (if any). */ /** Nickname of planned exit node -- used with .exit support. */ |