diff options
| author | Roger Dingledine <arma@torproject.org> | 2013-03-10 16:28:28 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2013-03-10 23:38:18 -0400 |
| commit | 0196647970a91d2bdb052f38b3749dd0e99348e4 (patch) | |
| tree | d0d3d2632d093926d960b267e5322561700a1650 /src/common/tortls.c | |
| parent | edd6f02273c58bfe39a978dd5c7b8765aae0b886 (diff) | |
| download | tor-0196647970a91d2bdb052f38b3749dd0e99348e4.tar.gz tor-0196647970a91d2bdb052f38b3749dd0e99348e4.zip | |
start part-way through the ssl cert lifetime
also, snap the start time and end time to a day boundary, since most
certs in the wild seem to do this.
Diffstat (limited to 'src/common/tortls.c')
| -rw-r--r-- | src/common/tortls.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c index 94cedba24b..a08910b3a2 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -234,7 +234,7 @@ static X509* tor_tls_create_certificate(crypto_pk_t *rsa, crypto_pk_t *rsa_sign, const char *cname, const char *cname_sign, - unsigned int lifetime); + unsigned int cert_lifetime); static int tor_tls_context_init_one(tor_tls_context_t **ppcontext, crypto_pk_t *identity, @@ -608,9 +608,10 @@ tor_x509_name_new(const char *cname) /** Generate and sign an X509 certificate with the public key <b>rsa</b>, * signed by the private key <b>rsa_sign</b>. The commonName of the * certificate will be <b>cname</b>; the commonName of the issuer will be - * <b>cname_sign</b>. The cert will be valid for <b>cert_lifetime</b> seconds - * starting from now. Return a certificate on success, NULL on - * failure. + * <b>cname_sign</b>. The cert will be valid for <b>cert_lifetime</b> + * seconds, starting from some time in the past. + * + * Return a certificate on success, NULL on failure. */ static X509 * tor_tls_create_certificate(crypto_pk_t *rsa, @@ -632,7 +633,12 @@ tor_tls_create_certificate(crypto_pk_t *rsa, tor_tls_init(); - start_time = time(NULL); + /* Make sure we're part-way through the certificate lifetime, rather + * than having it start right now. Don't choose quite uniformly, since + * then we might pick a time where we're about to expire. Lastly, be + * sure to start on a day boundary. */ + start_time = time(NULL) - crypto_rand_int(cert_lifetime) + 2*24*3600; + start_time -= start_time % (24*3600); tor_assert(rsa); tor_assert(cname); |