Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 1159
b: refs/heads/master
c: d085600
h: refs/heads/master
i:
  1157: d2d6845
  1155: a792b82
  1151: 26252ed
v: v3
  • Loading branch information
Patrick McHardy authored and Linus Torvalds committed May 17, 2005
1 parent fdb6aba commit 1d2cf0c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 14 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ba32311eb73f624a85a5fc2e043cda8e076f86ef
refs/heads/master: d0856009dbaf8eca2269d4129bb83940c0d95054
28 changes: 15 additions & 13 deletions trunk/crypto/crypto_null.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,21 @@
#include <linux/mm.h>
#include <asm/scatterlist.h>
#include <linux/crypto.h>
#include <linux/string.h>

#define NULL_KEY_SIZE 0
#define NULL_BLOCK_SIZE 1
#define NULL_DIGEST_SIZE 0

static int null_compress(void *ctx, const u8 *src, unsigned int slen,
u8 *dst, unsigned int *dlen)
{ return 0; }

static int null_decompress(void *ctx, const u8 *src, unsigned int slen,
u8 *dst, unsigned int *dlen)
{ return 0; }
{
if (slen > *dlen)
return -EINVAL;
memcpy(dst, src, slen);
*dlen = slen;
return 0;
}

static void null_init(void *ctx)
{ }
Expand All @@ -47,11 +50,10 @@ static int null_setkey(void *ctx, const u8 *key,
unsigned int keylen, u32 *flags)
{ return 0; }

static void null_encrypt(void *ctx, u8 *dst, const u8 *src)
{ }

static void null_decrypt(void *ctx, u8 *dst, const u8 *src)
{ }
static void null_crypt(void *ctx, u8 *dst, const u8 *src)
{
memcpy(dst, src, NULL_BLOCK_SIZE);
}

static struct crypto_alg compress_null = {
.cra_name = "compress_null",
Expand All @@ -62,7 +64,7 @@ static struct crypto_alg compress_null = {
.cra_list = LIST_HEAD_INIT(compress_null.cra_list),
.cra_u = { .compress = {
.coa_compress = null_compress,
.coa_decompress = null_decompress } }
.coa_decompress = null_compress } }
};

static struct crypto_alg digest_null = {
Expand Down Expand Up @@ -90,8 +92,8 @@ static struct crypto_alg cipher_null = {
.cia_min_keysize = NULL_KEY_SIZE,
.cia_max_keysize = NULL_KEY_SIZE,
.cia_setkey = null_setkey,
.cia_encrypt = null_encrypt,
.cia_decrypt = null_decrypt } }
.cia_encrypt = null_crypt,
.cia_decrypt = null_crypt } }
};

MODULE_ALIAS("compress_null");
Expand Down

0 comments on commit 1d2cf0c

Please sign in to comment.