573dbd9596
Since the patch to add a NULL short-circuit to crypto_free_tfm() went in, there's no longer any need for callers of that function to check for NULL. This patch removes the redundant NULL checks and also a few similar checks for NULL before calls to kfree() that I ran into while doing the crypto_free_tfm bits. I've succesfuly compile tested this patch, and a kernel with the patch applied boots and runs just fine. When I posted the patch to LKML (and other lists/people on Cc) it drew the following comments : J. Bruce Fields commented "I've no problem with the auth_gss or nfsv4 bits.--b." Sridhar Samudrala said "sctp change looks fine." Herbert Xu signed off on the patch. So, I guess this is ready to be dropped into -mm and eventually mainline. Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
207 lines
5.4 KiB
C
207 lines
5.4 KiB
C
/*
|
|
* linux/net/sunrpc/gss_krb5_crypto.c
|
|
*
|
|
* Copyright (c) 2000 The Regents of the University of Michigan.
|
|
* All rights reserved.
|
|
*
|
|
* Andy Adamson <andros@umich.edu>
|
|
* Bruce Fields <bfields@umich.edu>
|
|
*/
|
|
|
|
/*
|
|
* Copyright (C) 1998 by the FundsXpress, INC.
|
|
*
|
|
* All rights reserved.
|
|
*
|
|
* Export of this software from the United States of America may require
|
|
* a specific license from the United States Government. It is the
|
|
* responsibility of any person or organization contemplating export to
|
|
* obtain such a license before exporting.
|
|
*
|
|
* WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
|
|
* distribute this software and its documentation for any purpose and
|
|
* without fee is hereby granted, provided that the above copyright
|
|
* notice appear in all copies and that both that copyright notice and
|
|
* this permission notice appear in supporting documentation, and that
|
|
* the name of FundsXpress. not be used in advertising or publicity pertaining
|
|
* to distribution of the software without specific, written prior
|
|
* permission. FundsXpress makes no representations about the suitability of
|
|
* this software for any purpose. It is provided "as is" without express
|
|
* or implied warranty.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
|
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
*/
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/slab.h>
|
|
#include <asm/scatterlist.h>
|
|
#include <linux/crypto.h>
|
|
#include <linux/highmem.h>
|
|
#include <linux/pagemap.h>
|
|
#include <linux/sunrpc/gss_krb5.h>
|
|
|
|
#ifdef RPC_DEBUG
|
|
# define RPCDBG_FACILITY RPCDBG_AUTH
|
|
#endif
|
|
|
|
u32
|
|
krb5_encrypt(
|
|
struct crypto_tfm *tfm,
|
|
void * iv,
|
|
void * in,
|
|
void * out,
|
|
int length)
|
|
{
|
|
u32 ret = -EINVAL;
|
|
struct scatterlist sg[1];
|
|
u8 local_iv[16] = {0};
|
|
|
|
dprintk("RPC: krb5_encrypt: input data:\n");
|
|
print_hexl((u32 *)in, length, 0);
|
|
|
|
if (length % crypto_tfm_alg_blocksize(tfm) != 0)
|
|
goto out;
|
|
|
|
if (crypto_tfm_alg_ivsize(tfm) > 16) {
|
|
dprintk("RPC: gss_k5encrypt: tfm iv size to large %d\n",
|
|
crypto_tfm_alg_ivsize(tfm));
|
|
goto out;
|
|
}
|
|
|
|
if (iv)
|
|
memcpy(local_iv, iv, crypto_tfm_alg_ivsize(tfm));
|
|
|
|
memcpy(out, in, length);
|
|
sg[0].page = virt_to_page(out);
|
|
sg[0].offset = offset_in_page(out);
|
|
sg[0].length = length;
|
|
|
|
ret = crypto_cipher_encrypt_iv(tfm, sg, sg, length, local_iv);
|
|
|
|
dprintk("RPC: krb5_encrypt: output data:\n");
|
|
print_hexl((u32 *)out, length, 0);
|
|
out:
|
|
dprintk("RPC: krb5_encrypt returns %d\n",ret);
|
|
return(ret);
|
|
}
|
|
|
|
EXPORT_SYMBOL(krb5_encrypt);
|
|
|
|
u32
|
|
krb5_decrypt(
|
|
struct crypto_tfm *tfm,
|
|
void * iv,
|
|
void * in,
|
|
void * out,
|
|
int length)
|
|
{
|
|
u32 ret = -EINVAL;
|
|
struct scatterlist sg[1];
|
|
u8 local_iv[16] = {0};
|
|
|
|
dprintk("RPC: krb5_decrypt: input data:\n");
|
|
print_hexl((u32 *)in, length, 0);
|
|
|
|
if (length % crypto_tfm_alg_blocksize(tfm) != 0)
|
|
goto out;
|
|
|
|
if (crypto_tfm_alg_ivsize(tfm) > 16) {
|
|
dprintk("RPC: gss_k5decrypt: tfm iv size to large %d\n",
|
|
crypto_tfm_alg_ivsize(tfm));
|
|
goto out;
|
|
}
|
|
if (iv)
|
|
memcpy(local_iv,iv, crypto_tfm_alg_ivsize(tfm));
|
|
|
|
memcpy(out, in, length);
|
|
sg[0].page = virt_to_page(out);
|
|
sg[0].offset = offset_in_page(out);
|
|
sg[0].length = length;
|
|
|
|
ret = crypto_cipher_decrypt_iv(tfm, sg, sg, length, local_iv);
|
|
|
|
dprintk("RPC: krb5_decrypt: output_data:\n");
|
|
print_hexl((u32 *)out, length, 0);
|
|
out:
|
|
dprintk("RPC: gss_k5decrypt returns %d\n",ret);
|
|
return(ret);
|
|
}
|
|
|
|
EXPORT_SYMBOL(krb5_decrypt);
|
|
|
|
static void
|
|
buf_to_sg(struct scatterlist *sg, char *ptr, int len) {
|
|
sg->page = virt_to_page(ptr);
|
|
sg->offset = offset_in_page(ptr);
|
|
sg->length = len;
|
|
}
|
|
|
|
/* checksum the plaintext data and hdrlen bytes of the token header */
|
|
s32
|
|
make_checksum(s32 cksumtype, char *header, int hdrlen, struct xdr_buf *body,
|
|
struct xdr_netobj *cksum)
|
|
{
|
|
char *cksumname;
|
|
struct crypto_tfm *tfm = NULL; /* XXX add to ctx? */
|
|
struct scatterlist sg[1];
|
|
u32 code = GSS_S_FAILURE;
|
|
int len, thislen, offset;
|
|
int i;
|
|
|
|
switch (cksumtype) {
|
|
case CKSUMTYPE_RSA_MD5:
|
|
cksumname = "md5";
|
|
break;
|
|
default:
|
|
dprintk("RPC: krb5_make_checksum:"
|
|
" unsupported checksum %d", cksumtype);
|
|
goto out;
|
|
}
|
|
if (!(tfm = crypto_alloc_tfm(cksumname, CRYPTO_TFM_REQ_MAY_SLEEP)))
|
|
goto out;
|
|
cksum->len = crypto_tfm_alg_digestsize(tfm);
|
|
if ((cksum->data = kmalloc(cksum->len, GFP_KERNEL)) == NULL)
|
|
goto out;
|
|
|
|
crypto_digest_init(tfm);
|
|
buf_to_sg(sg, header, hdrlen);
|
|
crypto_digest_update(tfm, sg, 1);
|
|
if (body->head[0].iov_len) {
|
|
buf_to_sg(sg, body->head[0].iov_base, body->head[0].iov_len);
|
|
crypto_digest_update(tfm, sg, 1);
|
|
}
|
|
|
|
len = body->page_len;
|
|
if (len != 0) {
|
|
offset = body->page_base & (PAGE_CACHE_SIZE - 1);
|
|
i = body->page_base >> PAGE_CACHE_SHIFT;
|
|
thislen = PAGE_CACHE_SIZE - offset;
|
|
do {
|
|
if (thislen > len)
|
|
thislen = len;
|
|
sg->page = body->pages[i];
|
|
sg->offset = offset;
|
|
sg->length = thislen;
|
|
crypto_digest_update(tfm, sg, 1);
|
|
len -= thislen;
|
|
i++;
|
|
offset = 0;
|
|
thislen = PAGE_CACHE_SIZE;
|
|
} while(len != 0);
|
|
}
|
|
if (body->tail[0].iov_len) {
|
|
buf_to_sg(sg, body->tail[0].iov_base, body->tail[0].iov_len);
|
|
crypto_digest_update(tfm, sg, 1);
|
|
}
|
|
crypto_digest_final(tfm, cksum->data);
|
|
code = 0;
|
|
out:
|
|
crypto_free_tfm(tfm);
|
|
return code;
|
|
}
|
|
|
|
EXPORT_SYMBOL(make_checksum);
|