[or-cvs] connection_t kept the identity_pkey but all it did was stor...

arma at seul.org arma at seul.org
Tue May 30 06:23:46 UTC 2006


Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	connection.c connection_or.c or.h 
Log Message:
connection_t kept the identity_pkey but all it did was store it and
free it. perhaps we don't need it after all?


Index: connection.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/connection.c,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -p -d -r1.450 -r1.451
--- connection.c	3 May 2006 18:29:44 -0000	1.450
+++ connection.c	30 May 2006 06:23:44 -0000	1.451
@@ -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);

Index: connection_or.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/connection_or.c,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -p -d -r1.217 -r1.218
--- connection_or.c	26 May 2006 16:32:16 -0000	1.217
+++ connection_or.c	30 May 2006 06:23:44 -0000	1.218
@@ -319,7 +319,6 @@ connection_or_init_conn_from_router(conn
   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);

Index: or.h
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/or.h,v
retrieving revision 1.832
retrieving revision 1.833
diff -u -p -d -r1.832 -r1.833
--- or.h	30 May 2006 06:19:06 -0000	1.832
+++ or.h	30 May 2006 06:23:44 -0000	1.833
@@ -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. */



More information about the tor-commits mailing list