nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

crypto: Alphabetise some #includes in /src/common/crypto*.

Browse Source 
* FIXES part of #24658: https://bugs.torproject.org/24658
This commit is contained in:
Isis Lovecruft 2018-04-06 21:40:17 +00:00
parent 64e6551b8b
commit 88190026b3
No known key found for this signature in database
GPG Key ID: B8938BC5E86C046F
8 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/crypto.c
View File

@ -23,14 +23,14 @@
#endif /* defined(_WIN32) */
#define CRYPTO_PRIVATE
#include "crypto.h"
#include "compat_openssl.h"
#include "crypto.h"
#include "crypto_curve25519.h"
#include "crypto_digest.h"
#include "crypto_ed25519.h"
#include "crypto_format.h"
#include "crypto_rand.h"
#include "crypto_rsa.h"
#include "crypto_digest.h"
#include "crypto_util.h"
DISABLE_GCC_WARNING(redundant-decls)

2
src/common/crypto_curve25519.c
View File

@ -23,8 +23,8 @@
#include "container.h"
#include "crypto.h"
#include "crypto_curve25519.h"
#include "crypto_format.h"
#include "crypto_digest.h"
#include "crypto_format.h"
#include "crypto_rand.h"
#include "crypto_util.h"
#include "util.h"

3
src/common/crypto_ed25519.c
View File

@ -22,9 +22,8 @@
#endif
#include "crypto.h"
#include "crypto_digest.h"
#include "crypto_curve25519.h"
#include "crypto_digest.h"
#include "crypto_ed25519.h"
#include "crypto_format.h"
#include "crypto_rand.h"

2
src/common/crypto_format.c
View File

@ -17,9 +17,9 @@
#include "container.h"
#include "crypto.h"
#include "crypto_curve25519.h"
#include "crypto_digest.h"
#include "crypto_ed25519.h"
#include "crypto_format.h"
#include "crypto_digest.h"
#include "crypto_util.h"
#include "util.h"
#include "util_format.h"

4
src/common/crypto_pwbox.c
View File

@ -9,10 +9,10 @@
*/
#include "crypto.h"
#include "crypto_s2k.h"
#include "crypto_pwbox.h"
#include "crypto_digest.h"
#include "crypto_pwbox.h"
#include "crypto_rand.h"
#include "crypto_s2k.h"
#include "crypto_util.h"
#include "di_ops.h"
#include "util.h"

6
src/common/crypto_rsa.c
View File

@ -9,13 +9,13 @@
* \brief Block of functions related with RSA utilities and operations.
**/
#include "crypto_rsa.h"
#include "crypto.h"
#include "compat_openssl.h"
#include "crypto_curve25519.h"
#include "crypto_format.h"
#include "crypto_digest.h"
#include "crypto_format.h"
#include "compat_openssl.h"
#include "crypto_rand.h"
#include "crypto_rsa.h"
#include "crypto_util.h"
DISABLE_GCC_WARNING(redundant-decls)

6
src/common/crypto_s2k.c
View File

@ -12,13 +12,13 @@
#define CRYPTO_S2K_PRIVATE
#include "crypto.h"
#include "util.h"
#include "compat.h"
#include "crypto_s2k.h"
#include "crypto.h"
#include "crypto_digest.h"
#include "crypto_rand.h"
#include "crypto_s2k.h"
#include "crypto_util.h"
#include "util.h"
#include <openssl/evp.h>

6
src/common/include.am
View File

@ -115,12 +115,12 @@ LIBOR_CRYPTO_A_SRC = \
src/common/compress_zstd.c \
src/common/crypto.c \
src/common/crypto_digest.c \
src/common/crypto_rsa.c \
src/common/crypto_format.c \
src/common/crypto_openssl_mgt.c \
src/common/crypto_pwbox.c \
src/common/crypto_rand.c \
src/common/crypto_rsa.c \
src/common/crypto_s2k.c \
src/common/crypto_format.c \
src/common/crypto_util.c \
src/common/tortls.c \
src/common/crypto_curve25519.c \
@ -173,9 +173,9 @@ COMMONHEADERS = \
src/common/crypto_ed25519.h \
src/common/crypto_format.h \
src/common/crypto_openssl_mgt.h \
src/common/crypto_rsa.h \
src/common/crypto_pwbox.h \
src/common/crypto_rand.h \
src/common/crypto_rsa.h \
src/common/crypto_s2k.h \
src/common/crypto_util.h \
src/common/di_ops.h \