Add previously generated header files now needed in merged build.

Jeremy.

diff --git a/libcli/auth/msrpc_parse.h b/libcli/auth/msrpc_parse.h
new file mode 100644 (file)
index 0000000..507694d
--- /dev/null
+++ b/libcli/auth/msrpc_parse.h
@@ -0,0 +1,37 @@
+#ifndef _LIBCLI_AUTH_MSRPC_PARSE_H__
+#define _LIBCLI_AUTH_MSRPC_PARSE_H__
+
+#undef _PRINTF_ATTRIBUTE
+#define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
+
+/* this file contains prototypes for functions that are private 
+ * to this subsystem or library. These functions should not be 
+ * used outside this particular subsystem! */
+
+
+/* The following definitions come from /home/jeremy/src/samba/git/master/source3/../source4/../libcli/auth/msrpc_parse.c  */
+
+bool msrpc_gen(TALLOC_CTX *mem_ctx, 
+              DATA_BLOB *blob,
+              const char *format, ...);
+
+/**
+  this is a tiny msrpc packet parser. This the the partner of msrpc_gen
+
+  format specifiers are:
+
+  U = unicode string (output is unix string)
+  A = ascii string
+  B = data blob
+  b = data blob in header
+  d = word (4 bytes)
+  C = constant ascii string
+ */
+bool msrpc_parse(TALLOC_CTX *mem_ctx, 
+                const DATA_BLOB *blob,
+                const char *format, ...);
+#undef _PRINTF_ATTRIBUTE
+#define _PRINTF_ATTRIBUTE(a1, a2)
+
+#endif
+

diff --git a/libcli/auth/proto.h b/libcli/auth/proto.h
new file mode 100644 (file)
index 0000000..e09cdee
--- /dev/null
+++ b/libcli/auth/proto.h
@@ -0,0 +1,201 @@
+#ifndef _LIBCLI_AUTH_PROTO_H__
+#define _LIBCLI_AUTH_PROTO_H__
+
+#undef _PRINTF_ATTRIBUTE
+#define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
+
+/* this file contains prototypes for functions that are private 
+ * to this subsystem or library. These functions should not be 
+ * used outside this particular subsystem! */
+
+
+/* The following definitions come from /home/jeremy/src/samba/git/master/source3/../source4/../libcli/auth/credentials.c  */
+
+void netlogon_creds_des_encrypt_LMKey(struct netlogon_creds_CredentialState *creds, struct netr_LMSessionKey *key);
+void netlogon_creds_des_decrypt_LMKey(struct netlogon_creds_CredentialState *creds, struct netr_LMSessionKey *key);
+void netlogon_creds_des_encrypt(struct netlogon_creds_CredentialState *creds, struct samr_Password *pass);
+void netlogon_creds_des_decrypt(struct netlogon_creds_CredentialState *creds, struct samr_Password *pass);
+void netlogon_creds_arcfour_crypt(struct netlogon_creds_CredentialState *creds, uint8_t *data, size_t len);
+
+/*****************************************************************
+The above functions are common to the client and server interface
+next comes the client specific functions
+******************************************************************/
+struct netlogon_creds_CredentialState *netlogon_creds_client_init(TALLOC_CTX *mem_ctx, 
+                                                                 const char *client_account,
+                                                                 const char *client_computer_name, 
+                                                                 const struct netr_Credential *client_challenge,
+                                                                 const struct netr_Credential *server_challenge,
+                                                                 const struct samr_Password *machine_password,
+                                                                 struct netr_Credential *initial_credential,
+                                                                 uint32_t negotiate_flags);
+struct netlogon_creds_CredentialState *netlogon_creds_client_init_session_key(TALLOC_CTX *mem_ctx, 
+                                                                             const uint8_t session_key[16]);
+void netlogon_creds_client_authenticator(struct netlogon_creds_CredentialState *creds,
+                               struct netr_Authenticator *next);
+bool netlogon_creds_client_check(struct netlogon_creds_CredentialState *creds,
+                       const struct netr_Credential *received_credentials);
+
+/*****************************************************************
+The above functions are common to the client and server interface
+next comes the server specific functions
+******************************************************************/
+struct netlogon_creds_CredentialState *netlogon_creds_server_init(TALLOC_CTX *mem_ctx, 
+                                                                 const char *client_account,
+                                                                 const char *client_computer_name, 
+                                                                 uint16_t secure_channel_type,
+                                                                 const struct netr_Credential *client_challenge,
+                                                                 const struct netr_Credential *server_challenge,
+                                                                 const struct samr_Password *machine_password,
+                                                                 struct netr_Credential *credentials_in,
+                                                                 struct netr_Credential *credentials_out,
+                                                                 uint32_t negotiate_flags);
+NTSTATUS netlogon_creds_server_step_check(struct netlogon_creds_CredentialState *creds,
+                                struct netr_Authenticator *received_authenticator,
+                                struct netr_Authenticator *return_authenticator) ;
+void netlogon_creds_decrypt_samlogon(struct netlogon_creds_CredentialState *creds,
+                           uint16_t validation_level,
+                           union netr_Validation *validation) ;
+
+/* The following definitions come from /home/jeremy/src/samba/git/master/source3/../source4/../libcli/auth/session.c  */
+
+void sess_crypt_blob(DATA_BLOB *out, const DATA_BLOB *in, const DATA_BLOB *session_key,
+                    bool forward);
+DATA_BLOB sess_encrypt_string(const char *str, const DATA_BLOB *session_key);
+char *sess_decrypt_string(TALLOC_CTX *mem_ctx, 
+                         DATA_BLOB *blob, const DATA_BLOB *session_key);
+DATA_BLOB sess_encrypt_blob(TALLOC_CTX *mem_ctx, DATA_BLOB *blob_in, const DATA_BLOB *session_key);
+NTSTATUS sess_decrypt_blob(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, const DATA_BLOB *session_key, 
+                          DATA_BLOB *ret);
+
+/* The following definitions come from /home/jeremy/src/samba/git/master/source3/../source4/../libcli/auth/smbencrypt.c  */
+
+void SMBencrypt_hash(const uint8_t lm_hash[16], const uint8_t *c8, uint8_t p24[24]);
+bool SMBencrypt(const char *passwd, const uint8_t *c8, uint8_t p24[24]);
+
+/**
+ * Creates the MD4 Hash of the users password in NT UNICODE.
+ * @param passwd password in 'unix' charset.
+ * @param p16 return password hashed with md4, caller allocated 16 byte buffer
+ */
+bool E_md4hash(const char *passwd, uint8_t p16[16]);
+
+/**
+ * Creates the MD5 Hash of a combination of 16 byte salt and 16 byte NT hash.
+ * @param 16 byte salt.
+ * @param 16 byte NT hash.
+ * @param 16 byte return hashed with md5, caller allocated 16 byte buffer
+ */
+void E_md5hash(const uint8_t salt[16], const uint8_t nthash[16], uint8_t hash_out[16]);
+
+/**
+ * Creates the DES forward-only Hash of the users password in DOS ASCII charset
+ * @param passwd password in 'unix' charset.
+ * @param p16 return password hashed with DES, caller allocated 16 byte buffer
+ * @return false if password was > 14 characters, and therefore may be incorrect, otherwise true
+ * @note p16 is filled in regardless
+ */
+bool E_deshash(const char *passwd, uint8_t p16[16]);
+
+/**
+ * Creates the MD4 and DES (LM) Hash of the users password.  
+ * MD4 is of the NT Unicode, DES is of the DOS UPPERCASE password.
+ * @param passwd password in 'unix' charset.
+ * @param nt_p16 return password hashed with md4, caller allocated 16 byte buffer
+ * @param p16 return password hashed with des, caller allocated 16 byte buffer
+ */
+void nt_lm_owf_gen(const char *pwd, uint8_t nt_p16[16], uint8_t p16[16]);
+bool ntv2_owf_gen(const uint8_t owf[16],
+                 const char *user_in, const char *domain_in,
+                 bool upper_case_domain, /* Transform the domain into UPPER case */
+                 uint8_t kr_buf[16]);
+void SMBOWFencrypt(const uint8_t passwd[16], const uint8_t *c8, uint8_t p24[24]);
+void SMBNTencrypt_hash(const uint8_t nt_hash[16], uint8_t *c8, uint8_t *p24);
+void SMBNTencrypt(const char *passwd, uint8_t *c8, uint8_t *p24);
+void SMBOWFencrypt_ntv2(const uint8_t kr[16],
+                       const DATA_BLOB *srv_chal,
+                       const DATA_BLOB *smbcli_chal,
+                       uint8_t resp_buf[16]);
+void SMBsesskeygen_ntv2(const uint8_t kr[16],
+                       const uint8_t * nt_resp, uint8_t sess_key[16]);
+void SMBsesskeygen_ntv1(const uint8_t kr[16], uint8_t sess_key[16]);
+void SMBsesskeygen_lm_sess_key(const uint8_t lm_hash[16],
+                              const uint8_t lm_resp[24], /* only uses 8 */ 
+                              uint8_t sess_key[16]);
+DATA_BLOB NTLMv2_generate_names_blob(TALLOC_CTX *mem_ctx, 
+                                    const char *hostname, 
+                                    const char *domain);
+bool SMBNTLMv2encrypt_hash(TALLOC_CTX *mem_ctx, 
+                          const char *user, const char *domain, const uint8_t nt_hash[16],
+                          const DATA_BLOB *server_chal, 
+                          const DATA_BLOB *names_blob,
+                          DATA_BLOB *lm_response, DATA_BLOB *nt_response, 
+                          DATA_BLOB *lm_session_key, DATA_BLOB *user_session_key) ;
+bool SMBNTLMv2encrypt(TALLOC_CTX *mem_ctx, 
+                     const char *user, const char *domain, 
+                     const char *password, 
+                     const DATA_BLOB *server_chal, 
+                     const DATA_BLOB *names_blob,
+                     DATA_BLOB *lm_response, DATA_BLOB *nt_response, 
+                     DATA_BLOB *lm_session_key, DATA_BLOB *user_session_key) ;
+
+/***********************************************************
+ encode a password buffer with a unicode password.  The buffer
+ is filled with random data to make it harder to attack.
+************************************************************/
+bool encode_pw_buffer(uint8_t buffer[516], const char *password, int string_flags);
+
+/***********************************************************
+ decode a password buffer
+ *new_pw_len is the length in bytes of the possibly mulitbyte
+ returned password including termination.
+************************************************************/
+bool decode_pw_buffer(TALLOC_CTX *ctx,
+                     uint8_t in_buffer[516],
+                     char **pp_new_pwrd,
+                     size_t *new_pw_len,
+                     charset_t string_charset);
+
+/***********************************************************
+ Decode an arc4 encrypted password change buffer.
+************************************************************/
+void encode_or_decode_arc4_passwd_buffer(unsigned char pw_buf[532], const DATA_BLOB *psession_key);
+
+/***********************************************************
+ encode a password buffer with an already unicode password.  The
+ rest of the buffer is filled with random data to make it harder to attack.
+************************************************************/
+bool set_pw_in_buffer(uint8_t buffer[516], DATA_BLOB *password);
+
+/***********************************************************
+ decode a password buffer
+ *new_pw_size is the length in bytes of the extracted unicode password
+************************************************************/
+bool extract_pw_from_buffer(TALLOC_CTX *mem_ctx, 
+                           uint8_t in_buffer[516], DATA_BLOB *new_pass);
+void encode_wkssvc_join_password_buffer(TALLOC_CTX *mem_ctx,
+                                       const char *pwd,
+                                       DATA_BLOB *session_key,
+                                       struct wkssvc_PasswordBuffer **pwd_buf);
+WERROR decode_wkssvc_join_password_buffer(TALLOC_CTX *mem_ctx,
+                                         struct wkssvc_PasswordBuffer *pwd_buf,
+                                         DATA_BLOB *session_key,
+                                         char **pwd);
+
+/* The following definitions come from /home/jeremy/src/samba/git/master/source3/../source4/../libcli/auth/smbdes.c  */
+
+void des_crypt56(uint8_t out[8], const uint8_t in[8], const uint8_t key[7], int forw);
+void E_P16(const uint8_t *p14,uint8_t *p16);
+void E_P24(const uint8_t *p21, const uint8_t *c8, uint8_t *p24);
+void D_P16(const uint8_t *p14, const uint8_t *in, uint8_t *out);
+void E_old_pw_hash( uint8_t *p14, const uint8_t *in, uint8_t *out);
+void des_crypt128(uint8_t out[8], const uint8_t in[8], const uint8_t key[16]);
+void des_crypt64(uint8_t out[8], const uint8_t in[8], const uint8_t key[8], int forw);
+void des_crypt112(uint8_t out[8], const uint8_t in[8], const uint8_t key[14], int forw);
+void des_crypt112_16(uint8_t out[16], uint8_t in[16], const uint8_t key[14], int forw);
+void sam_rid_crypt(uint_t rid, const uint8_t *in, uint8_t *out, int forw);
+#undef _PRINTF_ATTRIBUTE
+#define _PRINTF_ATTRIBUTE(a1, a2)
+
+#endif
+

diff --git a/libcli/auth/schannel_state_proto.h b/libcli/auth/schannel_state_proto.h
new file mode 100644 (file)
index 0000000..99b950e
--- /dev/null
+++ b/libcli/auth/schannel_state_proto.h
@@ -0,0 +1,32 @@
+#ifndef _LIBCLI_AUTH_SCHANNEL_STATE_PROTO_H__
+#define _LIBCLI_AUTH_SCHANNEL_STATE_PROTO_H__
+
+#undef _PRINTF_ATTRIBUTE
+#define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
+
+/* this file contains prototypes for functions that are private 
+ * to this subsystem or library. These functions should not be 
+ * used outside this particular subsystem! */
+
+
+/* The following definitions come from /home/jeremy/src/samba/git/master/source3/../source4/../libcli/auth/schannel_state.c  */
+
+NTSTATUS schannel_store_session_key(struct ldb_context *ldb,
+                                   TALLOC_CTX *mem_ctx,
+                                   struct netlogon_creds_CredentialState *creds);
+NTSTATUS schannel_fetch_session_key(struct ldb_context *ldb,
+                                   TALLOC_CTX *mem_ctx,
+                                   const char *computer_name, 
+                                   struct netlogon_creds_CredentialState **creds);
+NTSTATUS schannel_creds_server_step_check(struct ldb_context *ldb,
+                                         TALLOC_CTX *mem_ctx, 
+                                         const char *computer_name,
+                                         bool schannel_required_for_call,
+                                         bool schannel_in_use,
+                                         struct netr_Authenticator *received_authenticator,
+                                         struct netr_Authenticator *return_authenticator,
+                                         struct netlogon_creds_CredentialState **creds_out) ;
+#undef _PRINTF_ATTRIBUTE
+#define _PRINTF_ATTRIBUTE(a1, a2)
+
+#endif