linux-crypto.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Steffen Klassert <steffen.klassert@secunet.com>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: linux-crypto@vger.kernel.org
Subject: [PATCH 01/16] crypto: authenc - Don't multiply priorities
Date: Thu, 11 Aug 2011 13:26:39 +0200	[thread overview]
Message-ID: <20110811112639.GE16877@secunet.com> (raw)
In-Reply-To: <20110811112603.GD16877@secunet.com>

Most crypto algorithms simply take the priority value of the underlying
algorithm and add some value to calculate the algorithms priority.
The only exeptions are the authenc algorithms. We change the authenc
algorithms to calculate their priority to the sum of the underlying
algorithms plus 100. With this we can keep the priority consistent if
one of the underlying algorithms changes the priority.

Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---
 crypto/authenc.c    |    4 ++--
 crypto/authencesn.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crypto/authenc.c b/crypto/authenc.c
index 5ef7ba6..59349e4 100644
--- a/crypto/authenc.c
+++ b/crypto/authenc.c
@@ -644,8 +644,8 @@ static struct crypto_instance *crypto_authenc_alloc(struct rtattr **tb)
 
 	inst->alg.cra_flags = CRYPTO_ALG_TYPE_AEAD;
 	inst->alg.cra_flags |= enc->cra_flags & CRYPTO_ALG_ASYNC;
-	inst->alg.cra_priority = enc->cra_priority *
-				 10 + auth_base->cra_priority;
+	inst->alg.cra_priority = enc->cra_priority +
+				 auth_base->cra_priority + 100;
 	inst->alg.cra_blocksize = enc->cra_blocksize;
 	inst->alg.cra_alignmask = auth_base->cra_alignmask | enc->cra_alignmask;
 	inst->alg.cra_type = &crypto_aead_type;
diff --git a/crypto/authencesn.c b/crypto/authencesn.c
index 136b68b..de82829 100644
--- a/crypto/authencesn.c
+++ b/crypto/authencesn.c
@@ -767,8 +767,8 @@ static struct crypto_instance *crypto_authenc_esn_alloc(struct rtattr **tb)
 
 	inst->alg.cra_flags = CRYPTO_ALG_TYPE_AEAD;
 	inst->alg.cra_flags |= enc->cra_flags & CRYPTO_ALG_ASYNC;
-	inst->alg.cra_priority = enc->cra_priority *
-				 10 + auth_base->cra_priority;
+	inst->alg.cra_priority = enc->cra_priority +
+				 auth_base->cra_priority + 100;
 	inst->alg.cra_blocksize = enc->cra_blocksize;
 	inst->alg.cra_alignmask = auth_base->cra_alignmask | enc->cra_alignmask;
 	inst->alg.cra_type = &crypto_aead_type;
-- 
1.7.0.4

  reply	other threads:[~2011-08-11 11:26 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-11 11:26 [PATCH 00/16] crypto user configuration api Steffen Klassert
2011-08-11 11:26 ` Steffen Klassert [this message]
2011-08-15  7:19   ` [PATCH 01/16] crypto: authenc - Don't multiply priorities Herbert Xu
2011-08-15  8:02     ` Steffen Klassert
2011-08-15  8:55       ` Herbert Xu
2011-08-15 10:08         ` Steffen Klassert
2011-08-16 12:30           ` Herbert Xu
2011-08-16 12:37             ` Steffen Klassert
2011-09-21  8:32         ` Steffen Klassert
2011-09-21 11:19           ` Herbert Xu
2011-08-11 11:27 ` [PATCH 02/16] crypto: Add a flag to identify crypto instances Steffen Klassert
2011-08-11 11:27 ` [PATCH 03/16] crypto: Add userspace configuration API Steffen Klassert
2011-08-11 11:28 ` [PATCH 04/16] crypto: Add a report function pointer to crypto_type Steffen Klassert
2011-08-11 11:29 ` [PATCH 05/16] crypto: Add userspace report for larval type algorithms Steffen Klassert
2011-08-11 11:29 ` [PATCH 06/16] crypto: Add userspace report for shash " Steffen Klassert
2011-08-11 11:30 ` [PATCH 07/16] crypto: Add userspace report for ahash " Steffen Klassert
2011-08-11 11:31 ` [PATCH 08/16] crypto: Add userspace report for blkcipher " Steffen Klassert
2011-08-11 11:31 ` [PATCH 09/16] crypto: Add userspace report for ablkcipher " Steffen Klassert
2011-08-11 11:32 ` [PATCH 10/16] crypto: Add userspace report for givcipher " Steffen Klassert
2011-08-11 11:32 ` [PATCH 11/16] crypto: Add userspace report for aead " Steffen Klassert
2011-08-11 11:33 ` [PATCH 12/16] crypto: Add userspace report for nivaead " Steffen Klassert
2011-08-11 11:34 ` [PATCH 13/16] crypto: Add userspace report for pcompress " Steffen Klassert
2011-08-11 11:34 ` [PATCH 14/16] crypto: Add userspace report for rng " Steffen Klassert
2011-08-11 11:35 ` [PATCH 15/16] crypto: Add userspace report for cipher " Steffen Klassert
2011-08-11 11:35 ` [PATCH 16/16] crypto: Add userspace report for compress " Steffen Klassert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110811112639.GE16877@secunet.com \
    --to=steffen.klassert@secunet.com \
    --cc=herbert@gondor.apana.org.au \
    --cc=linux-crypto@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).