[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
/*
|
|
|
|
* Authenc: Simple AEAD wrapper for IPsec
|
|
|
|
*
|
|
|
|
* Copyright (c) 2007 Herbert Xu <herbert@gondor.apana.org.au>
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2007-12-10 09:20:24 +01:00
|
|
|
#include <crypto/aead.h>
|
2008-08-31 14:21:09 +02:00
|
|
|
#include <crypto/internal/hash.h>
|
2007-12-17 13:12:49 +01:00
|
|
|
#include <crypto/internal/skcipher.h>
|
2007-11-22 16:11:53 +01:00
|
|
|
#include <crypto/authenc.h>
|
2007-12-07 11:52:49 +01:00
|
|
|
#include <crypto/scatterwalk.h>
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
#include <linux/err.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/module.h>
|
2007-11-22 16:11:53 +01:00
|
|
|
#include <linux/rtnetlink.h>
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/spinlock.h>
|
|
|
|
|
2009-08-05 11:35:34 +02:00
|
|
|
typedef u8 *(*authenc_ahash_t)(struct aead_request *req, unsigned int flags);
|
|
|
|
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
struct authenc_instance_ctx {
|
2009-08-05 11:35:34 +02:00
|
|
|
struct crypto_ahash_spawn auth;
|
2007-12-17 13:12:49 +01:00
|
|
|
struct crypto_skcipher_spawn enc;
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
struct crypto_authenc_ctx {
|
2009-08-05 11:35:34 +02:00
|
|
|
unsigned int reqoff;
|
|
|
|
struct crypto_ahash *auth;
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
struct crypto_ablkcipher *enc;
|
|
|
|
};
|
|
|
|
|
2009-08-05 11:35:34 +02:00
|
|
|
struct authenc_request_ctx {
|
|
|
|
unsigned int cryptlen;
|
|
|
|
struct scatterlist *sg;
|
|
|
|
struct scatterlist asg[2];
|
|
|
|
struct scatterlist cipher[2];
|
|
|
|
crypto_completion_t complete;
|
|
|
|
crypto_completion_t update_complete;
|
|
|
|
char tail[];
|
|
|
|
};
|
|
|
|
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
static int crypto_authenc_setkey(struct crypto_aead *authenc, const u8 *key,
|
|
|
|
unsigned int keylen)
|
|
|
|
{
|
|
|
|
unsigned int authkeylen;
|
2007-11-22 16:11:53 +01:00
|
|
|
unsigned int enckeylen;
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);
|
2009-08-05 11:35:34 +02:00
|
|
|
struct crypto_ahash *auth = ctx->auth;
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
struct crypto_ablkcipher *enc = ctx->enc;
|
2007-11-22 16:11:53 +01:00
|
|
|
struct rtattr *rta = (void *)key;
|
|
|
|
struct crypto_authenc_key_param *param;
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
int err = -EINVAL;
|
|
|
|
|
2007-12-10 03:55:21 +01:00
|
|
|
if (!RTA_OK(rta, keylen))
|
2007-11-22 16:11:53 +01:00
|
|
|
goto badkey;
|
|
|
|
if (rta->rta_type != CRYPTO_AUTHENC_KEYA_PARAM)
|
|
|
|
goto badkey;
|
|
|
|
if (RTA_PAYLOAD(rta) < sizeof(*param))
|
|
|
|
goto badkey;
|
|
|
|
|
|
|
|
param = RTA_DATA(rta);
|
|
|
|
enckeylen = be32_to_cpu(param->enckeylen);
|
|
|
|
|
|
|
|
key += RTA_ALIGN(rta->rta_len);
|
|
|
|
keylen -= RTA_ALIGN(rta->rta_len);
|
|
|
|
|
|
|
|
if (keylen < enckeylen)
|
|
|
|
goto badkey;
|
|
|
|
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
authkeylen = keylen - enckeylen;
|
|
|
|
|
2009-08-05 11:35:34 +02:00
|
|
|
crypto_ahash_clear_flags(auth, CRYPTO_TFM_REQ_MASK);
|
|
|
|
crypto_ahash_set_flags(auth, crypto_aead_get_flags(authenc) &
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
CRYPTO_TFM_REQ_MASK);
|
2009-08-05 11:35:34 +02:00
|
|
|
err = crypto_ahash_setkey(auth, key, authkeylen);
|
|
|
|
crypto_aead_set_flags(authenc, crypto_ahash_get_flags(auth) &
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
CRYPTO_TFM_RES_MASK);
|
|
|
|
|
|
|
|
if (err)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
crypto_ablkcipher_clear_flags(enc, CRYPTO_TFM_REQ_MASK);
|
|
|
|
crypto_ablkcipher_set_flags(enc, crypto_aead_get_flags(authenc) &
|
|
|
|
CRYPTO_TFM_REQ_MASK);
|
|
|
|
err = crypto_ablkcipher_setkey(enc, key + authkeylen, enckeylen);
|
|
|
|
crypto_aead_set_flags(authenc, crypto_ablkcipher_get_flags(enc) &
|
|
|
|
CRYPTO_TFM_RES_MASK);
|
|
|
|
|
|
|
|
out:
|
|
|
|
return err;
|
2007-11-22 16:11:53 +01:00
|
|
|
|
|
|
|
badkey:
|
|
|
|
crypto_aead_set_flags(authenc, CRYPTO_TFM_RES_BAD_KEY_LEN);
|
|
|
|
goto out;
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
}
|
|
|
|
|
2007-12-10 09:20:24 +01:00
|
|
|
static void authenc_chain(struct scatterlist *head, struct scatterlist *sg,
|
|
|
|
int chain)
|
|
|
|
{
|
|
|
|
if (chain) {
|
|
|
|
head->length += sg->length;
|
|
|
|
sg = scatterwalk_sg_next(sg);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sg)
|
|
|
|
scatterwalk_sg_chain(head, 2, sg);
|
|
|
|
else
|
|
|
|
sg_mark_end(head);
|
|
|
|
}
|
|
|
|
|
2009-08-05 11:35:34 +02:00
|
|
|
static void authenc_geniv_ahash_update_done(struct crypto_async_request *areq,
|
|
|
|
int err)
|
|
|
|
{
|
|
|
|
struct aead_request *req = areq->data;
|
|
|
|
struct crypto_aead *authenc = crypto_aead_reqtfm(req);
|
|
|
|
struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);
|
|
|
|
struct authenc_request_ctx *areq_ctx = aead_request_ctx(req);
|
|
|
|
struct ahash_request *ahreq = (void *)(areq_ctx->tail + ctx->reqoff);
|
|
|
|
|
|
|
|
if (err)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
ahash_request_set_crypt(ahreq, areq_ctx->sg, ahreq->result,
|
|
|
|
areq_ctx->cryptlen);
|
|
|
|
ahash_request_set_callback(ahreq, aead_request_flags(req) &
|
|
|
|
CRYPTO_TFM_REQ_MAY_SLEEP,
|
|
|
|
areq_ctx->complete, req);
|
|
|
|
|
|
|
|
err = crypto_ahash_finup(ahreq);
|
|
|
|
if (err)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
scatterwalk_map_and_copy(ahreq->result, areq_ctx->sg,
|
|
|
|
areq_ctx->cryptlen,
|
|
|
|
crypto_aead_authsize(authenc), 1);
|
|
|
|
|
|
|
|
out:
|
|
|
|
aead_request_complete(req, err);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void authenc_geniv_ahash_done(struct crypto_async_request *areq, int err)
|
|
|
|
{
|
|
|
|
struct aead_request *req = areq->data;
|
|
|
|
struct crypto_aead *authenc = crypto_aead_reqtfm(req);
|
|
|
|
struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);
|
|
|
|
struct authenc_request_ctx *areq_ctx = aead_request_ctx(req);
|
|
|
|
struct ahash_request *ahreq = (void *)(areq_ctx->tail + ctx->reqoff);
|
|
|
|
|
|
|
|
if (err)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
scatterwalk_map_and_copy(ahreq->result, areq_ctx->sg,
|
|
|
|
areq_ctx->cryptlen,
|
|
|
|
crypto_aead_authsize(authenc), 1);
|
|
|
|
|
|
|
|
out:
|
|
|
|
aead_request_complete(req, err);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void authenc_verify_ahash_update_done(struct crypto_async_request *areq,
|
|
|
|
int err)
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
{
|
2009-08-05 11:35:34 +02:00
|
|
|
u8 *ihash;
|
|
|
|
unsigned int authsize;
|
|
|
|
struct ablkcipher_request *abreq;
|
|
|
|
struct aead_request *req = areq->data;
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
struct crypto_aead *authenc = crypto_aead_reqtfm(req);
|
|
|
|
struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);
|
2009-08-05 11:35:34 +02:00
|
|
|
struct authenc_request_ctx *areq_ctx = aead_request_ctx(req);
|
|
|
|
struct ahash_request *ahreq = (void *)(areq_ctx->tail + ctx->reqoff);
|
|
|
|
|
|
|
|
if (err)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
ahash_request_set_crypt(ahreq, areq_ctx->sg, ahreq->result,
|
|
|
|
areq_ctx->cryptlen);
|
|
|
|
ahash_request_set_callback(ahreq, aead_request_flags(req) &
|
|
|
|
CRYPTO_TFM_REQ_MAY_SLEEP,
|
|
|
|
areq_ctx->complete, req);
|
|
|
|
|
|
|
|
err = crypto_ahash_finup(ahreq);
|
|
|
|
if (err)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
authsize = crypto_aead_authsize(authenc);
|
|
|
|
ihash = ahreq->result + authsize;
|
|
|
|
scatterwalk_map_and_copy(ihash, areq_ctx->sg, areq_ctx->cryptlen,
|
|
|
|
authsize, 0);
|
|
|
|
|
2010-02-16 13:27:20 +01:00
|
|
|
err = memcmp(ihash, ahreq->result, authsize) ? -EBADMSG : 0;
|
2009-08-05 11:35:34 +02:00
|
|
|
if (err)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
abreq = aead_request_ctx(req);
|
|
|
|
ablkcipher_request_set_tfm(abreq, ctx->enc);
|
|
|
|
ablkcipher_request_set_callback(abreq, aead_request_flags(req),
|
|
|
|
req->base.complete, req->base.data);
|
|
|
|
ablkcipher_request_set_crypt(abreq, req->src, req->dst,
|
|
|
|
req->cryptlen, req->iv);
|
|
|
|
|
|
|
|
err = crypto_ablkcipher_decrypt(abreq);
|
|
|
|
|
|
|
|
out:
|
|
|
|
aead_request_complete(req, err);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void authenc_verify_ahash_done(struct crypto_async_request *areq,
|
|
|
|
int err)
|
|
|
|
{
|
|
|
|
u8 *ihash;
|
|
|
|
unsigned int authsize;
|
|
|
|
struct ablkcipher_request *abreq;
|
|
|
|
struct aead_request *req = areq->data;
|
|
|
|
struct crypto_aead *authenc = crypto_aead_reqtfm(req);
|
|
|
|
struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);
|
|
|
|
struct authenc_request_ctx *areq_ctx = aead_request_ctx(req);
|
|
|
|
struct ahash_request *ahreq = (void *)(areq_ctx->tail + ctx->reqoff);
|
|
|
|
|
|
|
|
if (err)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
authsize = crypto_aead_authsize(authenc);
|
|
|
|
ihash = ahreq->result + authsize;
|
|
|
|
scatterwalk_map_and_copy(ihash, areq_ctx->sg, areq_ctx->cryptlen,
|
|
|
|
authsize, 0);
|
|
|
|
|
2010-02-16 13:27:20 +01:00
|
|
|
err = memcmp(ihash, ahreq->result, authsize) ? -EBADMSG : 0;
|
2009-08-05 11:35:34 +02:00
|
|
|
if (err)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
abreq = aead_request_ctx(req);
|
|
|
|
ablkcipher_request_set_tfm(abreq, ctx->enc);
|
|
|
|
ablkcipher_request_set_callback(abreq, aead_request_flags(req),
|
|
|
|
req->base.complete, req->base.data);
|
|
|
|
ablkcipher_request_set_crypt(abreq, req->src, req->dst,
|
|
|
|
req->cryptlen, req->iv);
|
|
|
|
|
|
|
|
err = crypto_ablkcipher_decrypt(abreq);
|
|
|
|
|
|
|
|
out:
|
|
|
|
aead_request_complete(req, err);
|
|
|
|
}
|
|
|
|
|
|
|
|
static u8 *crypto_authenc_ahash_fb(struct aead_request *req, unsigned int flags)
|
|
|
|
{
|
|
|
|
struct crypto_aead *authenc = crypto_aead_reqtfm(req);
|
|
|
|
struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);
|
|
|
|
struct crypto_ahash *auth = ctx->auth;
|
|
|
|
struct authenc_request_ctx *areq_ctx = aead_request_ctx(req);
|
|
|
|
struct ahash_request *ahreq = (void *)(areq_ctx->tail + ctx->reqoff);
|
|
|
|
u8 *hash = areq_ctx->tail;
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
int err;
|
|
|
|
|
2009-08-05 11:35:34 +02:00
|
|
|
hash = (u8 *)ALIGN((unsigned long)hash + crypto_ahash_alignmask(auth),
|
|
|
|
crypto_ahash_alignmask(auth) + 1);
|
|
|
|
|
|
|
|
ahash_request_set_tfm(ahreq, auth);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
|
2009-08-05 11:35:34 +02:00
|
|
|
err = crypto_ahash_init(ahreq);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
if (err)
|
2009-08-05 11:35:34 +02:00
|
|
|
return ERR_PTR(err);
|
|
|
|
|
|
|
|
ahash_request_set_crypt(ahreq, req->assoc, hash, req->assoclen);
|
|
|
|
ahash_request_set_callback(ahreq, aead_request_flags(req) & flags,
|
|
|
|
areq_ctx->update_complete, req);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
|
2009-08-05 11:35:34 +02:00
|
|
|
err = crypto_ahash_update(ahreq);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
if (err)
|
2009-08-05 11:35:34 +02:00
|
|
|
return ERR_PTR(err);
|
|
|
|
|
|
|
|
ahash_request_set_crypt(ahreq, areq_ctx->sg, hash,
|
|
|
|
areq_ctx->cryptlen);
|
|
|
|
ahash_request_set_callback(ahreq, aead_request_flags(req) & flags,
|
|
|
|
areq_ctx->complete, req);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
|
2009-08-05 11:35:34 +02:00
|
|
|
err = crypto_ahash_finup(ahreq);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
if (err)
|
2009-08-05 11:35:34 +02:00
|
|
|
return ERR_PTR(err);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
|
2009-08-05 11:35:34 +02:00
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
|
|
|
static u8 *crypto_authenc_ahash(struct aead_request *req, unsigned int flags)
|
|
|
|
{
|
|
|
|
struct crypto_aead *authenc = crypto_aead_reqtfm(req);
|
|
|
|
struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);
|
|
|
|
struct crypto_ahash *auth = ctx->auth;
|
|
|
|
struct authenc_request_ctx *areq_ctx = aead_request_ctx(req);
|
|
|
|
struct ahash_request *ahreq = (void *)(areq_ctx->tail + ctx->reqoff);
|
|
|
|
u8 *hash = areq_ctx->tail;
|
|
|
|
int err;
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
|
2009-08-05 11:35:34 +02:00
|
|
|
hash = (u8 *)ALIGN((unsigned long)hash + crypto_ahash_alignmask(auth),
|
|
|
|
crypto_ahash_alignmask(auth) + 1);
|
|
|
|
|
|
|
|
ahash_request_set_tfm(ahreq, auth);
|
|
|
|
ahash_request_set_crypt(ahreq, areq_ctx->sg, hash,
|
|
|
|
areq_ctx->cryptlen);
|
|
|
|
ahash_request_set_callback(ahreq, aead_request_flags(req) & flags,
|
|
|
|
areq_ctx->complete, req);
|
|
|
|
|
|
|
|
err = crypto_ahash_digest(ahreq);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
if (err)
|
2007-12-10 09:15:41 +01:00
|
|
|
return ERR_PTR(err);
|
|
|
|
|
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
2007-12-10 09:20:24 +01:00
|
|
|
static int crypto_authenc_genicv(struct aead_request *req, u8 *iv,
|
|
|
|
unsigned int flags)
|
2007-12-10 09:15:41 +01:00
|
|
|
{
|
|
|
|
struct crypto_aead *authenc = crypto_aead_reqtfm(req);
|
2009-08-05 11:35:34 +02:00
|
|
|
struct authenc_request_ctx *areq_ctx = aead_request_ctx(req);
|
2007-12-10 09:15:41 +01:00
|
|
|
struct scatterlist *dst = req->dst;
|
2009-08-05 11:35:34 +02:00
|
|
|
struct scatterlist *assoc = req->assoc;
|
|
|
|
struct scatterlist *cipher = areq_ctx->cipher;
|
|
|
|
struct scatterlist *asg = areq_ctx->asg;
|
2007-12-10 09:20:24 +01:00
|
|
|
unsigned int ivsize = crypto_aead_ivsize(authenc);
|
2009-08-05 11:35:34 +02:00
|
|
|
unsigned int cryptlen = req->cryptlen;
|
|
|
|
authenc_ahash_t authenc_ahash_fn = crypto_authenc_ahash_fb;
|
|
|
|
struct page *dstp;
|
2007-12-10 09:20:24 +01:00
|
|
|
u8 *vdst;
|
2007-12-10 09:15:41 +01:00
|
|
|
u8 *hash;
|
|
|
|
|
2007-12-10 09:20:24 +01:00
|
|
|
dstp = sg_page(dst);
|
|
|
|
vdst = PageHighMem(dstp) ? NULL : page_address(dstp) + dst->offset;
|
|
|
|
|
2009-01-13 01:26:18 +01:00
|
|
|
if (ivsize) {
|
|
|
|
sg_init_table(cipher, 2);
|
|
|
|
sg_set_buf(cipher, iv, ivsize);
|
|
|
|
authenc_chain(cipher, dst, vdst == iv + ivsize);
|
|
|
|
dst = cipher;
|
2009-08-05 11:35:34 +02:00
|
|
|
cryptlen += ivsize;
|
2009-01-13 01:26:18 +01:00
|
|
|
}
|
2007-12-10 09:20:24 +01:00
|
|
|
|
2009-08-05 11:35:34 +02:00
|
|
|
if (sg_is_last(assoc)) {
|
|
|
|
authenc_ahash_fn = crypto_authenc_ahash;
|
|
|
|
sg_init_table(asg, 2);
|
|
|
|
sg_set_page(asg, sg_page(assoc), assoc->length, assoc->offset);
|
|
|
|
authenc_chain(asg, dst, 0);
|
|
|
|
dst = asg;
|
|
|
|
cryptlen += req->assoclen;
|
|
|
|
}
|
|
|
|
|
|
|
|
areq_ctx->cryptlen = cryptlen;
|
|
|
|
areq_ctx->sg = dst;
|
|
|
|
|
|
|
|
areq_ctx->complete = authenc_geniv_ahash_done;
|
|
|
|
areq_ctx->update_complete = authenc_geniv_ahash_update_done;
|
|
|
|
|
|
|
|
hash = authenc_ahash_fn(req, flags);
|
2007-12-10 09:15:41 +01:00
|
|
|
if (IS_ERR(hash))
|
|
|
|
return PTR_ERR(hash);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
|
2009-01-13 01:26:18 +01:00
|
|
|
scatterwalk_map_and_copy(hash, dst, cryptlen,
|
2007-12-02 08:49:21 +01:00
|
|
|
crypto_aead_authsize(authenc), 1);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void crypto_authenc_encrypt_done(struct crypto_async_request *req,
|
|
|
|
int err)
|
|
|
|
{
|
2008-08-22 17:04:06 +02:00
|
|
|
struct aead_request *areq = req->data;
|
|
|
|
|
2007-12-10 09:20:24 +01:00
|
|
|
if (!err) {
|
|
|
|
struct crypto_aead *authenc = crypto_aead_reqtfm(areq);
|
|
|
|
struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);
|
|
|
|
struct ablkcipher_request *abreq = aead_request_ctx(areq);
|
|
|
|
u8 *iv = (u8 *)(abreq + 1) +
|
|
|
|
crypto_ablkcipher_reqsize(ctx->enc);
|
|
|
|
|
|
|
|
err = crypto_authenc_genicv(areq, iv, 0);
|
|
|
|
}
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
|
2008-08-22 17:04:06 +02:00
|
|
|
aead_request_complete(areq, err);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int crypto_authenc_encrypt(struct aead_request *req)
|
|
|
|
{
|
|
|
|
struct crypto_aead *authenc = crypto_aead_reqtfm(req);
|
|
|
|
struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);
|
|
|
|
struct ablkcipher_request *abreq = aead_request_ctx(req);
|
2007-12-10 09:20:24 +01:00
|
|
|
struct crypto_ablkcipher *enc = ctx->enc;
|
|
|
|
struct scatterlist *dst = req->dst;
|
|
|
|
unsigned int cryptlen = req->cryptlen;
|
|
|
|
u8 *iv = (u8 *)(abreq + 1) + crypto_ablkcipher_reqsize(enc);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
int err;
|
|
|
|
|
2007-12-10 09:20:24 +01:00
|
|
|
ablkcipher_request_set_tfm(abreq, enc);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
ablkcipher_request_set_callback(abreq, aead_request_flags(req),
|
|
|
|
crypto_authenc_encrypt_done, req);
|
2007-12-10 09:20:24 +01:00
|
|
|
ablkcipher_request_set_crypt(abreq, req->src, dst, cryptlen, req->iv);
|
|
|
|
|
|
|
|
memcpy(iv, req->iv, crypto_aead_ivsize(authenc));
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
|
|
|
|
err = crypto_ablkcipher_encrypt(abreq);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
2007-12-10 09:20:24 +01:00
|
|
|
return crypto_authenc_genicv(req, iv, CRYPTO_TFM_REQ_MAY_SLEEP);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void crypto_authenc_givencrypt_done(struct crypto_async_request *req,
|
|
|
|
int err)
|
|
|
|
{
|
2008-08-22 17:04:06 +02:00
|
|
|
struct aead_request *areq = req->data;
|
|
|
|
|
2007-12-10 09:20:24 +01:00
|
|
|
if (!err) {
|
2008-04-29 15:44:28 +02:00
|
|
|
struct skcipher_givcrypt_request *greq = aead_request_ctx(areq);
|
2007-12-10 09:20:24 +01:00
|
|
|
|
2008-04-29 15:44:28 +02:00
|
|
|
err = crypto_authenc_genicv(areq, greq->giv, 0);
|
2007-12-10 09:20:24 +01:00
|
|
|
}
|
|
|
|
|
2008-08-22 17:04:06 +02:00
|
|
|
aead_request_complete(areq, err);
|
2007-12-10 09:20:24 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static int crypto_authenc_givencrypt(struct aead_givcrypt_request *req)
|
|
|
|
{
|
|
|
|
struct crypto_aead *authenc = aead_givcrypt_reqtfm(req);
|
|
|
|
struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);
|
|
|
|
struct aead_request *areq = &req->areq;
|
|
|
|
struct skcipher_givcrypt_request *greq = aead_request_ctx(areq);
|
|
|
|
u8 *iv = req->giv;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
skcipher_givcrypt_set_tfm(greq, ctx->enc);
|
|
|
|
skcipher_givcrypt_set_callback(greq, aead_request_flags(areq),
|
|
|
|
crypto_authenc_givencrypt_done, areq);
|
|
|
|
skcipher_givcrypt_set_crypt(greq, areq->src, areq->dst, areq->cryptlen,
|
|
|
|
areq->iv);
|
|
|
|
skcipher_givcrypt_set_giv(greq, iv, req->seq);
|
|
|
|
|
|
|
|
err = crypto_skcipher_givencrypt(greq);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
return crypto_authenc_genicv(areq, iv, CRYPTO_TFM_REQ_MAY_SLEEP);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
}
|
|
|
|
|
2007-12-04 10:04:21 +01:00
|
|
|
static int crypto_authenc_verify(struct aead_request *req,
|
2009-08-05 11:35:34 +02:00
|
|
|
authenc_ahash_t authenc_ahash_fn)
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
{
|
|
|
|
struct crypto_aead *authenc = crypto_aead_reqtfm(req);
|
2009-08-05 11:35:34 +02:00
|
|
|
struct authenc_request_ctx *areq_ctx = aead_request_ctx(req);
|
2007-12-10 09:15:41 +01:00
|
|
|
u8 *ohash;
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
u8 *ihash;
|
|
|
|
unsigned int authsize;
|
|
|
|
|
2009-08-05 11:35:34 +02:00
|
|
|
areq_ctx->complete = authenc_verify_ahash_done;
|
|
|
|
areq_ctx->complete = authenc_verify_ahash_update_done;
|
|
|
|
|
|
|
|
ohash = authenc_ahash_fn(req, CRYPTO_TFM_REQ_MAY_SLEEP);
|
2007-12-10 09:15:41 +01:00
|
|
|
if (IS_ERR(ohash))
|
|
|
|
return PTR_ERR(ohash);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
|
2007-12-02 08:49:21 +01:00
|
|
|
authsize = crypto_aead_authsize(authenc);
|
2007-12-10 09:15:41 +01:00
|
|
|
ihash = ohash + authsize;
|
2009-08-05 11:35:34 +02:00
|
|
|
scatterwalk_map_and_copy(ihash, areq_ctx->sg, areq_ctx->cryptlen,
|
|
|
|
authsize, 0);
|
2010-02-16 13:27:20 +01:00
|
|
|
return memcmp(ihash, ohash, authsize) ? -EBADMSG : 0;
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
}
|
|
|
|
|
2007-12-10 09:20:24 +01:00
|
|
|
static int crypto_authenc_iverify(struct aead_request *req, u8 *iv,
|
|
|
|
unsigned int cryptlen)
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
{
|
2007-12-10 09:20:24 +01:00
|
|
|
struct crypto_aead *authenc = crypto_aead_reqtfm(req);
|
2009-08-05 11:35:34 +02:00
|
|
|
struct authenc_request_ctx *areq_ctx = aead_request_ctx(req);
|
2007-12-10 09:20:24 +01:00
|
|
|
struct scatterlist *src = req->src;
|
2009-08-05 11:35:34 +02:00
|
|
|
struct scatterlist *assoc = req->assoc;
|
|
|
|
struct scatterlist *cipher = areq_ctx->cipher;
|
|
|
|
struct scatterlist *asg = areq_ctx->asg;
|
2007-12-10 09:20:24 +01:00
|
|
|
unsigned int ivsize = crypto_aead_ivsize(authenc);
|
2009-08-05 11:35:34 +02:00
|
|
|
authenc_ahash_t authenc_ahash_fn = crypto_authenc_ahash_fb;
|
|
|
|
struct page *srcp;
|
2007-12-10 09:20:24 +01:00
|
|
|
u8 *vsrc;
|
|
|
|
|
|
|
|
srcp = sg_page(src);
|
|
|
|
vsrc = PageHighMem(srcp) ? NULL : page_address(srcp) + src->offset;
|
|
|
|
|
2009-01-13 01:26:18 +01:00
|
|
|
if (ivsize) {
|
|
|
|
sg_init_table(cipher, 2);
|
|
|
|
sg_set_buf(cipher, iv, ivsize);
|
|
|
|
authenc_chain(cipher, src, vsrc == iv + ivsize);
|
|
|
|
src = cipher;
|
2009-08-05 11:35:34 +02:00
|
|
|
cryptlen += ivsize;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sg_is_last(assoc)) {
|
|
|
|
authenc_ahash_fn = crypto_authenc_ahash;
|
|
|
|
sg_init_table(asg, 2);
|
|
|
|
sg_set_page(asg, sg_page(assoc), assoc->length, assoc->offset);
|
|
|
|
authenc_chain(asg, src, 0);
|
|
|
|
src = asg;
|
|
|
|
cryptlen += req->assoclen;
|
2009-01-13 01:26:18 +01:00
|
|
|
}
|
2007-12-10 09:20:24 +01:00
|
|
|
|
2009-08-05 11:35:34 +02:00
|
|
|
areq_ctx->cryptlen = cryptlen;
|
|
|
|
areq_ctx->sg = src;
|
|
|
|
|
|
|
|
return crypto_authenc_verify(req, authenc_ahash_fn);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int crypto_authenc_decrypt(struct aead_request *req)
|
|
|
|
{
|
|
|
|
struct crypto_aead *authenc = crypto_aead_reqtfm(req);
|
|
|
|
struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);
|
|
|
|
struct ablkcipher_request *abreq = aead_request_ctx(req);
|
2007-12-04 10:04:21 +01:00
|
|
|
unsigned int cryptlen = req->cryptlen;
|
|
|
|
unsigned int authsize = crypto_aead_authsize(authenc);
|
2007-12-10 09:20:24 +01:00
|
|
|
u8 *iv = req->iv;
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
int err;
|
|
|
|
|
2007-12-04 10:04:21 +01:00
|
|
|
if (cryptlen < authsize)
|
|
|
|
return -EINVAL;
|
|
|
|
cryptlen -= authsize;
|
|
|
|
|
2007-12-10 09:20:24 +01:00
|
|
|
err = crypto_authenc_iverify(req, iv, cryptlen);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
ablkcipher_request_set_tfm(abreq, ctx->enc);
|
|
|
|
ablkcipher_request_set_callback(abreq, aead_request_flags(req),
|
2007-12-10 09:20:24 +01:00
|
|
|
req->base.complete, req->base.data);
|
|
|
|
ablkcipher_request_set_crypt(abreq, req->src, req->dst, cryptlen, iv);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
|
|
|
|
return crypto_ablkcipher_decrypt(abreq);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int crypto_authenc_init_tfm(struct crypto_tfm *tfm)
|
|
|
|
{
|
2009-08-05 11:35:34 +02:00
|
|
|
struct crypto_instance *inst = crypto_tfm_alg_instance(tfm);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
struct authenc_instance_ctx *ictx = crypto_instance_ctx(inst);
|
|
|
|
struct crypto_authenc_ctx *ctx = crypto_tfm_ctx(tfm);
|
2009-08-05 11:35:34 +02:00
|
|
|
struct crypto_ahash *auth;
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
struct crypto_ablkcipher *enc;
|
|
|
|
int err;
|
|
|
|
|
2009-08-05 11:35:34 +02:00
|
|
|
auth = crypto_spawn_ahash(&ictx->auth);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
if (IS_ERR(auth))
|
|
|
|
return PTR_ERR(auth);
|
|
|
|
|
2009-08-05 11:35:34 +02:00
|
|
|
ctx->reqoff = ALIGN(2 * crypto_ahash_digestsize(auth) +
|
|
|
|
crypto_ahash_alignmask(auth),
|
|
|
|
crypto_ahash_alignmask(auth) + 1);
|
|
|
|
|
2007-12-17 13:12:49 +01:00
|
|
|
enc = crypto_spawn_skcipher(&ictx->enc);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
err = PTR_ERR(enc);
|
|
|
|
if (IS_ERR(enc))
|
2009-08-05 11:35:34 +02:00
|
|
|
goto err_free_ahash;
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
|
|
|
|
ctx->auth = auth;
|
|
|
|
ctx->enc = enc;
|
2010-02-16 13:27:20 +01:00
|
|
|
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
tfm->crt_aead.reqsize = max_t(unsigned int,
|
2009-08-05 11:35:34 +02:00
|
|
|
crypto_ahash_reqsize(auth) + ctx->reqoff +
|
|
|
|
sizeof(struct authenc_request_ctx) +
|
2010-02-16 13:27:20 +01:00
|
|
|
sizeof(struct ahash_request),
|
2009-08-05 11:35:34 +02:00
|
|
|
sizeof(struct skcipher_givcrypt_request) +
|
|
|
|
crypto_ablkcipher_reqsize(enc) +
|
|
|
|
crypto_ablkcipher_ivsize(enc));
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
2009-08-05 11:35:34 +02:00
|
|
|
err_free_ahash:
|
|
|
|
crypto_free_ahash(auth);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void crypto_authenc_exit_tfm(struct crypto_tfm *tfm)
|
|
|
|
{
|
|
|
|
struct crypto_authenc_ctx *ctx = crypto_tfm_ctx(tfm);
|
|
|
|
|
2009-08-05 11:35:34 +02:00
|
|
|
crypto_free_ahash(ctx->auth);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
crypto_free_ablkcipher(ctx->enc);
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct crypto_instance *crypto_authenc_alloc(struct rtattr **tb)
|
|
|
|
{
|
2007-12-17 13:12:49 +01:00
|
|
|
struct crypto_attr_type *algt;
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
struct crypto_instance *inst;
|
2009-08-05 11:35:34 +02:00
|
|
|
struct hash_alg_common *auth;
|
|
|
|
struct crypto_alg *auth_base;
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
struct crypto_alg *enc;
|
|
|
|
struct authenc_instance_ctx *ctx;
|
2007-12-17 13:12:49 +01:00
|
|
|
const char *enc_name;
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
int err;
|
|
|
|
|
2007-12-17 13:12:49 +01:00
|
|
|
algt = crypto_get_attr_type(tb);
|
|
|
|
err = PTR_ERR(algt);
|
|
|
|
if (IS_ERR(algt))
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
return ERR_PTR(err);
|
|
|
|
|
2007-12-17 13:12:49 +01:00
|
|
|
if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)
|
|
|
|
return ERR_PTR(-EINVAL);
|
|
|
|
|
2009-08-05 11:35:34 +02:00
|
|
|
auth = ahash_attr_alg(tb[1], CRYPTO_ALG_TYPE_HASH,
|
|
|
|
CRYPTO_ALG_TYPE_AHASH_MASK);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
if (IS_ERR(auth))
|
|
|
|
return ERR_PTR(PTR_ERR(auth));
|
|
|
|
|
2009-08-05 11:35:34 +02:00
|
|
|
auth_base = &auth->base;
|
|
|
|
|
2007-12-17 13:12:49 +01:00
|
|
|
enc_name = crypto_attr_alg_name(tb[2]);
|
|
|
|
err = PTR_ERR(enc_name);
|
|
|
|
if (IS_ERR(enc_name))
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
goto out_put_auth;
|
|
|
|
|
|
|
|
inst = kzalloc(sizeof(*inst) + sizeof(*ctx), GFP_KERNEL);
|
|
|
|
err = -ENOMEM;
|
|
|
|
if (!inst)
|
2007-12-17 13:12:49 +01:00
|
|
|
goto out_put_auth;
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
|
|
|
|
ctx = crypto_instance_ctx(inst);
|
|
|
|
|
2009-08-05 11:35:34 +02:00
|
|
|
err = crypto_init_ahash_spawn(&ctx->auth, auth, inst);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
if (err)
|
|
|
|
goto err_free_inst;
|
|
|
|
|
2007-12-17 13:12:49 +01:00
|
|
|
crypto_set_skcipher_spawn(&ctx->enc, inst);
|
|
|
|
err = crypto_grab_skcipher(&ctx->enc, enc_name, 0,
|
|
|
|
crypto_requires_sync(algt->type,
|
|
|
|
algt->mask));
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
if (err)
|
|
|
|
goto err_drop_auth;
|
|
|
|
|
2007-12-17 13:12:49 +01:00
|
|
|
enc = crypto_skcipher_spawn_alg(&ctx->enc);
|
|
|
|
|
|
|
|
err = -ENAMETOOLONG;
|
|
|
|
if (snprintf(inst->alg.cra_name, CRYPTO_MAX_ALG_NAME,
|
2009-08-05 11:35:34 +02:00
|
|
|
"authenc(%s,%s)", auth_base->cra_name, enc->cra_name) >=
|
2007-12-17 13:12:49 +01:00
|
|
|
CRYPTO_MAX_ALG_NAME)
|
|
|
|
goto err_drop_enc;
|
|
|
|
|
|
|
|
if (snprintf(inst->alg.cra_driver_name, CRYPTO_MAX_ALG_NAME,
|
2009-08-05 11:35:34 +02:00
|
|
|
"authenc(%s,%s)", auth_base->cra_driver_name,
|
2007-12-17 13:12:49 +01:00
|
|
|
enc->cra_driver_name) >= CRYPTO_MAX_ALG_NAME)
|
|
|
|
goto err_drop_enc;
|
|
|
|
|
|
|
|
inst->alg.cra_flags = CRYPTO_ALG_TYPE_AEAD;
|
|
|
|
inst->alg.cra_flags |= enc->cra_flags & CRYPTO_ALG_ASYNC;
|
2009-08-05 11:35:34 +02:00
|
|
|
inst->alg.cra_priority = enc->cra_priority *
|
|
|
|
10 + auth_base->cra_priority;
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
inst->alg.cra_blocksize = enc->cra_blocksize;
|
2009-08-05 11:35:34 +02:00
|
|
|
inst->alg.cra_alignmask = auth_base->cra_alignmask | enc->cra_alignmask;
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
inst->alg.cra_type = &crypto_aead_type;
|
|
|
|
|
2007-12-10 03:54:44 +01:00
|
|
|
inst->alg.cra_aead.ivsize = enc->cra_ablkcipher.ivsize;
|
2009-08-05 11:35:34 +02:00
|
|
|
inst->alg.cra_aead.maxauthsize = auth->digestsize;
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
|
|
|
|
inst->alg.cra_ctxsize = sizeof(struct crypto_authenc_ctx);
|
|
|
|
|
|
|
|
inst->alg.cra_init = crypto_authenc_init_tfm;
|
|
|
|
inst->alg.cra_exit = crypto_authenc_exit_tfm;
|
|
|
|
|
|
|
|
inst->alg.cra_aead.setkey = crypto_authenc_setkey;
|
|
|
|
inst->alg.cra_aead.encrypt = crypto_authenc_encrypt;
|
|
|
|
inst->alg.cra_aead.decrypt = crypto_authenc_decrypt;
|
2007-12-10 09:20:24 +01:00
|
|
|
inst->alg.cra_aead.givencrypt = crypto_authenc_givencrypt;
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
|
|
|
|
out:
|
2009-08-05 11:35:34 +02:00
|
|
|
crypto_mod_put(auth_base);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
return inst;
|
|
|
|
|
2007-12-17 13:12:49 +01:00
|
|
|
err_drop_enc:
|
|
|
|
crypto_drop_skcipher(&ctx->enc);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
err_drop_auth:
|
2009-08-05 11:35:34 +02:00
|
|
|
crypto_drop_ahash(&ctx->auth);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
err_free_inst:
|
|
|
|
kfree(inst);
|
2007-12-17 13:12:49 +01:00
|
|
|
out_put_auth:
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
inst = ERR_PTR(err);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void crypto_authenc_free(struct crypto_instance *inst)
|
|
|
|
{
|
|
|
|
struct authenc_instance_ctx *ctx = crypto_instance_ctx(inst);
|
|
|
|
|
2007-12-17 13:12:49 +01:00
|
|
|
crypto_drop_skcipher(&ctx->enc);
|
2009-08-05 11:35:34 +02:00
|
|
|
crypto_drop_ahash(&ctx->auth);
|
[CRYPTO] aead: Add authenc
This patch adds the authenc algorithm which constructs an AEAD algorithm
from an asynchronous block cipher and a hash. The construction is done
by concatenating the encrypted result from the cipher with the output
from the hash, as is used by the IPsec ESP protocol.
The authenc algorithm exists as a template with four parameters:
authenc(auth, authsize, enc, enckeylen).
The authentication algorithm, the authentication size (i.e., truncating
the output of the authentication algorithm), the encryption algorithm,
and the encryption key length. Both the size field and the key length
field are in bytes. For example, AES-128 with SHA1-HMAC would be
represented by
authenc(hmac(sha1), 12, cbc(aes), 16)
The key for the authenc algorithm is the concatenation of the keys for
the authentication algorithm with the encryption algorithm. For the
above example, if a key of length 36 bytes is given, then hmac(sha1)
would receive the first 20 bytes while the last 16 would be given to
cbc(aes).
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2007-08-30 10:24:15 +02:00
|
|
|
kfree(inst);
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct crypto_template crypto_authenc_tmpl = {
|
|
|
|
.name = "authenc",
|
|
|
|
.alloc = crypto_authenc_alloc,
|
|
|
|
.free = crypto_authenc_free,
|
|
|
|
.module = THIS_MODULE,
|
|
|
|
};
|
|
|
|
|
|
|
|
static int __init crypto_authenc_module_init(void)
|
|
|
|
{
|
|
|
|
return crypto_register_template(&crypto_authenc_tmpl);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __exit crypto_authenc_module_exit(void)
|
|
|
|
{
|
|
|
|
crypto_unregister_template(&crypto_authenc_tmpl);
|
|
|
|
}
|
|
|
|
|
|
|
|
module_init(crypto_authenc_module_init);
|
|
|
|
module_exit(crypto_authenc_module_exit);
|
|
|
|
|
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
MODULE_DESCRIPTION("Simple AEAD wrapper for IPsec");
|