--- zzzz-none-000/linux-4.4.60/crypto/algboss.c	2017-04-08 07:53:53.000000000 +0000
+++ dragonfly-4020-701/linux-4.4.60/crypto/algboss.c	2018-11-08 13:36:17.000000000 +0000
@@ -248,12 +248,16 @@
 	type = alg->cra_flags;
 
 	/* This piece of crap needs to disappear into per-type test hooks. */
+#ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS
+	type |= CRYPTO_ALG_TESTED;
+#else
 	if (!((type ^ CRYPTO_ALG_TYPE_BLKCIPHER) &
 	      CRYPTO_ALG_TYPE_BLKCIPHER_MASK) && !(type & CRYPTO_ALG_GENIV) &&
 	    ((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==
 	     CRYPTO_ALG_TYPE_BLKCIPHER ? alg->cra_blkcipher.ivsize :
 					 alg->cra_ablkcipher.ivsize))
 		type |= CRYPTO_ALG_TESTED;
+#endif
 
 	param->type = type;