diff --git a/[refs] b/[refs] index 333c98e25abe..5b8ed59957d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8280daad436edb7dd9e7e06fc13bcecb6b2a885c +refs/heads/master: 64a947b1337b93061da7c7af1f6ce6b2431b70ae diff --git a/trunk/crypto/algapi.c b/trunk/crypto/algapi.c index c3cf1a69a47a..6fd9bcf876ad 100644 --- a/trunk/crypto/algapi.c +++ b/trunk/crypto/algapi.c @@ -493,6 +493,7 @@ int crypto_register_instance(struct crypto_template *tmpl, goto err; inst->alg.cra_module = tmpl->module; + inst->alg.cra_flags |= CRYPTO_ALG_INSTANCE; down_write(&crypto_alg_sem); diff --git a/trunk/include/linux/crypto.h b/trunk/include/linux/crypto.h index e5e468e9133d..de9adec5693c 100644 --- a/trunk/include/linux/crypto.h +++ b/trunk/include/linux/crypto.h @@ -71,6 +71,11 @@ #define CRYPTO_ALG_TESTED 0x00000400 +/* + * Set if the algorithm is an instance that is build from templates. + */ +#define CRYPTO_ALG_INSTANCE 0x00000800 + /* * Transform masks and values (for crt_flags). */