diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-24 16:04:43 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-24 16:04:43 +0200 |
| commit | da01822671b3a553fd805315df7322b8225cfe95 (patch) | |
| tree | e97c833cfb81eea5cae93a023cbb52cd84cac6c9 /source3/include | |
| parent | 2413a7200623855b93946d44bcdb949e2dc170a0 (diff) | |
| download | samba-da01822671b3a553fd805315df7322b8225cfe95.tar.gz samba-da01822671b3a553fd805315df7322b8225cfe95.tar.bz2 samba-da01822671b3a553fd805315df7322b8225cfe95.zip | |
Use common arcfour implementation.
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/includes.h | 1 | ||||
| -rw-r--r-- | source3/include/ntlmssp.h | 6 | ||||
| -rw-r--r-- | source3/include/proto.h | 5 |
3 files changed, 4 insertions, 8 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index de50eab8c5..25135d75ed 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -687,6 +687,7 @@ typedef char fstring[FSTRING_LEN]; #include "msdfs.h" #include "rap.h" #include "../lib/crypto/md5.h" +#include "../lib/crypto/arcfour.h" #include "../lib/crypto/hmacmd5.h" #include "ntlmssp.h" #include "auth.h" diff --git a/source3/include/ntlmssp.h b/source3/include/ntlmssp.h index 3fb41c5613..b014b2170c 100644 --- a/source3/include/ntlmssp.h +++ b/source3/include/ntlmssp.h @@ -157,14 +157,14 @@ typedef struct ntlmssp_state unsigned char recv_sign_key[16]; unsigned char recv_seal_key[16]; - unsigned char send_seal_arc4_state[258]; - unsigned char recv_seal_arc4_state[258]; + struct arcfour_state send_seal_arc4_state; + struct arcfour_state recv_seal_arc4_state; uint32 ntlm2_send_seq_num; uint32 ntlm2_recv_seq_num; /* ntlmv1 */ - unsigned char ntlmv1_arc4_state[258]; + struct arcfour_state ntlmv1_arc4_state; uint32 ntlmv1_seq_num; /* it turns out that we don't always get the diff --git a/source3/include/proto.h b/source3/include/proto.h index a5f43aad4c..ad7350c5d1 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -312,11 +312,6 @@ int afs_syscall( int subcall, bool afs_settoken_str(const char *token_string); bool afs_settoken_str(const char *token_string); -/* The following definitions come from lib/arc4.c */ - -void smb_arc4_init(unsigned char arc4_state_out[258], const unsigned char *key, size_t keylen); -void smb_arc4_crypt(unsigned char arc4_state_inout[258], unsigned char *data, size_t len); - /* The following definitions come from lib/audit.c */ const char *audit_category_str(uint32 category); |