diff options
| author | David Goulet <dgoulet@torproject.org> | 2019-02-26 11:30:44 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2019-02-26 11:30:44 -0500 |
| commit | b402a0887fc6a0c6426c65491f9559ee13bed341 (patch) | |
| tree | 985d391ae778609d45e221e13af063a753c3c6dd /configure.ac | |
| parent | 2a44ee9b8c75cd8bad01a3b5142a1897edb6f824 (diff) | |
| parent | d3b122485e09302f7befd43bef59e0e8f09142f0 (diff) | |
| download | tor-b402a0887fc6a0c6426c65491f9559ee13bed341.tar.gz tor-b402a0887fc6a0c6426c65491f9559ee13bed341.zip | |
Merge branch 'tor-github/pr/655'
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 6036cdffe5..14147eef77 100644 --- a/configure.ac +++ b/configure.ac @@ -949,21 +949,24 @@ AC_CHECK_MEMBERS([struct ssl_method_st.get_cipher_by_char], , , [#include <openssl/ssl.h> ]) +dnl OpenSSL functions which we might not have. In theory, we could just +dnl check the openssl version number, but in practice that gets pretty +dnl confusing with LibreSSL, OpenSSL, and various distributions' patches +dnl to them. AC_CHECK_FUNCS([ \ ERR_load_KDF_strings \ + EVP_PBE_scrypt \ + EVP_sha3_256 \ + SSL_CIPHER_find \ + SSL_CTX_set1_groups_list \ + SSL_CTX_set_security_level \ SSL_SESSION_get_master_key \ + SSL_get_client_ciphers \ + SSL_get_client_random \ SSL_get_server_random \ - SSL_get_client_ciphers \ - SSL_get_client_random \ - SSL_CTX_set1_groups_list \ - SSL_CIPHER_find \ - SSL_CTX_set_security_level \ - TLS_method + TLS_method \ ]) -dnl Check if OpenSSL has scrypt implementation. -AC_CHECK_FUNCS([ EVP_PBE_scrypt ]) - dnl Check if OpenSSL structures are opaque AC_CHECK_MEMBERS([SSL.state], , , [#include <openssl/ssl.h> @@ -975,6 +978,15 @@ AC_CHECK_SIZEOF(SHA_CTX, , [AC_INCLUDES_DEFAULT() fi # enable_nss +dnl We will someday make KECCAK_TINY optional, but for now we still need +dnl it for SHAKE, since OpenSSL's SHAKE can't be squeezed more than +dnl once. See comment in the definition of crypto_xof_t. + +dnl AM_CONDITIONAL(BUILD_KECCAK_TINY, +dnl test "x$ac_cv_func_EVP_sha3_256" != "xyes") + +AM_CONDITIONAL(BUILD_KECCAK_TINY, true) + dnl ====================================================================== dnl Can we use KIST? |