r11976@catbus: nickm | 2007-02-27 19:35:59 -0500

 Add some missing (redundant but helpful in most cases) static declarations, and remove a function nobody was calling.

svn:r9672

diff --git a/src/common/aes.c b/src/common/aes.c
index 2e84a58d4fbe04509b341ac7d37bef0c694f8101..0b87f44155d5e808a002ce773c98b8af5c8919cb 100644 (file)
--- a/src/common/aes.c
+++ b/src/common/aes.c
@@ -689,7 +689,7 @@ static const u32 rcon[] = {
  *
  * @return      the number of rounds for the given cipher key size.
  */
-int
+static int
 rijndaelKeySetupEnc(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits)
 {
         int i = 0;
@@ -773,10 +773,10 @@ rijndaelKeySetupEnc(u32 rk[/*4*(Nr + 1)*/], const u8 cipherKey[], int keyBits)
 }
 
 #ifdef USE_RIJNDAEL_COUNTER_OPTIMIZATION
-void
+static void
 rijndaelEncrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, u32 ctr1, u32 ctr0, u8 ct[16])
 #else
-void
+static void
 rijndaelEncrypt(const u32 rk[/*4*(Nr + 1)*/], int Nr, const u8 pt[16], u8 ct[16])
 #endif
 {

diff --git a/src/common/crypto.c b/src/common/crypto.c
index 06a984a81c2a318536dde5b9223b41f7d0c00316..7c5dc14d45d0c0ff5a0f754e526ec26a28c39839 100644 (file)
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -105,7 +105,6 @@ struct crypto_dh_env_t {
 
 /* Prototypes for functions only used by tortls.c */
 crypto_pk_env_t *_crypto_new_pk_env_rsa(RSA *rsa);
-RSA *_crypto_pk_env_get_rsa(crypto_pk_env_t *env);
 EVP_PKEY *_crypto_pk_env_get_evp_pkey(crypto_pk_env_t *env, int private);
 DH *_crypto_dh_env_get_dh(crypto_dh_env_t *dh);
 
@@ -269,13 +268,6 @@ _crypto_new_pk_env_rsa(RSA *rsa)
   return env;
 }
 
-/** used by tortls.c: return the RSA* from a crypto_pk_env_t. */
-RSA *
-_crypto_pk_env_get_rsa(crypto_pk_env_t *env)
-{
-  return env->key;
-}
-
 /** used by tortls.c: get an equivalent EVP_PKEY* for a crypto_pk_env_t.  Iff
  * private is set, include the private-key portion of the key. */
 EVP_PKEY *

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index e45676bf9fa1c5c9c436f6ec03e3a99ef13fc59e..28eeecb4d6f48ab339e9671257737e9c10701a52 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -3047,7 +3047,7 @@ add_trusted_dir_server(const char *nickname, const char *address,
 }
 
 /** Free storage held in <b>ds</b> */
-void
+static void
 trusted_dir_server_free(trusted_dir_server_t *ds)
 {
   tor_free(ds->nickname);