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
This commit is contained in:
Nick Mathewson 2007-02-28 00:36:03 +00:00
parent 1a3e1c5510
commit d6368fd075
3 changed files with 4 additions and 12 deletions

View File

@ -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
{

View File

@ -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 *

View File

@ -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);