nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Finishing touches.

Browse Source 
- Make check-spaces happy.
- Remove a stray header from crypto.h
This commit is contained in:
George Kadianakis 2011-11-25 01:08:31 +01:00
parent 7c37a664c1
commit 1d1d5ae7f8
4 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/crypto.c
View File

@ -1862,7 +1862,7 @@ crypto_store_dynamic_dh_modulus(const char *fname)
fname_status = file_status(fname); fname_status = file_status(fname);
if (fname_status == FN_FILE) { if (fname_status == FN_FILE) {
/* If the fname is a file, then the dynamic DH modulus is already stored. */ /* If the fname is a file, then the dynamic DH modulus is already stored.*/
retval = 0; retval = 0;
goto done; goto done;
} else if (fname_status != FN_NOENT) { } else if (fname_status != FN_NOENT) {
@ -1939,7 +1939,6 @@ crypto_get_stored_dynamic_dh_modulus(const char *fname)
"than '%d' bits.", DH_BYTES*8); "than '%d' bits.", DH_BYTES*8);
goto err; goto err;
} }
} }
{ /* log the dynamic DH modulus: */ { /* log the dynamic DH modulus: */
@ -1965,7 +1964,6 @@ crypto_get_stored_dynamic_dh_modulus(const char *fname)
return dynamic_dh_modulus; return dynamic_dh_modulus;
} }
/** Set the global TLS Diffie-Hellman modulus. /** Set the global TLS Diffie-Hellman modulus.
* If <b>dynamic_dh_modulus_fname</b> is set, try to read a dynamic DH modulus * If <b>dynamic_dh_modulus_fname</b> is set, try to read a dynamic DH modulus
* off it and use it as the DH modulus. If that's not possible, * off it and use it as the DH modulus. If that's not possible,
@ -2001,12 +1999,12 @@ crypto_set_tls_dh_prime(const char *dynamic_dh_modulus_fname)
* modules/ssl/ssl_engine_dh.c; Apache also uses a generator of 2 with this * modules/ssl/ssl_engine_dh.c; Apache also uses a generator of 2 with this
* prime. * prime.
*/ */
r = BN_hex2bn(&tls_prime, r =BN_hex2bn(&tls_prime,
"D67DE440CBBBDC1936D693D34AFD0AD50C84D239A45F520BB88174CB98" "D67DE440CBBBDC1936D693D34AFD0AD50C84D239A45F520BB88174CB98"
"BCE951849F912E639C72FB13B4B4D7177E16D55AC179BA420B2A29FE324A" "BCE951849F912E639C72FB13B4B4D7177E16D55AC179BA420B2A29FE324A"
"467A635E81FF5901377BEDDCFD33168A461AAD3B72DAE8860078045B07A7" "467A635E81FF5901377BEDDCFD33168A461AAD3B72DAE8860078045B07A7"
"DBCA7874087D1510EA9FCC9DDD330507DD62DB88AEAA747DE0F4D6E2BD68" "DBCA7874087D1510EA9FCC9DDD330507DD62DB88AEAA747DE0F4D6E2BD68"
"B0E7393E0F24218EB3"); "B0E7393E0F24218EB3");
tor_assert(r); tor_assert(r);
} }

2
src/common/crypto.h
View File

@ -16,8 +16,6 @@
#include <stdio.h> #include <stdio.h>
#include "torint.h" #include "torint.h"
#include <openssl/bn.h>
/** Length of the output of our message digest. */ /** Length of the output of our message digest. */
#define DIGEST_LEN 20 #define DIGEST_LEN 20
/** Length of the output of our second (improved) message digests. (For now /** Length of the output of our second (improved) message digests. (For now

2
src/or/or.h
View File

@ -2873,7 +2873,7 @@ typedef struct {
char *Address; /**< OR only: configured address for this onion router. */ char *Address; /**< OR only: configured address for this onion router. */
char *PidFile; /**< Where to store PID of Tor process. */ char *PidFile; /**< Where to store PID of Tor process. */
int DynamicDHGroups; /**< Enable dynamic generation of primes for use in DH. */ int DynamicDHGroups; /**< Dynamic generation of prime moduli for use in DH.*/
routerset_t *ExitNodes; /**< Structure containing nicknames, digests, routerset_t *ExitNodes; /**< Structure containing nicknames, digests,
* country codes and IP address patterns of ORs to * country codes and IP address patterns of ORs to

1
src/or/router.h
View File

@ -28,7 +28,6 @@ void dup_onion_keys(crypto_pk_env_t **key, crypto_pk_env_t **last);
void rotate_onion_key(void); void rotate_onion_key(void);
crypto_pk_env_t *init_key_from_file(const char *fname, int generate, crypto_pk_env_t *init_key_from_file(const char *fname, int generate,
int severity); int severity);
void v3_authority_check_key_expiry(void); void v3_authority_check_key_expiry(void);
int init_keys(void); int init_keys(void);