[CIFS] Fix packet signatures for NTLMv2 case (b609f06a) · Commits · git / linux-net

fs/cifs/CHANGES

+4 −0

Original line number	Diff line number	Diff line
		Version 1.50
		------------
		Fix NTLMv2 signing

		Version 1.49
		------------
		IPv6 support. Enable ipv6 addresses to be passed on mount (put the ipv6

fs/cifs/TODO

+3 −3

Original line number	Diff line number	Diff line
		@@ -18,9 +18,9 @@ better)

		d) Kerberos/SPNEGO session setup support - (started)

		e) More testing of NTLMv2 authentication (mostly implemented - double check
		that NTLMv2 signing works, also need to cleanup now unneeded SessSetup code in
		fs/cifs/connect.c)
		e) Cleanup now unneeded SessSetup code in
		fs/cifs/connect.c and add back in NTLMSSP code if any servers
		need it

		f) MD5-HMAC signing SMB PDUs when SPNEGO style SessionSetup
		used (Kerberos or NTLMSSP). Signing alreadyimplemented for NTLM

fs/cifs/cifsencrypt.c

+40 −23

Original line number	Diff line number	Diff line
		@@ -41,16 +41,17 @@ extern void SMBencrypt(unsigned char passwd, unsigned char c8,
		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;
		}
		@@ -76,7 +77,7 @@ int cifs_sign_smb(struct smb_hdr cifs_pdu, struct TCP_Server_Info server,
		server->sequence_number++;
		spin_unlock(&GlobalMid_Lock);

		rc = cifs_calculate_signature(cifs_pdu, server->mac_signing_key,
		rc = cifs_calculate_signature(cifs_pdu, &server->mac_signing_key,
		smb_signature);
		if (rc)
		memset(cifs_pdu->Signature.SecuritySignature, 0, 8);
		@@ -87,16 +88,16 @@ int cifs_sign_smb(struct smb_hdr cifs_pdu, struct TCP_Server_Info server,
		}

		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"));
		@@ -141,7 +142,7 @@ int cifs_sign_smb2(struct kvec iov, int n_vec, struct TCP_Server_Info server,
		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);
		@@ -151,7 +152,8 @@ int cifs_sign_smb2(struct kvec iov, int n_vec, struct TCP_Server_Info server,
		return rc;
		}

		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;
		@@ -202,15 +204,17 @@ int cifs_verify_signature(struct smb_hdr cifs_pdu, const char mac_key,
		}

		/* 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;
		}

		@@ -263,7 +267,7 @@ int CalcNTLMv2_partial_mac_key(struct cifsSesInfo * ses,
		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;
		@@ -347,7 +351,10 @@ static int calc_ntlmv2_hash(struct cifsSesInfo *ses,
		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, 2len, pctxt);

		@@ -358,7 +365,7 @@ static int calc_ntlmv2_hash(struct cifsSesInfo *ses,
		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;
		}
		@@ -368,6 +375,7 @@ void setup_ntlmv2_rsp(struct cifsSesInfo * ses, char * resp_buf,
		{
		int rc;
		struct ntlmv2_resp * buf = (struct ntlmv2_resp *)resp_buf;
		struct HMACMD5Context context;

		buf->blob_signature = cpu_to_le32(0x00000101);
		buf->reserved = 0;
		@@ -384,6 +392,15 @@ void setup_ntlmv2_rsp(struct cifsSesInfo * ses, char * resp_buf,
		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)
		@@ -391,7 +408,7 @@ void CalcNTLMv2_response(const struct cifsSesInfo * ses, char * v2_session_respo
		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);

fs/cifs/cifsglob.h

+13 −1

Original line number	Diff line number	Diff line
		@@ -104,6 +104,17 @@ enum protocolEnum {
		/* 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 @@ struct TCP_Server_Info {
		/* 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 */
		};

fs/cifs/cifsproto.h

+5 −3

Original line number	Diff line number	Diff line
		@@ -294,9 +294,11 @@ extern void tconInfoFree(struct cifsTconInfo *);
		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 );