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

Merge branch 'maint-0.3.0'

Browse Source
This commit is contained in:
Nick Mathewson 2017-06-06 11:34:11 -04:00
commit 9ab45d621c
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/or/routerkeys.c
View File

@ -1001,12 +1001,11 @@ generate_ed_link_cert(const or_options_t *options, time_t now,
const tor_x509_cert_t *link_ = NULL, *id = NULL; const tor_x509_cert_t *link_ = NULL, *id = NULL;
tor_cert_t *link_cert = NULL; tor_cert_t *link_cert = NULL;
if (tor_tls_get_my_certs(1, &link_, &id) < 0 || link_ == NULL) {
if (!server_mode(options)) { if (!server_mode(options)) {
/* No need to make an Ed25519->Link cert: we are a client */ /* No need to make an Ed25519->Link cert: we are a client */
return 0; return 0;
} }
if (tor_tls_get_my_certs(1, &link_, &id) < 0 || link_ == NULL) {
log_warn(LD_OR, "Can't get my x509 link cert."); log_warn(LD_OR, "Can't get my x509 link cert.");
return -1; return -1;
} }