[linux-cifs-client] [PATCH] NTLMv2 signatures
Yehuda Sadeh Weinraub
Yehuda.Sadeh at expand.com
Mon May 14 08:06:28 GMT 2007
Following is my fix for NTLMv2 signatures (non-SPNEGO case). The diff
was taken on the linux-2.6-mainline svn tree.
Thanks,
Yehuda
Index: sess.c
===================================================================
--- sess.c (revision 111)
+++ sess.c (working copy)
@@ -416,7 +416,7 @@
if(first_time) /* should this be moved into common code
with similar ntlmv2 path? */
-
cifs_calculate_mac_key(ses->server->mac_signing_key,
+
cifs_calculate_mac_key(&ses->server->mac_signing_key,
ntlm_session_key, ses->password);
/* copy session key */
Index: cifsproto.h
===================================================================
--- cifsproto.h (revision 111)
+++ cifsproto.h (working copy)
@@ -289,9 +289,9 @@
extern int cifs_sign_smb(struct smb_hdr *, struct TCP_Server_Info
*,__u32 *);
extern int cifs_sign_smb2(struct kvec *iov, int n_vec, struct
TCP_Server_Info *,
__u32 *);
-extern int cifs_verify_signature(struct smb_hdr *, const char *
mac_key,
+extern int cifs_verify_signature(struct smb_hdr *, const struct mac_key
* mac_key,
__u32 expected_sequence_number);
-extern int cifs_calculate_mac_key(char * key,const char * rn,const char
* pass);
+extern int cifs_calculate_mac_key(struct mac_key * key,const char *
rn,const char * pass);
extern int CalcNTLMv2_partial_mac_key(struct cifsSesInfo *,
const struct nls_table *);
extern void CalcNTLMv2_response(const struct cifsSesInfo *, char * );
Index: connect.c
===================================================================
--- connect.c (revision 111)
+++ connect.c (working copy)
@@ -3422,7 +3422,7 @@
if(first_time)
cifs_calculate_mac_key(
-
pSesInfo->server->mac_signing_key,
+
&pSesInfo->server->mac_signing_key,
ntlm_session_key,
pSesInfo->password);
}
@@ -3442,7 +3442,7 @@
if(first_time)
cifs_calculate_mac_key(
-
pSesInfo->server->mac_signing_key,
+
&pSesInfo->server->mac_signing_key,
ntlm_session_key,
pSesInfo->password);
rc = CIFSSessSetup(xid, pSesInfo,
Index: cifsencrypt.c
===================================================================
--- cifsencrypt.c (revision 111)
+++ cifsencrypt.c (working copy)
@@ -41,16 +41,17 @@
unsigned char *p24);
static int cifs_calculate_signature(const struct smb_hdr * cifs_pdu,
- const char * key, char * signature)
+ const struct mac_key * key, char *
signature)
{
struct MD5Context context;
- if((cifs_pdu == NULL) || (signature == NULL))
+ if((cifs_pdu == NULL) || (signature == NULL) || (key == NULL))
return -EINVAL;
MD5Init(&context);
- MD5Update(&context,key,CIFS_SESS_KEY_SIZE+16);
+ MD5Update(&context,(char *)&key->data,key->len);
MD5Update(&context,cifs_pdu->Protocol,cifs_pdu->smb_buf_length);
+
MD5Final(signature,&context);
return 0;
}
@@ -75,7 +76,7 @@
server->sequence_number++;
spin_unlock(&GlobalMid_Lock);
- rc = cifs_calculate_signature(cifs_pdu,
server->mac_signing_key,smb_signature);
+ rc = cifs_calculate_signature(cifs_pdu,
&server->mac_signing_key,smb_signature);
if(rc)
memset(cifs_pdu->Signature.SecuritySignature, 0, 8);
else
@@ -85,16 +86,16 @@
}
static int cifs_calc_signature2(const struct kvec * iov, int n_vec,
- const char * key, char * signature)
+ const struct mac_key * key, char *
signature)
{
struct MD5Context context;
int i;
- if((iov == NULL) || (signature == NULL))
+ if((iov == NULL) || (signature == NULL) || (key == NULL))
return -EINVAL;
MD5Init(&context);
- MD5Update(&context,key,CIFS_SESS_KEY_SIZE+16);
+ MD5Update(&context,(char *)&key->data,key->len);
for(i=0;i<n_vec;i++) {
if(iov[i].iov_base == NULL) {
cERROR(1,("null iovec entry"));
@@ -139,7 +140,7 @@
server->sequence_number++;
spin_unlock(&GlobalMid_Lock);
- rc = cifs_calc_signature2(iov, n_vec, server->mac_signing_key,
+ rc = cifs_calc_signature2(iov, n_vec, &server->mac_signing_key,
smb_signature);
if(rc)
memset(cifs_pdu->Signature.SecuritySignature, 0, 8);
@@ -150,7 +151,7 @@
}
-int cifs_verify_signature(struct smb_hdr * cifs_pdu, const char *
mac_key,
+int cifs_verify_signature(struct smb_hdr * cifs_pdu, const struct
mac_key * mac_key,
__u32 expected_sequence_number)
{
unsigned int rc;
@@ -200,15 +201,16 @@
}
/* We fill in key by putting in 40 byte array which was allocated by
caller */
-int cifs_calculate_mac_key(char * key, const char * rn, const char *
password)
+int cifs_calculate_mac_key(struct mac_key * key, const char * rn, const
char * password)
{
char temp_key[16];
if ((key == NULL) || (rn == NULL))
return -EINVAL;
E_md4hash(password, temp_key);
- mdfour(key,temp_key,16);
- memcpy(key+16,rn, CIFS_SESS_KEY_SIZE);
+ mdfour(key->data.ntlm,temp_key,16);
+ memcpy(key->data.ntlm+16,rn, CIFS_SESS_KEY_SIZE);
+ key->len = 40;
return 0;
}
@@ -261,7 +263,7 @@
hmac_md5_update((const unsigned char *) unicode_buf,
(user_name_len+dom_name_len)*2,&ctx);
- hmac_md5_final(ses->server->mac_signing_key,&ctx);
+ hmac_md5_final(ses->server->ntlmv2_hash,&ctx);
kfree(ucase_buf);
kfree(unicode_buf);
return 0;
@@ -345,7 +347,10 @@
if(domain == NULL)
goto calc_exit_1;
len = cifs_strtoUCS(domain, ses->domainName, len,
nls_cp);
- UniStrupr(domain);
+ /* the following line was removed since it didn't work
well
+ with lower cased domain name that passed as an
option.
+ Maybe converting the domain name earlier makes sense
*/
+ /* UniStrupr(domain); */
hmac_md5_update((char *)domain, 2*len, pctxt);
@@ -356,7 +361,7 @@
calc_exit_2:
/* BB FIXME what about bytes 24 through 40 of the signing key?
compare with the NTLM example */
- hmac_md5_final(ses->server->mac_signing_key, pctxt);
+ hmac_md5_final(ses->server->ntlmv2_hash, pctxt);
return rc;
}
@@ -366,6 +371,7 @@
{
int rc;
struct ntlmv2_resp * buf = (struct ntlmv2_resp *)resp_buf;
+ struct HMACMD5Context context;
buf->blob_signature = cpu_to_le32(0x00000101);
buf->reserved = 0;
@@ -382,6 +388,15 @@
if(rc)
cERROR(1,("could not get v2 hash rc %d",rc));
CalcNTLMv2_response(ses, resp_buf);
+
+ /* now calculate the MAC key for NTLMv2 */
+ hmac_md5_init_limK_to_64(ses->server->ntlmv2_hash, 16,
&context);
+ hmac_md5_update(resp_buf,
+ 16, &context);
+
hmac_md5_final(ses->server->mac_signing_key.data.ntlmv2.key,&context);
+
+ memcpy(&ses->server->mac_signing_key.data.ntlmv2.resp, resp_buf,
sizeof(struct ntlmv2_resp));
+ ses->server->mac_signing_key.len = 16 + sizeof(struct
ntlmv2_resp);
}
void CalcNTLMv2_response(const struct cifsSesInfo * ses, char *
v2_session_response)
@@ -389,7 +404,7 @@
struct HMACMD5Context context;
/* rest of v2 struct already generated */
memcpy(v2_session_response + 8, ses->server->cryptKey,8);
- hmac_md5_init_limK_to_64(ses->server->mac_signing_key, 16,
&context);
+ hmac_md5_init_limK_to_64(ses->server->ntlmv2_hash, 16,
&context);
hmac_md5_update(v2_session_response+8,
sizeof(struct ntlmv2_resp) - 8, &context);
Index: transport.c
===================================================================
--- transport.c (revision 111)
+++ transport.c (working copy)
@@ -559,7 +559,7 @@
(ses->server->secMode &
(SECMODE_SIGN_REQUIRED |
SECMODE_SIGN_ENABLED))) {
rc =
cifs_verify_signature(midQ->resp_buf,
-
ses->server->mac_signing_key,
+
&ses->server->mac_signing_key,
midQ->sequence_number+1);
if(rc) {
cERROR(1,("Unexpected SMB
signature"));
@@ -738,7 +738,7 @@
(ses->server->secMode &
(SECMODE_SIGN_REQUIRED |
SECMODE_SIGN_ENABLED))) {
rc = cifs_verify_signature(out_buf,
-
ses->server->mac_signing_key,
+
&ses->server->mac_signing_key,
midQ->sequence_number+1);
if(rc) {
cERROR(1,("Unexpected SMB
signature"));
@@ -982,7 +982,7 @@
(ses->server->secMode &
(SECMODE_SIGN_REQUIRED |
SECMODE_SIGN_ENABLED))) {
rc = cifs_verify_signature(out_buf,
-
ses->server->mac_signing_key,
+
&ses->server->mac_signing_key,
midQ->sequence_number+1);
if(rc) {
cERROR(1,("Unexpected SMB
signature"));
Index: cifsglob.h
===================================================================
--- cifsglob.h (revision 111)
+++ cifsglob.h (working copy)
@@ -104,6 +104,17 @@
/* Netbios frames protocol not supported at this time */
};
+struct mac_key {
+ unsigned int len;
+ union {
+ char ntlm[CIFS_SESS_KEY_SIZE + 16];
+ struct {
+ char key[16];
+ struct ntlmv2_resp resp;
+ } ntlmv2;
+ } data;
+};
+
/*
*****************************************************************
* Except the CIFS PDUs themselves all the
@@ -159,7 +170,8 @@
/* 16th byte of RFC1001 workstation name is always null */
char workstation_RFC1001_name[SERVER_NAME_LEN_WITH_NULL];
__u32 sequence_number; /* needed for CIFS PDU signature */
- char mac_signing_key[CIFS_SESS_KEY_SIZE + 16];
+ struct mac_key mac_signing_key;
+ char ntlmv2_hash[16];
unsigned long lstrp; /* when we got last response from this
server */
};
[yehuda at yehuda cifs]$ svn diff
Index: sess.c
===================================================================
--- sess.c (revision 111)
+++ sess.c (working copy)
@@ -416,7 +416,7 @@
if(first_time) /* should this be moved into common code
with similar ntlmv2 path? */
-
cifs_calculate_mac_key(ses->server->mac_signing_key,
+
cifs_calculate_mac_key(&ses->server->mac_signing_key,
ntlm_session_key, ses->password);
/* copy session key */
Index: cifsproto.h
===================================================================
--- cifsproto.h (revision 111)
+++ cifsproto.h (working copy)
@@ -289,9 +289,9 @@
extern int cifs_sign_smb(struct smb_hdr *, struct TCP_Server_Info
*,__u32 *);
extern int cifs_sign_smb2(struct kvec *iov, int n_vec, struct
TCP_Server_Info *,
__u32 *);
-extern int cifs_verify_signature(struct smb_hdr *, const char *
mac_key,
+extern int cifs_verify_signature(struct smb_hdr *, const struct mac_key
* mac_key,
__u32 expected_sequence_number);
-extern int cifs_calculate_mac_key(char * key,const char * rn,const char
* pass);
+extern int cifs_calculate_mac_key(struct mac_key * key,const char *
rn,const char * pass);
extern int CalcNTLMv2_partial_mac_key(struct cifsSesInfo *,
const struct nls_table *);
extern void CalcNTLMv2_response(const struct cifsSesInfo *, char * );
Index: connect.c
===================================================================
--- connect.c (revision 111)
+++ connect.c (working copy)
@@ -3422,7 +3422,7 @@
if(first_time)
cifs_calculate_mac_key(
-
pSesInfo->server->mac_signing_key,
+
&pSesInfo->server->mac_signing_key,
ntlm_session_key,
pSesInfo->password);
}
@@ -3442,7 +3442,7 @@
if(first_time)
cifs_calculate_mac_key(
-
pSesInfo->server->mac_signing_key,
+
&pSesInfo->server->mac_signing_key,
ntlm_session_key,
pSesInfo->password);
rc = CIFSSessSetup(xid, pSesInfo,
Index: cifsencrypt.c
===================================================================
--- cifsencrypt.c (revision 111)
+++ cifsencrypt.c (working copy)
@@ -41,16 +41,17 @@
unsigned char *p24);
static int cifs_calculate_signature(const struct smb_hdr * cifs_pdu,
- const char * key, char * signature)
+ const struct mac_key * key, char *
signature)
{
struct MD5Context context;
- if((cifs_pdu == NULL) || (signature == NULL))
+ if((cifs_pdu == NULL) || (signature == NULL) || (key == NULL))
return -EINVAL;
MD5Init(&context);
- MD5Update(&context,key,CIFS_SESS_KEY_SIZE+16);
+ MD5Update(&context,(char *)&key->data,key->len);
MD5Update(&context,cifs_pdu->Protocol,cifs_pdu->smb_buf_length);
+
MD5Final(signature,&context);
return 0;
}
@@ -75,7 +76,7 @@
server->sequence_number++;
spin_unlock(&GlobalMid_Lock);
- rc = cifs_calculate_signature(cifs_pdu,
server->mac_signing_key,smb_signature);
+ rc = cifs_calculate_signature(cifs_pdu,
&server->mac_signing_key,smb_signature);
if(rc)
memset(cifs_pdu->Signature.SecuritySignature, 0, 8);
else
@@ -85,16 +86,16 @@
}
static int cifs_calc_signature2(const struct kvec * iov, int n_vec,
- const char * key, char * signature)
+ const struct mac_key * key, char *
signature)
{
struct MD5Context context;
int i;
- if((iov == NULL) || (signature == NULL))
+ if((iov == NULL) || (signature == NULL) || (key == NULL))
return -EINVAL;
MD5Init(&context);
- MD5Update(&context,key,CIFS_SESS_KEY_SIZE+16);
+ MD5Update(&context,(char *)&key->data,key->len);
for(i=0;i<n_vec;i++) {
if(iov[i].iov_base == NULL) {
cERROR(1,("null iovec entry"));
@@ -139,7 +140,7 @@
server->sequence_number++;
spin_unlock(&GlobalMid_Lock);
- rc = cifs_calc_signature2(iov, n_vec, server->mac_signing_key,
+ rc = cifs_calc_signature2(iov, n_vec, &server->mac_signing_key,
smb_signature);
if(rc)
memset(cifs_pdu->Signature.SecuritySignature, 0, 8);
@@ -150,7 +151,7 @@
}
-int cifs_verify_signature(struct smb_hdr * cifs_pdu, const char *
mac_key,
+int cifs_verify_signature(struct smb_hdr * cifs_pdu, const struct
mac_key * mac_key,
__u32 expected_sequence_number)
{
unsigned int rc;
@@ -200,15 +201,16 @@
}
/* We fill in key by putting in 40 byte array which was allocated by
caller */
-int cifs_calculate_mac_key(char * key, const char * rn, const char *
password)
+int cifs_calculate_mac_key(struct mac_key * key, const char * rn, const
char * password)
{
char temp_key[16];
if ((key == NULL) || (rn == NULL))
return -EINVAL;
E_md4hash(password, temp_key);
- mdfour(key,temp_key,16);
- memcpy(key+16,rn, CIFS_SESS_KEY_SIZE);
+ mdfour(key->data.ntlm,temp_key,16);
+ memcpy(key->data.ntlm+16,rn, CIFS_SESS_KEY_SIZE);
+ key->len = 40;
return 0;
}
@@ -261,7 +263,7 @@
hmac_md5_update((const unsigned char *) unicode_buf,
(user_name_len+dom_name_len)*2,&ctx);
- hmac_md5_final(ses->server->mac_signing_key,&ctx);
+ hmac_md5_final(ses->server->ntlmv2_hash,&ctx);
kfree(ucase_buf);
kfree(unicode_buf);
return 0;
@@ -345,7 +347,10 @@
if(domain == NULL)
goto calc_exit_1;
len = cifs_strtoUCS(domain, ses->domainName, len,
nls_cp);
- UniStrupr(domain);
+ /* the following line was removed since it didn't work
well
+ with lower cased domain name that passed as an
option.
+ Maybe converting the domain name earlier makes sense
*/
+ /* UniStrupr(domain); */
hmac_md5_update((char *)domain, 2*len, pctxt);
@@ -356,7 +361,7 @@
calc_exit_2:
/* BB FIXME what about bytes 24 through 40 of the signing key?
compare with the NTLM example */
- hmac_md5_final(ses->server->mac_signing_key, pctxt);
+ hmac_md5_final(ses->server->ntlmv2_hash, pctxt);
return rc;
}
@@ -366,6 +371,7 @@
{
int rc;
struct ntlmv2_resp * buf = (struct ntlmv2_resp *)resp_buf;
+ struct HMACMD5Context context;
buf->blob_signature = cpu_to_le32(0x00000101);
buf->reserved = 0;
@@ -382,6 +388,15 @@
if(rc)
cERROR(1,("could not get v2 hash rc %d",rc));
CalcNTLMv2_response(ses, resp_buf);
+
+ /* now calculate the MAC key for NTLMv2 */
+ hmac_md5_init_limK_to_64(ses->server->ntlmv2_hash, 16,
&context);
+ hmac_md5_update(resp_buf,
+ 16, &context);
+
hmac_md5_final(ses->server->mac_signing_key.data.ntlmv2.key,&context);
+
+ memcpy(&ses->server->mac_signing_key.data.ntlmv2.resp, resp_buf,
sizeof(struct ntlmv2_resp));
+ ses->server->mac_signing_key.len = 16 + sizeof(struct
ntlmv2_resp);
}
void CalcNTLMv2_response(const struct cifsSesInfo * ses, char *
v2_session_response)
@@ -389,7 +404,7 @@
struct HMACMD5Context context;
/* rest of v2 struct already generated */
memcpy(v2_session_response + 8, ses->server->cryptKey,8);
- hmac_md5_init_limK_to_64(ses->server->mac_signing_key, 16,
&context);
+ hmac_md5_init_limK_to_64(ses->server->ntlmv2_hash, 16,
&context);
hmac_md5_update(v2_session_response+8,
sizeof(struct ntlmv2_resp) - 8, &context);
Index: transport.c
===================================================================
--- transport.c (revision 111)
+++ transport.c (working copy)
@@ -559,7 +559,7 @@
(ses->server->secMode &
(SECMODE_SIGN_REQUIRED |
SECMODE_SIGN_ENABLED))) {
rc =
cifs_verify_signature(midQ->resp_buf,
-
ses->server->mac_signing_key,
+
&ses->server->mac_signing_key,
midQ->sequence_number+1);
if(rc) {
cERROR(1,("Unexpected SMB
signature"));
@@ -738,7 +738,7 @@
(ses->server->secMode &
(SECMODE_SIGN_REQUIRED |
SECMODE_SIGN_ENABLED))) {
rc = cifs_verify_signature(out_buf,
-
ses->server->mac_signing_key,
+
&ses->server->mac_signing_key,
midQ->sequence_number+1);
if(rc) {
cERROR(1,("Unexpected SMB
signature"));
@@ -982,7 +982,7 @@
(ses->server->secMode &
(SECMODE_SIGN_REQUIRED |
SECMODE_SIGN_ENABLED))) {
rc = cifs_verify_signature(out_buf,
-
ses->server->mac_signing_key,
+
&ses->server->mac_signing_key,
midQ->sequence_number+1);
if(rc) {
cERROR(1,("Unexpected SMB
signature"));
Index: cifsglob.h
===================================================================
--- cifsglob.h (revision 111)
+++ cifsglob.h (working copy)
@@ -104,6 +104,17 @@
/* Netbios frames protocol not supported at this time */
};
+struct mac_key {
+ unsigned int len;
+ union {
+ char ntlm[CIFS_SESS_KEY_SIZE + 16];
+ struct {
+ char key[16];
+ struct ntlmv2_resp resp;
+ } ntlmv2;
+ } data;
+};
+
/*
*****************************************************************
* Except the CIFS PDUs themselves all the
@@ -159,7 +170,8 @@
/* 16th byte of RFC1001 workstation name is always null */
char workstation_RFC1001_name[SERVER_NAME_LEN_WITH_NULL];
__u32 sequence_number; /* needed for CIFS PDU signature */
- char mac_signing_key[CIFS_SESS_KEY_SIZE + 16];
+ struct mac_key mac_signing_key;
+ char ntlmv2_hash[16];
unsigned long lstrp; /* when we got last response from this
server */
};
More information about the linux-cifs-client
mailing list