diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-06-06 11:34:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-06-06 11:34:01 -0400 |
| commit | 9390ec043b101b765b505cd920453de58a35a8f1 (patch) | |
| tree | aa249ed2d6f2e2cb26167802cafdb98e7d2c9db8 | |
| parent | 2d26802524135a21df8494694005e759baa66a1e (diff) | |
| parent | 68c3df69dec4b2b9b5276f7cc9f86ef4167fc705 (diff) | |
| download | tor-9390ec043b101b765b505cd920453de58a35a8f1.tar.gz tor-9390ec043b101b765b505cd920453de58a35a8f1.zip | |
Merge branch 'maint-0.3.0' into release-0.3.0
| -rw-r--r-- | src/or/routerkeys.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index f69c0f1376..aa7aee4b02 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -997,12 +997,11 @@ generate_ed_link_cert(const or_options_t *options, time_t now, const tor_x509_cert_t *link_ = NULL, *id = NULL; tor_cert_t *link_cert = NULL; - if (!server_mode(options)) { - /* No need to make an Ed25519->Link cert: we are a client */ - return 0; - } - if (tor_tls_get_my_certs(1, &link_, &id) < 0 || link_ == NULL) { + if (!server_mode(options)) { + /* No need to make an Ed25519->Link cert: we are a client */ + return 0; + } log_warn(LD_OR, "Can't get my x509 link cert."); return -1; } |