diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-01-23 14:02:45 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-01-23 14:02:45 -0500 |
| commit | 13a2acba3c951a049f89b2c553e3139008032fe8 (patch) | |
| tree | 884dd76cfab625515a5ad36c1a264b7bca435354 /src/common/include.am | |
| parent | 48a51c5f8b80a359da31bc5aaac8ecd25890fe0d (diff) | |
| parent | f2fca519762cdd37c8559eb95bb8b41973225d38 (diff) | |
| download | tor-13a2acba3c951a049f89b2c553e3139008032fe8.tar.gz tor-13a2acba3c951a049f89b2c553e3139008032fe8.zip | |
Merge remote-tracking branch 'ffmancera/bug24658-openssl'
Diffstat (limited to 'src/common/include.am')
| -rw-r--r-- | src/common/include.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/include.am b/src/common/include.am index 2856c40fdc..b84f6ad817 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -113,6 +113,7 @@ LIBOR_CRYPTO_A_SRC = \ src/common/compress_zlib.c \ src/common/compress_zstd.c \ src/common/crypto.c \ + src/common/crypto_openssl_mgt.c \ src/common/crypto_pwbox.c \ src/common/crypto_s2k.c \ src/common/crypto_format.c \ @@ -164,6 +165,7 @@ COMMONHEADERS = \ src/common/crypto_curve25519.h \ src/common/crypto_ed25519.h \ src/common/crypto_format.h \ + src/common/crypto_openssl_mgt.h \ src/common/crypto_pwbox.h \ src/common/crypto_s2k.h \ src/common/di_ops.h \ |