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/nodelist | |
| 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/nodelist')
| -rw-r--r-- | src/feature/nodelist/parsecommon.c | 2 | ||||
| -rw-r--r-- | src/feature/nodelist/torcert.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/feature/nodelist/parsecommon.c b/src/feature/nodelist/parsecommon.c index 3aaf8ac501..e05657aca0 100644 --- a/src/feature/nodelist/parsecommon.c +++ b/src/feature/nodelist/parsecommon.c @@ -14,7 +14,7 @@ #include "lib/string/util_string.h" #include "lib/string/printf.h" #include "lib/memarea/memarea.h" -#include "lib/crypt_ops/crypto.h" +#include "lib/crypt_ops/crypto_rsa.h" #include <string.h> diff --git a/src/feature/nodelist/torcert.c b/src/feature/nodelist/torcert.c index a276082021..fe67e56403 100644 --- a/src/feature/nodelist/torcert.c +++ b/src/feature/nodelist/torcert.c @@ -33,6 +33,7 @@ #include "lib/log/log.h" #include "trunnel/link_handshake.h" #include "lib/tls/tortls.h" +#include "lib/tls/x509.h" #include "core/or/or_handshake_certs_st.h" |