Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: cifs: More crypto cleanup (try #2) CIFS: Add strictcache mount option CIFS: Implement cifs_strict_writev (try #4) [CIFS] Replace cifs md5 hashing functions with kernel crypto APIs
This commit is contained in:
Linus Torvalds
commit
9fbf0c08d4
|
|
@ -5,7 +5,7 @@ obj-$(CONFIG_CIFS) += cifs.o
|
|||
|
||||
cifs-y := cifsfs.o cifssmb.o cifs_debug.o connect.o dir.o file.o inode.o \
|
||||
link.o misc.o netmisc.o smbdes.o smbencrypt.o transport.o asn1.o \
|
||||
md4.o md5.o cifs_unicode.o nterr.o xattr.o cifsencrypt.o \
|
||||
cifs_unicode.o nterr.o xattr.o cifsencrypt.o \
|
||||
readdir.o ioctl.o sess.o export.o
|
||||
|
||||
cifs-$(CONFIG_CIFS_ACL) += cifsacl.o
|
||||
|
|
|
|||
|
|
@ -452,6 +452,11 @@ A partial list of the supported mount options follows:
|
|||
if oplock (caching token) is granted and held. Note that
|
||||
direct allows write operations larger than page size
|
||||
to be sent to the server.
|
||||
strictcache Use for switching on strict cache mode. In this mode the
|
||||
client read from the cache all the time it has Oplock Level II,
|
||||
otherwise - read from the server. All written data are stored
|
||||
in the cache, but if the client doesn't have Exclusive Oplock,
|
||||
it writes the data to the server.
|
||||
acl Allow setfacl and getfacl to manage posix ACLs if server
|
||||
supports them. (default)
|
||||
noacl Do not allow setfacl and getfacl calls on this mount
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@
|
|||
#include "cifspdu.h"
|
||||
#include "cifsglob.h"
|
||||
#include "cifs_debug.h"
|
||||
#include "md5.h"
|
||||
#include "cifs_unicode.h"
|
||||
#include "cifsproto.h"
|
||||
#include "ntlmssp.h"
|
||||
|
|
@ -37,11 +36,6 @@
|
|||
/* Note that the smb header signature field on input contains the
|
||||
sequence number before this function is called */
|
||||
|
||||
extern void mdfour(unsigned char *out, unsigned char *in, int n);
|
||||
extern void E_md4hash(const unsigned char *passwd, unsigned char *p16);
|
||||
extern void SMBencrypt(unsigned char *passwd, const unsigned char *c8,
|
||||
unsigned char *p24);
|
||||
|
||||
static int cifs_calculate_signature(const struct smb_hdr *cifs_pdu,
|
||||
struct TCP_Server_Info *server, char *signature)
|
||||
{
|
||||
|
|
@ -234,6 +228,7 @@ int cifs_verify_signature(struct smb_hdr *cifs_pdu,
|
|||
/* first calculate 24 bytes ntlm response and then 16 byte session key */
|
||||
int setup_ntlm_response(struct cifsSesInfo *ses)
|
||||
{
|
||||
int rc = 0;
|
||||
unsigned int temp_len = CIFS_SESS_KEY_SIZE + CIFS_AUTH_RESP_SIZE;
|
||||
char temp_key[CIFS_SESS_KEY_SIZE];
|
||||
|
||||
|
|
@ -247,13 +242,26 @@ int setup_ntlm_response(struct cifsSesInfo *ses)
|
|||
}
|
||||
ses->auth_key.len = temp_len;
|
||||
|
||||
SMBNTencrypt(ses->password, ses->server->cryptkey,
|
||||
rc = SMBNTencrypt(ses->password, ses->server->cryptkey,
|
||||
ses->auth_key.response + CIFS_SESS_KEY_SIZE);
|
||||
if (rc) {
|
||||
cFYI(1, "%s Can't generate NTLM response, error: %d",
|
||||
__func__, rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
E_md4hash(ses->password, temp_key);
|
||||
mdfour(ses->auth_key.response, temp_key, CIFS_SESS_KEY_SIZE);
|
||||
rc = E_md4hash(ses->password, temp_key);
|
||||
if (rc) {
|
||||
cFYI(1, "%s Can't generate NT hash, error: %d", __func__, rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
return 0;
|
||||
rc = mdfour(ses->auth_key.response, temp_key, CIFS_SESS_KEY_SIZE);
|
||||
if (rc)
|
||||
cFYI(1, "%s Can't generate NTLM session key, error: %d",
|
||||
__func__, rc);
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_CIFS_WEAK_PW_HASH
|
||||
|
|
@ -700,14 +708,13 @@ cifs_crypto_shash_allocate(struct TCP_Server_Info *server)
|
|||
unsigned int size;
|
||||
|
||||
server->secmech.hmacmd5 = crypto_alloc_shash("hmac(md5)", 0, 0);
|
||||
if (!server->secmech.hmacmd5 ||
|
||||
IS_ERR(server->secmech.hmacmd5)) {
|
||||
if (IS_ERR(server->secmech.hmacmd5)) {
|
||||
cERROR(1, "could not allocate crypto hmacmd5\n");
|
||||
return PTR_ERR(server->secmech.hmacmd5);
|
||||
}
|
||||
|
||||
server->secmech.md5 = crypto_alloc_shash("md5", 0, 0);
|
||||
if (!server->secmech.md5 || IS_ERR(server->secmech.md5)) {
|
||||
if (IS_ERR(server->secmech.md5)) {
|
||||
cERROR(1, "could not allocate crypto md5\n");
|
||||
rc = PTR_ERR(server->secmech.md5);
|
||||
goto crypto_allocate_md5_fail;
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
/*
|
||||
* fs/cifs/cifsencrypt.h
|
||||
*
|
||||
* Copyright (c) International Business Machines Corp., 2005
|
||||
* Author(s): Steve French (sfrench@us.ibm.com)
|
||||
*
|
||||
* Externs for misc. small encryption routines
|
||||
* so we do not have to put them in cifsproto.h
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published
|
||||
* by the Free Software Foundation; either version 2.1 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
|
||||
* the GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
/* md4.c */
|
||||
extern void mdfour(unsigned char *out, unsigned char *in, int n);
|
||||
/* smbdes.c */
|
||||
extern void E_P16(unsigned char *p14, unsigned char *p16);
|
||||
extern void E_P24(unsigned char *p21, const unsigned char *c8,
|
||||
unsigned char *p24);
|
||||
|
||||
|
||||
|
||||
|
|
@ -600,10 +600,17 @@ static ssize_t cifs_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
|
|||
{
|
||||
struct inode *inode = iocb->ki_filp->f_path.dentry->d_inode;
|
||||
ssize_t written;
|
||||
int rc;
|
||||
|
||||
written = generic_file_aio_write(iocb, iov, nr_segs, pos);
|
||||
if (!CIFS_I(inode)->clientCanCacheAll)
|
||||
filemap_fdatawrite(inode->i_mapping);
|
||||
|
||||
if (CIFS_I(inode)->clientCanCacheAll)
|
||||
return written;
|
||||
|
||||
rc = filemap_fdatawrite(inode->i_mapping);
|
||||
if (rc)
|
||||
cFYI(1, "cifs_file_aio_write: %d rc on %p inode", rc, inode);
|
||||
|
||||
return written;
|
||||
}
|
||||
|
||||
|
|
@ -737,7 +744,7 @@ const struct file_operations cifs_file_strict_ops = {
|
|||
.read = do_sync_read,
|
||||
.write = do_sync_write,
|
||||
.aio_read = cifs_strict_readv,
|
||||
.aio_write = cifs_file_aio_write,
|
||||
.aio_write = cifs_strict_writev,
|
||||
.open = cifs_open,
|
||||
.release = cifs_close,
|
||||
.lock = cifs_lock,
|
||||
|
|
@ -793,7 +800,7 @@ const struct file_operations cifs_file_strict_nobrl_ops = {
|
|||
.read = do_sync_read,
|
||||
.write = do_sync_write,
|
||||
.aio_read = cifs_strict_readv,
|
||||
.aio_write = cifs_file_aio_write,
|
||||
.aio_write = cifs_strict_writev,
|
||||
.open = cifs_open,
|
||||
.release = cifs_close,
|
||||
.fsync = cifs_strict_fsync,
|
||||
|
|
|
|||
|
|
@ -85,7 +85,9 @@ extern ssize_t cifs_user_read(struct file *file, char __user *read_data,
|
|||
extern ssize_t cifs_strict_readv(struct kiocb *iocb, const struct iovec *iov,
|
||||
unsigned long nr_segs, loff_t pos);
|
||||
extern ssize_t cifs_user_write(struct file *file, const char __user *write_data,
|
||||
size_t write_size, loff_t *poffset);
|
||||
size_t write_size, loff_t *poffset);
|
||||
extern ssize_t cifs_strict_writev(struct kiocb *iocb, const struct iovec *iov,
|
||||
unsigned long nr_segs, loff_t pos);
|
||||
extern int cifs_lock(struct file *, int, struct file_lock *);
|
||||
extern int cifs_fsync(struct file *, int);
|
||||
extern int cifs_strict_fsync(struct file *, int);
|
||||
|
|
|
|||
|
|
@ -85,6 +85,8 @@ extern int checkSMB(struct smb_hdr *smb, __u16 mid, unsigned int length);
|
|||
extern bool is_valid_oplock_break(struct smb_hdr *smb,
|
||||
struct TCP_Server_Info *);
|
||||
extern bool is_size_safe_to_change(struct cifsInodeInfo *, __u64 eof);
|
||||
extern void cifs_update_eof(struct cifsInodeInfo *cifsi, loff_t offset,
|
||||
unsigned int bytes_written);
|
||||
extern struct cifsFileInfo *find_writable_file(struct cifsInodeInfo *, bool);
|
||||
extern struct cifsFileInfo *find_readable_file(struct cifsInodeInfo *, bool);
|
||||
extern unsigned int smbCalcSize(struct smb_hdr *ptr);
|
||||
|
|
@ -373,7 +375,7 @@ extern int cifs_sign_smb2(struct kvec *iov, int n_vec, struct TCP_Server_Info *,
|
|||
extern int cifs_verify_signature(struct smb_hdr *,
|
||||
struct TCP_Server_Info *server,
|
||||
__u32 expected_sequence_number);
|
||||
extern void SMBNTencrypt(unsigned char *, unsigned char *, unsigned char *);
|
||||
extern int SMBNTencrypt(unsigned char *, unsigned char *, unsigned char *);
|
||||
extern int setup_ntlm_response(struct cifsSesInfo *);
|
||||
extern int setup_ntlmv2_rsp(struct cifsSesInfo *, const struct nls_table *);
|
||||
extern int cifs_crypto_shash_allocate(struct TCP_Server_Info *);
|
||||
|
|
@ -423,4 +425,11 @@ extern bool CIFSCouldBeMFSymlink(const struct cifs_fattr *fattr);
|
|||
extern int CIFSCheckMFSymlink(struct cifs_fattr *fattr,
|
||||
const unsigned char *path,
|
||||
struct cifs_sb_info *cifs_sb, int xid);
|
||||
extern int mdfour(unsigned char *, unsigned char *, int);
|
||||
extern int E_md4hash(const unsigned char *passwd, unsigned char *p16);
|
||||
extern void SMBencrypt(unsigned char *passwd, const unsigned char *c8,
|
||||
unsigned char *p24);
|
||||
extern void E_P16(unsigned char *p14, unsigned char *p16);
|
||||
extern void E_P24(unsigned char *p21, const unsigned char *c8,
|
||||
unsigned char *p24);
|
||||
#endif /* _CIFSPROTO_H */
|
||||
|
|
|
|||
|
|
@ -55,9 +55,6 @@
|
|||
/* SMB echo "timeout" -- FIXME: tunable? */
|
||||
#define SMB_ECHO_INTERVAL (60 * HZ)
|
||||
|
||||
extern void SMBNTencrypt(unsigned char *passwd, unsigned char *c8,
|
||||
unsigned char *p24);
|
||||
|
||||
extern mempool_t *cifs_req_poolp;
|
||||
|
||||
struct smb_vol {
|
||||
|
|
@ -87,6 +84,7 @@ struct smb_vol {
|
|||
bool no_xattr:1; /* set if xattr (EA) support should be disabled*/
|
||||
bool server_ino:1; /* use inode numbers from server ie UniqueId */
|
||||
bool direct_io:1;
|
||||
bool strict_io:1; /* strict cache behavior */
|
||||
bool remap:1; /* set to remap seven reserved chars in filenames */
|
||||
bool posix_paths:1; /* unset to not ask for posix pathnames. */
|
||||
bool no_linux_ext:1;
|
||||
|
|
@ -1344,6 +1342,8 @@ cifs_parse_mount_options(char *options, const char *devname,
|
|||
vol->direct_io = 1;
|
||||
} else if (strnicmp(data, "forcedirectio", 13) == 0) {
|
||||
vol->direct_io = 1;
|
||||
} else if (strnicmp(data, "strictcache", 11) == 0) {
|
||||
vol->strict_io = 1;
|
||||
} else if (strnicmp(data, "noac", 4) == 0) {
|
||||
printk(KERN_WARNING "CIFS: Mount option noac not "
|
||||
"supported. Instead set "
|
||||
|
|
@ -2584,6 +2584,8 @@ static void setup_cifs_sb(struct smb_vol *pvolume_info,
|
|||
if (pvolume_info->multiuser)
|
||||
cifs_sb->mnt_cifs_flags |= (CIFS_MOUNT_MULTIUSER |
|
||||
CIFS_MOUNT_NO_PERM);
|
||||
if (pvolume_info->strict_io)
|
||||
cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_STRICT_IO;
|
||||
if (pvolume_info->direct_io) {
|
||||
cFYI(1, "mounting share using direct i/o");
|
||||
cifs_sb->mnt_cifs_flags |= CIFS_MOUNT_DIRECT_IO;
|
||||
|
|
@ -2985,7 +2987,8 @@ CIFSTCon(unsigned int xid, struct cifsSesInfo *ses,
|
|||
bcc_ptr);
|
||||
else
|
||||
#endif /* CIFS_WEAK_PW_HASH */
|
||||
SMBNTencrypt(tcon->password, ses->server->cryptkey, bcc_ptr);
|
||||
rc = SMBNTencrypt(tcon->password, ses->server->cryptkey,
|
||||
bcc_ptr);
|
||||
|
||||
bcc_ptr += CIFS_AUTH_RESP_SIZE;
|
||||
if (ses->capabilities & CAP_UNICODE) {
|
||||
|
|
|
|||
202
fs/cifs/file.c
202
fs/cifs/file.c
|
|
@ -848,7 +848,7 @@ int cifs_lock(struct file *file, int cmd, struct file_lock *pfLock)
|
|||
}
|
||||
|
||||
/* update the file size (if needed) after a write */
|
||||
static void
|
||||
void
|
||||
cifs_update_eof(struct cifsInodeInfo *cifsi, loff_t offset,
|
||||
unsigned int bytes_written)
|
||||
{
|
||||
|
|
@ -1619,6 +1619,206 @@ int cifs_flush(struct file *file, fl_owner_t id)
|
|||
return rc;
|
||||
}
|
||||
|
||||
static int
|
||||
cifs_write_allocate_pages(struct page **pages, unsigned long num_pages)
|
||||
{
|
||||
int rc = 0;
|
||||
unsigned long i;
|
||||
|
||||
for (i = 0; i < num_pages; i++) {
|
||||
pages[i] = alloc_page(__GFP_HIGHMEM);
|
||||
if (!pages[i]) {
|
||||
/*
|
||||
* save number of pages we have already allocated and
|
||||
* return with ENOMEM error
|
||||
*/
|
||||
num_pages = i;
|
||||
rc = -ENOMEM;
|
||||
goto error;
|
||||
}
|
||||
}
|
||||
|
||||
return rc;
|
||||
|
||||
error:
|
||||
for (i = 0; i < num_pages; i++)
|
||||
put_page(pages[i]);
|
||||
return rc;
|
||||
}
|
||||
|
||||
static inline
|
||||
size_t get_numpages(const size_t wsize, const size_t len, size_t *cur_len)
|
||||
{
|
||||
size_t num_pages;
|
||||
size_t clen;
|
||||
|
||||
clen = min_t(const size_t, len, wsize);
|
||||
num_pages = clen / PAGE_CACHE_SIZE;
|
||||
if (clen % PAGE_CACHE_SIZE)
|
||||
num_pages++;
|
||||
|
||||
if (cur_len)
|
||||
*cur_len = clen;
|
||||
|
||||
return num_pages;
|
||||
}
|
||||
|
||||
static ssize_t
|
||||
cifs_iovec_write(struct file *file, const struct iovec *iov,
|
||||
unsigned long nr_segs, loff_t *poffset)
|
||||
{
|
||||
size_t total_written = 0, written = 0;
|
||||
unsigned long num_pages, npages;
|
||||
size_t copied, len, cur_len, i;
|
||||
struct kvec *to_send;
|
||||
struct page **pages;
|
||||
struct iov_iter it;
|
||||
struct inode *inode;
|
||||
struct cifsFileInfo *open_file;
|
||||
struct cifsTconInfo *pTcon;
|
||||
struct cifs_sb_info *cifs_sb;
|
||||
int xid, rc;
|
||||
|
||||
len = iov_length(iov, nr_segs);
|
||||
if (!len)
|
||||
return 0;
|
||||
|
||||
rc = generic_write_checks(file, poffset, &len, 0);
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
cifs_sb = CIFS_SB(file->f_path.dentry->d_sb);
|
||||
num_pages = get_numpages(cifs_sb->wsize, len, &cur_len);
|
||||
|
||||
pages = kmalloc(sizeof(struct pages *)*num_pages, GFP_KERNEL);
|
||||
if (!pages)
|
||||
return -ENOMEM;
|
||||
|
||||
to_send = kmalloc(sizeof(struct kvec)*(num_pages + 1), GFP_KERNEL);
|
||||
if (!to_send) {
|
||||
kfree(pages);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
rc = cifs_write_allocate_pages(pages, num_pages);
|
||||
if (rc) {
|
||||
kfree(pages);
|
||||
kfree(to_send);
|
||||
return rc;
|
||||
}
|
||||
|
||||
xid = GetXid();
|
||||
open_file = file->private_data;
|
||||
pTcon = tlink_tcon(open_file->tlink);
|
||||
inode = file->f_path.dentry->d_inode;
|
||||
|
||||
iov_iter_init(&it, iov, nr_segs, len, 0);
|
||||
npages = num_pages;
|
||||
|
||||
do {
|
||||
size_t save_len = cur_len;
|
||||
for (i = 0; i < npages; i++) {
|
||||
copied = min_t(const size_t, cur_len, PAGE_CACHE_SIZE);
|
||||
copied = iov_iter_copy_from_user(pages[i], &it, 0,
|
||||
copied);
|
||||
cur_len -= copied;
|
||||
iov_iter_advance(&it, copied);
|
||||
to_send[i+1].iov_base = kmap(pages[i]);
|
||||
to_send[i+1].iov_len = copied;
|
||||
}
|
||||
|
||||
cur_len = save_len - cur_len;
|
||||
|
||||
do {
|
||||
if (open_file->invalidHandle) {
|
||||
rc = cifs_reopen_file(open_file, false);
|
||||
if (rc != 0)
|
||||
break;
|
||||
}
|
||||
rc = CIFSSMBWrite2(xid, pTcon, open_file->netfid,
|
||||
cur_len, *poffset, &written,
|
||||
to_send, npages, 0);
|
||||
} while (rc == -EAGAIN);
|
||||
|
||||
for (i = 0; i < npages; i++)
|
||||
kunmap(pages[i]);
|
||||
|
||||
if (written) {
|
||||
len -= written;
|
||||
total_written += written;
|
||||
cifs_update_eof(CIFS_I(inode), *poffset, written);
|
||||
*poffset += written;
|
||||
} else if (rc < 0) {
|
||||
if (!total_written)
|
||||
total_written = rc;
|
||||
break;
|
||||
}
|
||||
|
||||
/* get length and number of kvecs of the next write */
|
||||
npages = get_numpages(cifs_sb->wsize, len, &cur_len);
|
||||
} while (len > 0);
|
||||
|
||||
if (total_written > 0) {
|
||||
spin_lock(&inode->i_lock);
|
||||
if (*poffset > inode->i_size)
|
||||
i_size_write(inode, *poffset);
|
||||
spin_unlock(&inode->i_lock);
|
||||
}
|
||||
|
||||
cifs_stats_bytes_written(pTcon, total_written);
|
||||
mark_inode_dirty_sync(inode);
|
||||
|
||||
for (i = 0; i < num_pages; i++)
|
||||
put_page(pages[i]);
|
||||
kfree(to_send);
|
||||
kfree(pages);
|
||||
FreeXid(xid);
|
||||
return total_written;
|
||||
}
|
||||
|
||||
static ssize_t cifs_user_writev(struct kiocb *iocb, const struct iovec *iov,
|
||||
unsigned long nr_segs, loff_t pos)
|
||||
{
|
||||
ssize_t written;
|
||||
struct inode *inode;
|
||||
|
||||
inode = iocb->ki_filp->f_path.dentry->d_inode;
|
||||
|
||||
/*
|
||||
* BB - optimize the way when signing is disabled. We can drop this
|
||||
* extra memory-to-memory copying and use iovec buffers for constructing
|
||||
* write request.
|
||||
*/
|
||||
|
||||
written = cifs_iovec_write(iocb->ki_filp, iov, nr_segs, &pos);
|
||||
if (written > 0) {
|
||||
CIFS_I(inode)->invalid_mapping = true;
|
||||
iocb->ki_pos = pos;
|
||||
}
|
||||
|
||||
return written;
|
||||
}
|
||||
|
||||
ssize_t cifs_strict_writev(struct kiocb *iocb, const struct iovec *iov,
|
||||
unsigned long nr_segs, loff_t pos)
|
||||
{
|
||||
struct inode *inode;
|
||||
|
||||
inode = iocb->ki_filp->f_path.dentry->d_inode;
|
||||
|
||||
if (CIFS_I(inode)->clientCanCacheAll)
|
||||
return generic_file_aio_write(iocb, iov, nr_segs, pos);
|
||||
|
||||
/*
|
||||
* In strict cache mode we need to write the data to the server exactly
|
||||
* from the pos to pos+len-1 rather than flush all affected pages
|
||||
* because it may cause a error with mandatory locks on these pages but
|
||||
* not on the region from pos to ppos+len-1.
|
||||
*/
|
||||
|
||||
return cifs_user_writev(iocb, iov, nr_segs, pos);
|
||||
}
|
||||
|
||||
static ssize_t
|
||||
cifs_iovec_read(struct file *file, const struct iovec *iov,
|
||||
unsigned long nr_segs, loff_t *poffset)
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@
|
|||
#include "cifsproto.h"
|
||||
#include "cifs_debug.h"
|
||||
#include "cifs_fs_sb.h"
|
||||
#include "md5.h"
|
||||
|
||||
#define CIFS_MF_SYMLINK_LEN_OFFSET (4+1)
|
||||
#define CIFS_MF_SYMLINK_MD5_OFFSET (CIFS_MF_SYMLINK_LEN_OFFSET+(4+1))
|
||||
|
|
@ -46,6 +45,44 @@
|
|||
md5_hash[8], md5_hash[9], md5_hash[10], md5_hash[11],\
|
||||
md5_hash[12], md5_hash[13], md5_hash[14], md5_hash[15]
|
||||
|
||||
static int
|
||||
symlink_hash(unsigned int link_len, const char *link_str, u8 *md5_hash)
|
||||
{
|
||||
int rc;
|
||||
unsigned int size;
|
||||
struct crypto_shash *md5;
|
||||
struct sdesc *sdescmd5;
|
||||
|
||||
md5 = crypto_alloc_shash("md5", 0, 0);
|
||||
if (IS_ERR(md5)) {
|
||||
cERROR(1, "%s: Crypto md5 allocation error %d\n", __func__, rc);
|
||||
return PTR_ERR(md5);
|
||||
}
|
||||
size = sizeof(struct shash_desc) + crypto_shash_descsize(md5);
|
||||
sdescmd5 = kmalloc(size, GFP_KERNEL);
|
||||
if (!sdescmd5) {
|
||||
rc = -ENOMEM;
|
||||
cERROR(1, "%s: Memory allocation failure\n", __func__);
|
||||
goto symlink_hash_err;
|
||||
}
|
||||
sdescmd5->shash.tfm = md5;
|
||||
sdescmd5->shash.flags = 0x0;
|
||||
|
||||
rc = crypto_shash_init(&sdescmd5->shash);
|
||||
if (rc) {
|
||||
cERROR(1, "%s: Could not init md5 shash\n", __func__);
|
||||
goto symlink_hash_err;
|
||||
}
|
||||
crypto_shash_update(&sdescmd5->shash, link_str, link_len);
|
||||
rc = crypto_shash_final(&sdescmd5->shash, md5_hash);
|
||||
|
||||
symlink_hash_err:
|
||||
crypto_free_shash(md5);
|
||||
kfree(sdescmd5);
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
static int
|
||||
CIFSParseMFSymlink(const u8 *buf,
|
||||
unsigned int buf_len,
|
||||
|
|
@ -56,7 +93,6 @@ CIFSParseMFSymlink(const u8 *buf,
|
|||
unsigned int link_len;
|
||||
const char *md5_str1;
|
||||
const char *link_str;
|
||||
struct MD5Context md5_ctx;
|
||||
u8 md5_hash[16];
|
||||
char md5_str2[34];
|
||||
|
||||
|
|
@ -70,9 +106,11 @@ CIFSParseMFSymlink(const u8 *buf,
|
|||
if (rc != 1)
|
||||
return -EINVAL;
|
||||
|
||||
cifs_MD5_init(&md5_ctx);
|
||||
cifs_MD5_update(&md5_ctx, (const u8 *)link_str, link_len);
|
||||
cifs_MD5_final(md5_hash, &md5_ctx);
|
||||
rc = symlink_hash(link_len, link_str, md5_hash);
|
||||
if (rc) {
|
||||
cFYI(1, "%s: MD5 hash failure: %d\n", __func__, rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
snprintf(md5_str2, sizeof(md5_str2),
|
||||
CIFS_MF_SYMLINK_MD5_FORMAT,
|
||||
|
|
@ -94,9 +132,9 @@ CIFSParseMFSymlink(const u8 *buf,
|
|||
static int
|
||||
CIFSFormatMFSymlink(u8 *buf, unsigned int buf_len, const char *link_str)
|
||||
{
|
||||
int rc;
|
||||
unsigned int link_len;
|
||||
unsigned int ofs;
|
||||
struct MD5Context md5_ctx;
|
||||
u8 md5_hash[16];
|
||||
|
||||
if (buf_len != CIFS_MF_SYMLINK_FILE_SIZE)
|
||||
|
|
@ -107,9 +145,11 @@ CIFSFormatMFSymlink(u8 *buf, unsigned int buf_len, const char *link_str)
|
|||
if (link_len > CIFS_MF_SYMLINK_LINK_MAXLEN)
|
||||
return -ENAMETOOLONG;
|
||||
|
||||
cifs_MD5_init(&md5_ctx);
|
||||
cifs_MD5_update(&md5_ctx, (const u8 *)link_str, link_len);
|
||||
cifs_MD5_final(md5_hash, &md5_ctx);
|
||||
rc = symlink_hash(link_len, link_str, md5_hash);
|
||||
if (rc) {
|
||||
cFYI(1, "%s: MD5 hash failure: %d\n", __func__, rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
snprintf(buf, buf_len,
|
||||
CIFS_MF_SYMLINK_LEN_FORMAT CIFS_MF_SYMLINK_MD5_FORMAT,
|
||||
|
|
|
|||
205
fs/cifs/md4.c
205
fs/cifs/md4.c
|
|
@ -1,205 +0,0 @@
|
|||
/*
|
||||
Unix SMB/Netbios implementation.
|
||||
Version 1.9.
|
||||
a implementation of MD4 designed for use in the SMB authentication protocol
|
||||
Copyright (C) Andrew Tridgell 1997-1998.
|
||||
Modified by Steve French (sfrench@us.ibm.com) 2002-2003
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
#include <linux/module.h>
|
||||
#include <linux/fs.h>
|
||||
#include "cifsencrypt.h"
|
||||
|
||||
/* NOTE: This code makes no attempt to be fast! */
|
||||
|
||||
static __u32
|
||||
F(__u32 X, __u32 Y, __u32 Z)
|
||||
{
|
||||
return (X & Y) | ((~X) & Z);
|
||||
}
|
||||
|
||||
static __u32
|
||||
G(__u32 X, __u32 Y, __u32 Z)
|
||||
{
|
||||
return (X & Y) | (X & Z) | (Y & Z);
|
||||
}
|
||||
|
||||
static __u32
|
||||
H(__u32 X, __u32 Y, __u32 Z)
|
||||
{
|
||||
return X ^ Y ^ Z;
|
||||
}
|
||||
|
||||
static __u32
|
||||
lshift(__u32 x, int s)
|
||||
{
|
||||
x &= 0xFFFFFFFF;
|
||||
return ((x << s) & 0xFFFFFFFF) | (x >> (32 - s));
|
||||
}
|
||||
|
||||
#define ROUND1(a,b,c,d,k,s) (*a) = lshift((*a) + F(*b,*c,*d) + X[k], s)
|
||||
#define ROUND2(a,b,c,d,k,s) (*a) = lshift((*a) + G(*b,*c,*d) + X[k] + (__u32)0x5A827999,s)
|
||||
#define ROUND3(a,b,c,d,k,s) (*a) = lshift((*a) + H(*b,*c,*d) + X[k] + (__u32)0x6ED9EBA1,s)
|
||||
|
||||
/* this applies md4 to 64 byte chunks */
|
||||
static void
|
||||
mdfour64(__u32 *M, __u32 *A, __u32 *B, __u32 *C, __u32 *D)
|
||||
{
|
||||
int j;
|
||||
__u32 AA, BB, CC, DD;
|
||||
__u32 X[16];
|
||||
|
||||
|
||||
for (j = 0; j < 16; j++)
|
||||
X[j] = M[j];
|
||||
|
||||
AA = *A;
|
||||
BB = *B;
|
||||
CC = *C;
|
||||
DD = *D;
|
||||
|
||||
ROUND1(A, B, C, D, 0, 3);
|
||||
ROUND1(D, A, B, C, 1, 7);
|
||||
ROUND1(C, D, A, B, 2, 11);
|
||||
ROUND1(B, C, D, A, 3, 19);
|
||||
ROUND1(A, B, C, D, 4, 3);
|
||||
ROUND1(D, A, B, C, 5, 7);
|
||||
ROUND1(C, D, A, B, 6, 11);
|
||||
ROUND1(B, C, D, A, 7, 19);
|
||||
ROUND1(A, B, C, D, 8, 3);
|
||||
ROUND1(D, A, B, C, 9, 7);
|
||||
ROUND1(C, D, A, B, 10, 11);
|
||||
ROUND1(B, C, D, A, 11, 19);
|
||||
ROUND1(A, B, C, D, 12, 3);
|
||||
ROUND1(D, A, B, C, 13, 7);
|
||||
ROUND1(C, D, A, B, 14, 11);
|
||||
ROUND1(B, C, D, A, 15, 19);
|
||||
|
||||
ROUND2(A, B, C, D, 0, 3);
|
||||
ROUND2(D, A, B, C, 4, 5);
|
||||
ROUND2(C, D, A, B, 8, 9);
|
||||
ROUND2(B, C, D, A, 12, 13);
|
||||
ROUND2(A, B, C, D, 1, 3);
|
||||
ROUND2(D, A, B, C, 5, 5);
|
||||
ROUND2(C, D, A, B, 9, 9);
|
||||
ROUND2(B, C, D, A, 13, 13);
|
||||
ROUND2(A, B, C, D, 2, 3);
|
||||
ROUND2(D, A, B, C, 6, 5);
|
||||
ROUND2(C, D, A, B, 10, 9);
|
||||
ROUND2(B, C, D, A, 14, 13);
|
||||
ROUND2(A, B, C, D, 3, 3);
|
||||
ROUND2(D, A, B, C, 7, 5);
|
||||
ROUND2(C, D, A, B, 11, 9);
|
||||
ROUND2(B, C, D, A, 15, 13);
|
||||
|
||||
ROUND3(A, B, C, D, 0, 3);
|
||||
ROUND3(D, A, B, C, 8, 9);
|
||||
ROUND3(C, D, A, B, 4, 11);
|
||||
ROUND3(B, C, D, A, 12, 15);
|
||||
ROUND3(A, B, C, D, 2, 3);
|
||||
ROUND3(D, A, B, C, 10, 9);
|
||||
ROUND3(C, D, A, B, 6, 11);
|
||||
ROUND3(B, C, D, A, 14, 15);
|
||||
ROUND3(A, B, C, D, 1, 3);
|
||||
ROUND3(D, A, B, C, 9, 9);
|
||||
ROUND3(C, D, A, B, 5, 11);
|
||||
ROUND3(B, C, D, A, 13, 15);
|
||||
ROUND3(A, B, C, D, 3, 3);
|
||||
ROUND3(D, A, B, C, 11, 9);
|
||||
ROUND3(C, D, A, B, 7, 11);
|
||||
ROUND3(B, C, D, A, 15, 15);
|
||||
|
||||
*A += AA;
|
||||
*B += BB;
|
||||
*C += CC;
|
||||
*D += DD;
|
||||
|
||||
*A &= 0xFFFFFFFF;
|
||||
*B &= 0xFFFFFFFF;
|
||||
*C &= 0xFFFFFFFF;
|
||||
*D &= 0xFFFFFFFF;
|
||||
|
||||
for (j = 0; j < 16; j++)
|
||||
X[j] = 0;
|
||||
}
|
||||
|
||||
static void
|
||||
copy64(__u32 *M, unsigned char *in)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < 16; i++)
|
||||
M[i] = (in[i * 4 + 3] << 24) | (in[i * 4 + 2] << 16) |
|
||||
(in[i * 4 + 1] << 8) | (in[i * 4 + 0] << 0);
|
||||
}
|
||||
|
||||
static void
|
||||
copy4(unsigned char *out, __u32 x)
|
||||
{
|
||||
out[0] = x & 0xFF;
|
||||
out[1] = (x >> 8) & 0xFF;
|
||||
out[2] = (x >> 16) & 0xFF;
|
||||
out[3] = (x >> 24) & 0xFF;
|
||||
}
|
||||
|
||||
/* produce a md4 message digest from data of length n bytes */
|
||||
void
|
||||
mdfour(unsigned char *out, unsigned char *in, int n)
|
||||
{
|
||||
unsigned char buf[128];
|
||||
__u32 M[16];
|
||||
__u32 b = n * 8;
|
||||
int i;
|
||||
__u32 A = 0x67452301;
|
||||
__u32 B = 0xefcdab89;
|
||||
__u32 C = 0x98badcfe;
|
||||
__u32 D = 0x10325476;
|
||||
|
||||
while (n > 64) {
|
||||
copy64(M, in);
|
||||
mdfour64(M, &A, &B, &C, &D);
|
||||
in += 64;
|
||||
n -= 64;
|
||||
}
|
||||
|
||||
for (i = 0; i < 128; i++)
|
||||
buf[i] = 0;
|
||||
memcpy(buf, in, n);
|
||||
buf[n] = 0x80;
|
||||
|
||||
if (n <= 55) {
|
||||
copy4(buf + 56, b);
|
||||
copy64(M, buf);
|
||||
mdfour64(M, &A, &B, &C, &D);
|
||||
} else {
|
||||
copy4(buf + 120, b);
|
||||
copy64(M, buf);
|
||||
mdfour64(M, &A, &B, &C, &D);
|
||||
copy64(M, buf + 64);
|
||||
mdfour64(M, &A, &B, &C, &D);
|
||||
}
|
||||
|
||||
for (i = 0; i < 128; i++)
|
||||
buf[i] = 0;
|
||||
copy64(M, buf);
|
||||
|
||||
copy4(out, A);
|
||||
copy4(out + 4, B);
|
||||
copy4(out + 8, C);
|
||||
copy4(out + 12, D);
|
||||
|
||||
A = B = C = D = 0;
|
||||
}
|
||||
366
fs/cifs/md5.c
366
fs/cifs/md5.c
|
|
@ -1,366 +0,0 @@
|
|||
/*
|
||||
* This code implements the MD5 message-digest algorithm.
|
||||
* The algorithm is due to Ron Rivest. This code was
|
||||
* written by Colin Plumb in 1993, no copyright is claimed.
|
||||
* This code is in the public domain; do with it what you wish.
|
||||
*
|
||||
* Equivalent code is available from RSA Data Security, Inc.
|
||||
* This code has been tested against that, and is equivalent,
|
||||
* except that you don't need to include two pages of legalese
|
||||
* with every copy.
|
||||
*
|
||||
* To compute the message digest of a chunk of bytes, declare an
|
||||
* MD5Context structure, pass it to cifs_MD5_init, call cifs_MD5_update as
|
||||
* needed on buffers full of bytes, and then call cifs_MD5_final, which
|
||||
* will fill a supplied 16-byte array with the digest.
|
||||
*/
|
||||
|
||||
/* This code slightly modified to fit into Samba by
|
||||
abartlet@samba.org Jun 2001
|
||||
and to fit the cifs vfs by
|
||||
Steve French sfrench@us.ibm.com */
|
||||
|
||||
#include <linux/string.h>
|
||||
#include "md5.h"
|
||||
|
||||
static void MD5Transform(__u32 buf[4], __u32 const in[16]);
|
||||
|
||||
/*
|
||||
* Note: this code is harmless on little-endian machines.
|
||||
*/
|
||||
static void
|
||||
byteReverse(unsigned char *buf, unsigned longs)
|
||||
{
|
||||
__u32 t;
|
||||
do {
|
||||
t = (__u32) ((unsigned) buf[3] << 8 | buf[2]) << 16 |
|
||||
((unsigned) buf[1] << 8 | buf[0]);
|
||||
*(__u32 *) buf = t;
|
||||
buf += 4;
|
||||
} while (--longs);
|
||||
}
|
||||
|
||||
/*
|
||||
* Start MD5 accumulation. Set bit count to 0 and buffer to mysterious
|
||||
* initialization constants.
|
||||
*/
|
||||
void
|
||||
cifs_MD5_init(struct MD5Context *ctx)
|
||||
{
|
||||
ctx->buf[0] = 0x67452301;
|
||||
ctx->buf[1] = 0xefcdab89;
|
||||
ctx->buf[2] = 0x98badcfe;
|
||||
ctx->buf[3] = 0x10325476;
|
||||
|
||||
ctx->bits[0] = 0;
|
||||
ctx->bits[1] = 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Update context to reflect the concatenation of another buffer full
|
||||
* of bytes.
|
||||
*/
|
||||
void
|
||||
cifs_MD5_update(struct MD5Context *ctx, unsigned char const *buf, unsigned len)
|
||||
{
|
||||
register __u32 t;
|
||||
|
||||
/* Update bitcount */
|
||||
|
||||
t = ctx->bits[0];
|
||||
if ((ctx->bits[0] = t + ((__u32) len << 3)) < t)
|
||||
ctx->bits[1]++; /* Carry from low to high */
|
||||
ctx->bits[1] += len >> 29;
|
||||
|
||||
t = (t >> 3) & 0x3f; /* Bytes already in shsInfo->data */
|
||||
|
||||
/* Handle any leading odd-sized chunks */
|
||||
|
||||
if (t) {
|
||||
unsigned char *p = (unsigned char *) ctx->in + t;
|
||||
|
||||
t = 64 - t;
|
||||
if (len < t) {
|
||||
memmove(p, buf, len);
|
||||
return;
|
||||
}
|
||||
memmove(p, buf, t);
|
||||
byteReverse(ctx->in, 16);
|
||||
MD5Transform(ctx->buf, (__u32 *) ctx->in);
|
||||
buf += t;
|
||||
len -= t;
|
||||
}
|
||||
/* Process data in 64-byte chunks */
|
||||
|
||||
while (len >= 64) {
|
||||
memmove(ctx->in, buf, 64);
|
||||
byteReverse(ctx->in, 16);
|
||||
MD5Transform(ctx->buf, (__u32 *) ctx->in);
|
||||
buf += 64;
|
||||
len -= 64;
|
||||
}
|
||||
|
||||
/* Handle any remaining bytes of data. */
|
||||
|
||||
memmove(ctx->in, buf, len);
|
||||
}
|
||||
|
||||
/*
|
||||
* Final wrapup - pad to 64-byte boundary with the bit pattern
|
||||
* 1 0* (64-bit count of bits processed, MSB-first)
|
||||
*/
|
||||
void
|
||||
cifs_MD5_final(unsigned char digest[16], struct MD5Context *ctx)
|
||||
{
|
||||
unsigned int count;
|
||||
unsigned char *p;
|
||||
|
||||
/* Compute number of bytes mod 64 */
|
||||
count = (ctx->bits[0] >> 3) & 0x3F;
|
||||
|
||||
/* Set the first char of padding to 0x80. This is safe since there is
|
||||
always at least one byte free */
|
||||
p = ctx->in + count;
|
||||
*p++ = 0x80;
|
||||
|
||||
/* Bytes of padding needed to make 64 bytes */
|
||||
count = 64 - 1 - count;
|
||||
|
||||
/* Pad out to 56 mod 64 */
|
||||
if (count < 8) {
|
||||
/* Two lots of padding: Pad the first block to 64 bytes */
|
||||
memset(p, 0, count);
|
||||
byteReverse(ctx->in, 16);
|
||||
MD5Transform(ctx->buf, (__u32 *) ctx->in);
|
||||
|
||||
/* Now fill the next block with 56 bytes */
|
||||
memset(ctx->in, 0, 56);
|
||||
} else {
|
||||
/* Pad block to 56 bytes */
|
||||
memset(p, 0, count - 8);
|
||||
}
|
||||
byteReverse(ctx->in, 14);
|
||||
|
||||
/* Append length in bits and transform */
|
||||
((__u32 *) ctx->in)[14] = ctx->bits[0];
|
||||
((__u32 *) ctx->in)[15] = ctx->bits[1];
|
||||
|
||||
MD5Transform(ctx->buf, (__u32 *) ctx->in);
|
||||
byteReverse((unsigned char *) ctx->buf, 4);
|
||||
memmove(digest, ctx->buf, 16);
|
||||
memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */
|
||||
}
|
||||
|
||||
/* The four core functions - F1 is optimized somewhat */
|
||||
|
||||
/* #define F1(x, y, z) (x & y | ~x & z) */
|
||||
#define F1(x, y, z) (z ^ (x & (y ^ z)))
|
||||
#define F2(x, y, z) F1(z, x, y)
|
||||
#define F3(x, y, z) (x ^ y ^ z)
|
||||
#define F4(x, y, z) (y ^ (x | ~z))
|
||||
|
||||
/* This is the central step in the MD5 algorithm. */
|
||||
#define MD5STEP(f, w, x, y, z, data, s) \
|
||||
(w += f(x, y, z) + data, w = w<<s | w>>(32-s), w += x)
|
||||
|
||||
/*
|
||||
* The core of the MD5 algorithm, this alters an existing MD5 hash to
|
||||
* reflect the addition of 16 longwords of new data. cifs_MD5_update blocks
|
||||
* the data and converts bytes into longwords for this routine.
|
||||
*/
|
||||
static void
|
||||
MD5Transform(__u32 buf[4], __u32 const in[16])
|
||||
{
|
||||
register __u32 a, b, c, d;
|
||||
|
||||
a = buf[0];
|
||||
b = buf[1];
|
||||
c = buf[2];
|
||||
d = buf[3];
|
||||
|
||||
MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
|
||||
MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
|
||||
MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
|
||||
MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
|
||||
MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
|
||||
MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
|
||||
MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
|
||||
MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
|
||||
MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
|
||||
MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
|
||||
MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
|
||||
MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
|
||||
MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
|
||||
MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
|
||||
MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
|
||||
MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
|
||||
|
||||
MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
|
||||
MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
|
||||
MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
|
||||
MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
|
||||
MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
|
||||
MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
|
||||
MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
|
||||
MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
|
||||
MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
|
||||
MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
|
||||
MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
|
||||
MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
|
||||
MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
|
||||
MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
|
||||
MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
|
||||
MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
|
||||
|
||||
MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
|
||||
MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
|
||||
MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
|
||||
MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
|
||||
MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
|
||||
MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
|
||||
MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
|
||||
MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
|
||||
MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
|
||||
MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
|
||||
MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
|
||||
MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
|
||||
MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
|
||||
MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
|
||||
MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
|
||||
MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
|
||||
|
||||
MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
|
||||
MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
|
||||
MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
|
||||
MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
|
||||
MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
|
||||
MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
|
||||
MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
|
||||
MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
|
||||
MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
|
||||
MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
|
||||
MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
|
||||
MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
|
||||
MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
|
||||
MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
|
||||
MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
|
||||
MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
|
||||
|
||||
buf[0] += a;
|
||||
buf[1] += b;
|
||||
buf[2] += c;
|
||||
buf[3] += d;
|
||||
}
|
||||
|
||||
#if 0 /* currently unused */
|
||||
/***********************************************************************
|
||||
the rfc 2104 version of hmac_md5 initialisation.
|
||||
***********************************************************************/
|
||||
static void
|
||||
hmac_md5_init_rfc2104(unsigned char *key, int key_len,
|
||||
struct HMACMD5Context *ctx)
|
||||
{
|
||||
int i;
|
||||
|
||||
/* if key is longer than 64 bytes reset it to key=MD5(key) */
|
||||
if (key_len > 64) {
|
||||
unsigned char tk[16];
|
||||
struct MD5Context tctx;
|
||||
|
||||
cifs_MD5_init(&tctx);
|
||||
cifs_MD5_update(&tctx, key, key_len);
|
||||
cifs_MD5_final(tk, &tctx);
|
||||
|
||||
key = tk;
|
||||
key_len = 16;
|
||||
}
|
||||
|
||||
/* start out by storing key in pads */
|
||||
memset(ctx->k_ipad, 0, sizeof(ctx->k_ipad));
|
||||
memset(ctx->k_opad, 0, sizeof(ctx->k_opad));
|
||||
memcpy(ctx->k_ipad, key, key_len);
|
||||
memcpy(ctx->k_opad, key, key_len);
|
||||
|
||||
/* XOR key with ipad and opad values */
|
||||
for (i = 0; i < 64; i++) {
|
||||
ctx->k_ipad[i] ^= 0x36;
|
||||
ctx->k_opad[i] ^= 0x5c;
|
||||
}
|
||||
|
||||
cifs_MD5_init(&ctx->ctx);
|
||||
cifs_MD5_update(&ctx->ctx, ctx->k_ipad, 64);
|
||||
}
|
||||
#endif
|
||||
|
||||
/***********************************************************************
|
||||
the microsoft version of hmac_md5 initialisation.
|
||||
***********************************************************************/
|
||||
void
|
||||
hmac_md5_init_limK_to_64(const unsigned char *key, int key_len,
|
||||
struct HMACMD5Context *ctx)
|
||||
{
|
||||
int i;
|
||||
|
||||
/* if key is longer than 64 bytes truncate it */
|
||||
if (key_len > 64)
|
||||
key_len = 64;
|
||||
|
||||
/* start out by storing key in pads */
|
||||
memset(ctx->k_ipad, 0, sizeof(ctx->k_ipad));
|
||||
memset(ctx->k_opad, 0, sizeof(ctx->k_opad));
|
||||
memcpy(ctx->k_ipad, key, key_len);
|
||||
memcpy(ctx->k_opad, key, key_len);
|
||||
|
||||
/* XOR key with ipad and opad values */
|
||||
for (i = 0; i < 64; i++) {
|
||||
ctx->k_ipad[i] ^= 0x36;
|
||||
ctx->k_opad[i] ^= 0x5c;
|
||||
}
|
||||
|
||||
cifs_MD5_init(&ctx->ctx);
|
||||
cifs_MD5_update(&ctx->ctx, ctx->k_ipad, 64);
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
update hmac_md5 "inner" buffer
|
||||
***********************************************************************/
|
||||
void
|
||||
hmac_md5_update(const unsigned char *text, int text_len,
|
||||
struct HMACMD5Context *ctx)
|
||||
{
|
||||
cifs_MD5_update(&ctx->ctx, text, text_len); /* then text of datagram */
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
finish off hmac_md5 "inner" buffer and generate outer one.
|
||||
***********************************************************************/
|
||||
void
|
||||
hmac_md5_final(unsigned char *digest, struct HMACMD5Context *ctx)
|
||||
{
|
||||
struct MD5Context ctx_o;
|
||||
|
||||
cifs_MD5_final(digest, &ctx->ctx);
|
||||
|
||||
cifs_MD5_init(&ctx_o);
|
||||
cifs_MD5_update(&ctx_o, ctx->k_opad, 64);
|
||||
cifs_MD5_update(&ctx_o, digest, 16);
|
||||
cifs_MD5_final(digest, &ctx_o);
|
||||
}
|
||||
|
||||
/***********************************************************
|
||||
single function to calculate an HMAC MD5 digest from data.
|
||||
use the microsoft hmacmd5 init method because the key is 16 bytes.
|
||||
************************************************************/
|
||||
#if 0 /* currently unused */
|
||||
static void
|
||||
hmac_md5(unsigned char key[16], unsigned char *data, int data_len,
|
||||
unsigned char *digest)
|
||||
{
|
||||
struct HMACMD5Context ctx;
|
||||
hmac_md5_init_limK_to_64(key, 16, &ctx);
|
||||
if (data_len != 0)
|
||||
hmac_md5_update(data, data_len, &ctx);
|
||||
|
||||
hmac_md5_final(digest, &ctx);
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
#ifndef MD5_H
|
||||
#define MD5_H
|
||||
#ifndef HEADER_MD5_H
|
||||
/* Try to avoid clashes with OpenSSL */
|
||||
#define HEADER_MD5_H
|
||||
#endif
|
||||
|
||||
struct MD5Context {
|
||||
__u32 buf[4];
|
||||
__u32 bits[2];
|
||||
unsigned char in[64];
|
||||
};
|
||||
#endif /* !MD5_H */
|
||||
|
||||
#ifndef _HMAC_MD5_H
|
||||
struct HMACMD5Context {
|
||||
struct MD5Context ctx;
|
||||
unsigned char k_ipad[65];
|
||||
unsigned char k_opad[65];
|
||||
};
|
||||
#endif /* _HMAC_MD5_H */
|
||||
|
||||
void cifs_MD5_init(struct MD5Context *context);
|
||||
void cifs_MD5_update(struct MD5Context *context, unsigned char const *buf,
|
||||
unsigned len);
|
||||
void cifs_MD5_final(unsigned char digest[16], struct MD5Context *context);
|
||||
|
||||
/* The following definitions come from lib/hmacmd5.c */
|
||||
|
||||
/* void hmac_md5_init_rfc2104(unsigned char *key, int key_len,
|
||||
struct HMACMD5Context *ctx);*/
|
||||
void hmac_md5_init_limK_to_64(const unsigned char *key, int key_len,
|
||||
struct HMACMD5Context *ctx);
|
||||
void hmac_md5_update(const unsigned char *text, int text_len,
|
||||
struct HMACMD5Context *ctx);
|
||||
void hmac_md5_final(unsigned char *digest, struct HMACMD5Context *ctx);
|
||||
/* void hmac_md5(unsigned char key[16], unsigned char *data, int data_len,
|
||||
unsigned char *digest);*/
|
||||
|
|
@ -45,7 +45,6 @@
|
|||
up with a different answer to the one above)
|
||||
*/
|
||||
#include <linux/slab.h>
|
||||
#include "cifsencrypt.h"
|
||||
#define uchar unsigned char
|
||||
|
||||
static uchar perm1[56] = { 57, 49, 41, 33, 25, 17, 9,
|
||||
|
|
|
|||
|
|
@ -32,9 +32,8 @@
|
|||
#include "cifs_unicode.h"
|
||||
#include "cifspdu.h"
|
||||
#include "cifsglob.h"
|
||||
#include "md5.h"
|
||||
#include "cifs_debug.h"
|
||||
#include "cifsencrypt.h"
|
||||
#include "cifsproto.h"
|
||||
|
||||
#ifndef false
|
||||
#define false 0
|
||||
|
|
@ -48,14 +47,57 @@
|
|||
#define SSVALX(buf,pos,val) (CVAL(buf,pos)=(val)&0xFF,CVAL(buf,pos+1)=(val)>>8)
|
||||
#define SSVAL(buf,pos,val) SSVALX((buf),(pos),((__u16)(val)))
|
||||
|
||||
/*The following definitions come from libsmb/smbencrypt.c */
|
||||
/* produce a md4 message digest from data of length n bytes */
|
||||
int
|
||||
mdfour(unsigned char *md4_hash, unsigned char *link_str, int link_len)
|
||||
{
|
||||
int rc;
|
||||
unsigned int size;
|
||||
struct crypto_shash *md4;
|
||||
struct sdesc *sdescmd4;
|
||||
|
||||
void SMBencrypt(unsigned char *passwd, const unsigned char *c8,
|
||||
unsigned char *p24);
|
||||
void E_md4hash(const unsigned char *passwd, unsigned char *p16);
|
||||
static void SMBOWFencrypt(unsigned char passwd[16], const unsigned char *c8,
|
||||
unsigned char p24[24]);
|
||||
void SMBNTencrypt(unsigned char *passwd, unsigned char *c8, unsigned char *p24);
|
||||
md4 = crypto_alloc_shash("md4", 0, 0);
|
||||
if (IS_ERR(md4)) {
|
||||
cERROR(1, "%s: Crypto md4 allocation error %d\n", __func__, rc);
|
||||
return PTR_ERR(md4);
|
||||
}
|
||||
size = sizeof(struct shash_desc) + crypto_shash_descsize(md4);
|
||||
sdescmd4 = kmalloc(size, GFP_KERNEL);
|
||||
if (!sdescmd4) {
|
||||
rc = -ENOMEM;
|
||||
cERROR(1, "%s: Memory allocation failure\n", __func__);
|
||||
goto mdfour_err;
|
||||
}
|
||||
sdescmd4->shash.tfm = md4;
|
||||
sdescmd4->shash.flags = 0x0;
|
||||
|
||||
rc = crypto_shash_init(&sdescmd4->shash);
|
||||
if (rc) {
|
||||
cERROR(1, "%s: Could not init md4 shash\n", __func__);
|
||||
goto mdfour_err;
|
||||
}
|
||||
crypto_shash_update(&sdescmd4->shash, link_str, link_len);
|
||||
rc = crypto_shash_final(&sdescmd4->shash, md4_hash);
|
||||
|
||||
mdfour_err:
|
||||
crypto_free_shash(md4);
|
||||
kfree(sdescmd4);
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* Does the des encryption from the NT or LM MD4 hash. */
|
||||
static void
|
||||
SMBOWFencrypt(unsigned char passwd[16], const unsigned char *c8,
|
||||
unsigned char p24[24])
|
||||
{
|
||||
unsigned char p21[21];
|
||||
|
||||
memset(p21, '\0', 21);
|
||||
|
||||
memcpy(p21, passwd, 16);
|
||||
E_P24(p21, c8, p24);
|
||||
}
|
||||
|
||||
/*
|
||||
This implements the X/Open SMB password encryption
|
||||
|
|
@ -118,9 +160,10 @@ _my_mbstowcs(__u16 *dst, const unsigned char *src, int len)
|
|||
* Creates the MD4 Hash of the users password in NT UNICODE.
|
||||
*/
|
||||
|
||||
void
|
||||
int
|
||||
E_md4hash(const unsigned char *passwd, unsigned char *p16)
|
||||
{
|
||||
int rc;
|
||||
int len;
|
||||
__u16 wpwd[129];
|
||||
|
||||
|
|
@ -139,8 +182,10 @@ E_md4hash(const unsigned char *passwd, unsigned char *p16)
|
|||
/* Calculate length in bytes */
|
||||
len = _my_wcslen(wpwd) * sizeof(__u16);
|
||||
|
||||
mdfour(p16, (unsigned char *) wpwd, len);
|
||||
rc = mdfour(p16, (unsigned char *) wpwd, len);
|
||||
memset(wpwd, 0, 129 * 2);
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
#if 0 /* currently unused */
|
||||
|
|
@ -212,19 +257,6 @@ ntv2_owf_gen(const unsigned char owf[16], const char *user_n,
|
|||
}
|
||||
#endif
|
||||
|
||||
/* Does the des encryption from the NT or LM MD4 hash. */
|
||||
static void
|
||||
SMBOWFencrypt(unsigned char passwd[16], const unsigned char *c8,
|
||||
unsigned char p24[24])
|
||||
{
|
||||
unsigned char p21[21];
|
||||
|
||||
memset(p21, '\0', 21);
|
||||
|
||||
memcpy(p21, passwd, 16);
|
||||
E_P24(p21, c8, p24);
|
||||
}
|
||||
|
||||
/* Does the des encryption from the FIRST 8 BYTES of the NT or LM MD4 hash. */
|
||||
#if 0 /* currently unused */
|
||||
static void
|
||||
|
|
@ -242,16 +274,21 @@ NTLMSSPOWFencrypt(unsigned char passwd[8],
|
|||
#endif
|
||||
|
||||
/* Does the NT MD4 hash then des encryption. */
|
||||
|
||||
void
|
||||
int
|
||||
SMBNTencrypt(unsigned char *passwd, unsigned char *c8, unsigned char *p24)
|
||||
{
|
||||
int rc;
|
||||
unsigned char p21[21];
|
||||
|
||||
memset(p21, '\0', 21);
|
||||
|
||||
E_md4hash(passwd, p21);
|
||||
rc = E_md4hash(passwd, p21);
|
||||
if (rc) {
|
||||
cFYI(1, "%s Can't generate NT hash, error: %d", __func__, rc);
|
||||
return rc;
|
||||
}
|
||||
SMBOWFencrypt(p21, c8, p24);
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue