From 1d2dd47d31e776e5a976069147b33d7c34e5b071 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 18 May 2010 00:16:40 +0200 Subject: s3-crypto: only include crypto headers when crypto is done. Guenther --- source3/auth/auth_util.c | 1 + source3/auth/server_info.c | 1 + source3/include/includes.h | 5 ----- source3/libsmb/clirap.c | 1 + source3/libsmb/ntlmssp.c | 3 +++ source3/libsmb/ntlmssp_sign.c | 4 ++++ source3/libsmb/smb_signing.c | 1 + source3/modules/vfs_streams_xattr.c | 1 + source3/rpc_client/cli_samr.c | 1 + source3/rpc_client/init_netlogon.c | 1 + source3/rpc_client/init_samr.c | 2 ++ source3/rpc_server/srv_netlog_nt.c | 1 + source3/rpc_server/srv_samr_nt.c | 1 + source3/smbd/chgpasswd.c | 1 + source3/utils/ntlm_auth.c | 1 + source3/winbindd/winbindd_pam.c | 1 + 16 files changed, 21 insertions(+), 5 deletions(-) diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index 1f83381606..34c8190ee8 100644 --- a/source3/auth/auth_util.c +++ b/source3/auth/auth_util.c @@ -24,6 +24,7 @@ #include "includes.h" #include "smbd/globals.h" #include "../libcli/auth/libcli_auth.h" +#include "../lib/crypto/arcfour.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_AUTH diff --git a/source3/auth/server_info.c b/source3/auth/server_info.c index b968c1dded..767ae5e7b6 100644 --- a/source3/auth/server_info.c +++ b/source3/auth/server_info.c @@ -18,6 +18,7 @@ */ #include "includes.h" +#include "../lib/crypto/arcfour.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_AUTH diff --git a/source3/include/includes.h b/source3/include/includes.h index a6d8d5a565..8746a5c176 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -652,11 +652,6 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx); #include "passdb.h" #include "rpc_secdes.h" #include "msdfs.h" -#include "../lib/crypto/md5.h" -#include "../lib/crypto/md4.h" -#include "../lib/crypto/arcfour.h" -#include "../lib/crypto/crc32.h" -#include "../lib/crypto/hmacmd5.h" struct ntlmssp_state; diff --git a/source3/libsmb/clirap.c b/source3/libsmb/clirap.c index 80e5a41893..be4cc0a8fb 100644 --- a/source3/libsmb/clirap.c +++ b/source3/libsmb/clirap.c @@ -22,6 +22,7 @@ #include "includes.h" #include "../libcli/auth/libcli_auth.h" #include "../librpc/gen_ndr/rap.h" +#include "../lib/crypto/arcfour.h" /**************************************************************************** Call a remote api diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c index 56dd6d9ab7..12955d8d01 100644 --- a/source3/libsmb/ntlmssp.c +++ b/source3/libsmb/ntlmssp.c @@ -26,6 +26,9 @@ #include "../libcli/auth/libcli_auth.h" #include "../librpc/gen_ndr/ndr_ntlmssp.h" #include "../libcli/auth/ntlmssp_ndr.h" +#include "../lib/crypto/md5.h" +#include "../lib/crypto/arcfour.h" +#include "../lib/crypto/hmacmd5.h" static NTSTATUS ntlmssp_client_initial(struct ntlmssp_state *ntlmssp_state, DATA_BLOB reply, DATA_BLOB *next_request); diff --git a/source3/libsmb/ntlmssp_sign.c b/source3/libsmb/ntlmssp_sign.c index 331bf1127a..733998a14e 100644 --- a/source3/libsmb/ntlmssp_sign.c +++ b/source3/libsmb/ntlmssp_sign.c @@ -21,6 +21,10 @@ #include "includes.h" #include "ntlmssp.h" #include "../libcli/auth/libcli_auth.h" +#include "../lib/crypto/md5.h" +#include "../lib/crypto/arcfour.h" +#include "../lib/crypto/hmacmd5.h" +#include "../lib/crypto/crc32.h" #define CLI_SIGN "session key to client-to-server signing key magic constant" #define CLI_SEAL "session key to client-to-server sealing key magic constant" diff --git a/source3/libsmb/smb_signing.c b/source3/libsmb/smb_signing.c index 104cf76160..d4b350f7a4 100644 --- a/source3/libsmb/smb_signing.c +++ b/source3/libsmb/smb_signing.c @@ -20,6 +20,7 @@ */ #include "includes.h" +#include "../lib/crypto/md5.h" /* Used by the SMB signing functions. */ diff --git a/source3/modules/vfs_streams_xattr.c b/source3/modules/vfs_streams_xattr.c index d7c0a834c0..aa7ef080e6 100644 --- a/source3/modules/vfs_streams_xattr.c +++ b/source3/modules/vfs_streams_xattr.c @@ -22,6 +22,7 @@ */ #include "includes.h" +#include "../lib/crypto/md5.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_VFS diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c index 21cc2f6268..36d682b624 100644 --- a/source3/rpc_client/cli_samr.c +++ b/source3/rpc_client/cli_samr.c @@ -24,6 +24,7 @@ #include "includes.h" #include "../libcli/auth/libcli_auth.h" #include "../librpc/gen_ndr/cli_samr.h" +#include "../lib/crypto/arcfour.h" /* User change password */ diff --git a/source3/rpc_client/init_netlogon.c b/source3/rpc_client/init_netlogon.c index d197ff74b2..a1728834e7 100644 --- a/source3/rpc_client/init_netlogon.c +++ b/source3/rpc_client/init_netlogon.c @@ -19,6 +19,7 @@ #include "includes.h" #include "../libcli/auth/libcli_auth.h" +#include "../lib/crypto/arcfour.h" /************************************************************************* inits a netr_CryptPassword structure diff --git a/source3/rpc_client/init_samr.c b/source3/rpc_client/init_samr.c index 6843869965..ecab28e719 100644 --- a/source3/rpc_client/init_samr.c +++ b/source3/rpc_client/init_samr.c @@ -19,6 +19,8 @@ #include "includes.h" #include "../libcli/auth/libcli_auth.h" +#include "../lib/crypto/md5.h" +#include "../lib/crypto/arcfour.h" /************************************************************************* inits a samr_CryptPasswordEx structure diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c index fc1bdf0b2d..ee87fa8623 100644 --- a/source3/rpc_server/srv_netlog_nt.c +++ b/source3/rpc_server/srv_netlog_nt.c @@ -28,6 +28,7 @@ #include "../libcli/auth/schannel.h" #include "../librpc/gen_ndr/srv_netlogon.h" #include "librpc/gen_ndr/messaging.h" +#include "../lib/crypto/md4.h" extern userdom_struct current_user_info; diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index 5e786a0404..832ada5bc1 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -36,6 +36,7 @@ #include "../libcli/auth/libcli_auth.h" #include "../librpc/gen_ndr/srv_samr.h" #include "rpc_server/srv_samr_util.h" +#include "../lib/crypto/arcfour.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_RPC_SRV diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c index 32ddefb429..735f57d0df 100644 --- a/source3/smbd/chgpasswd.c +++ b/source3/smbd/chgpasswd.c @@ -47,6 +47,7 @@ #include "includes.h" #include "../libcli/auth/libcli_auth.h" +#include "../lib/crypto/arcfour.h" static NTSTATUS check_oem_password(const char *user, uchar password_encrypted_with_lm_hash[516], diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c index 2c8dbfc7c8..79cf3f8af2 100644 --- a/source3/utils/ntlm_auth.c +++ b/source3/utils/ntlm_auth.c @@ -30,6 +30,7 @@ #include "ntlmssp.h" #include "smb_krb5.h" #include +#include "../lib/crypto/arcfour.h" #ifndef PAM_WINBIND_CONFIG_FILE #define PAM_WINBIND_CONFIG_FILE "/etc/security/pam_winbind.conf" diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c index 34f1fbc341..de08a66bc7 100644 --- a/source3/winbindd/winbindd_pam.c +++ b/source3/winbindd/winbindd_pam.c @@ -28,6 +28,7 @@ #include "../librpc/gen_ndr/cli_samr.h" #include "../librpc/gen_ndr/ndr_netlogon.h" #include "smb_krb5.h" +#include "../lib/crypto/arcfour.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND -- cgit