diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-04 20:21:07 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-04 20:21:07 -0400 |
| commit | 0db5c549571eb0098a3f709ffb25c2e4909ca01d (patch) | |
| tree | 0dbf1fbe9b25ddab292eadca50703f34de4c919e /src/feature/rend | |
| parent | fd994f55c441922d3c5ae19ad5c254a1ae1eccfd (diff) | |
| parent | d644c93ae9373f99d95870c7b752b790f8714201 (diff) | |
| download | tor-0db5c549571eb0098a3f709ffb25c2e4909ca01d.tar.gz tor-0db5c549571eb0098a3f709ffb25c2e4909ca01d.zip | |
Merge branch 'nss_squashed' into nss_merge
Diffstat (limited to 'src/feature/rend')
| -rw-r--r-- | src/feature/rend/rendmid.c | 2 | ||||
| -rw-r--r-- | src/feature/rend/rendservice.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/feature/rend/rendmid.c b/src/feature/rend/rendmid.c index 0fd6516eaa..8ca19a2522 100644 --- a/src/feature/rend/rendmid.c +++ b/src/feature/rend/rendmid.c @@ -12,7 +12,7 @@ #include "core/or/circuitlist.h" #include "core/or/circuituse.h" #include "app/config/config.h" -#include "lib/crypt_ops/crypto.h" +#include "lib/crypt_ops/crypto_cipher.h" #include "core/or/dos.h" #include "core/or/relay.h" #include "feature/rend/rendmid.h" diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c index 1af9117aaf..66a4fb5f4f 100644 --- a/src/feature/rend/rendservice.c +++ b/src/feature/rend/rendservice.c @@ -1652,7 +1652,7 @@ rend_service_load_auth_keys(rend_service_t *s, const char *hfname) crypto_pk_free(prkey); goto err; } - if (crypto_pk_check_key(prkey) <= 0) { + if (! crypto_pk_is_valid_private_key(prkey)) { log_warn(LD_BUG,"Generated client key seems invalid"); crypto_pk_free(prkey); goto err; |