From 4bd70f886bd18faa69e9b1e4a9ee1897202cf202 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Fri, 24 Nov 2017 17:49:12 +0100
Subject: sys/linux: remove crypto algs starting with __

These can't be created from user-space.
---
 sys/linux/init_alg.go | 103 ++------------------------------------------------
 1 file changed, 3 insertions(+), 100 deletions(-)

diff --git a/sys/linux/init_alg.go b/sys/linux/init_alg.go
index 581b3b364..a4265f3c4 100644
--- a/sys/linux/init_alg.go
+++ b/sys/linux/init_alg.go
@@ -112,8 +112,6 @@ var allAlgs = map[int][]algDesc{
 		{"generic-gcm-aesni", nil},
 		{"rfc4106(gcm(aes))", nil},
 		{"rfc4106-gcm-aesni", nil},
-		{"__gcm-aes-aesni", nil},
-		{"__driver-gcm-aes-aesni", nil},
 	},
 	ALG_BLKCIPHER: []algDesc{
 		// templates:
@@ -138,10 +136,9 @@ var allAlgs = map[int][]algDesc{
 		{"chacha20-simd", nil},
 		{"pcbc(aes)", nil},
 		{"pcbc-aes-aesni", nil},
-		{"fpu(pcbc(__aes))", nil},
-		{"fpu(pcbc(__aes-aesni))", nil},
-		{"pcbc(__aes)", nil},
-		{"pcbc(__aes-aesni)", nil},
+		{"fpu(pcbc(aes))", nil},
+		{"fpu(pcbc(aes-aesni))", nil},
+		{"pcbc(aes-aesni)", nil},
 		{"xts(aes)", nil},
 		{"xts-aes-aesni", nil},
 		{"ctr(aes)", nil},
@@ -149,14 +146,6 @@ var allAlgs = map[int][]algDesc{
 		{"cbc-aes-aesni", nil},
 		{"ecb(aes)", nil},
 		{"ecb-aes-aesni", nil},
-		{"__xts(aes)", nil},
-		{"__xts-aes-aesni", nil},
-		{"__ctr(aes)", nil},
-		{"__ctr-aes-aesni", nil},
-		{"__cbc(aes)", nil},
-		{"__cbc-aes-aesni", nil},
-		{"__ecb(aes)", nil},
-		{"__ecb-aes-aesni", nil},
 		{"chacha20-generic", nil},
 		{"xts(serpent)", nil},
 		{"xts-serpent-avx2", nil},
@@ -226,82 +215,6 @@ var allAlgs = map[int][]algDesc{
 		{"ecb(arc4)-generic", nil},
 		{"ecb(cipher_null)", nil},
 		{"ecb-cipher_null", nil},
-		{"__xts-serpent-avx2", nil},
-		{"__driver-xts-serpent-avx2", nil},
-		{"__lrw-serpent-avx2", nil},
-		{"__driver-lrw-serpent-avx2", nil},
-		{"__ctr-serpent-avx2", nil},
-		{"__driver-ctr-serpent-avx2", nil},
-		{"__cbc-serpent-avx2", nil},
-		{"__driver-cbc-serpent-avx2", nil},
-		{"__ecb-serpent-avx2", nil},
-		{"__driver-ecb-serpent-avx2", nil},
-		{"__xts-camellia-aesni-avx2", nil},
-		{"__driver-xts-camellia-aesni-avx2", nil},
-		{"__lrw-camellia-aesni-avx2", nil},
-		{"__driver-lrw-camellia-aesni-avx2", nil},
-		{"__ctr-camellia-aesni-avx2", nil},
-		{"__driver-ctr-camellia-aesni-avx2", nil},
-		{"__cbc-camellia-aesni-avx2", nil},
-		{"__driver-cbc-camellia-aesni-avx2", nil},
-		{"__ecb-camellia-aesni-avx2", nil},
-		{"__driver-ecb-camellia-aesni-avx2", nil},
-		{"__xts-serpent-avx", nil},
-		{"__driver-xts-serpent-avx", nil},
-		{"__lrw-serpent-avx", nil},
-		{"__driver-lrw-serpent-avx", nil},
-		{"__ctr-serpent-avx", nil},
-		{"__driver-ctr-serpent-avx", nil},
-		{"__cbc-serpent-avx", nil},
-		{"__driver-cbc-serpent-avx", nil},
-		{"__ecb-serpent-avx", nil},
-		{"__driver-ecb-serpent-avx", nil},
-		{"__xts-twofish-avx", nil},
-		{"__driver-xts-twofish-avx", nil},
-		{"__lrw-twofish-avx", nil},
-		{"__driver-lrw-twofish-avx", nil},
-		{"__ctr-twofish-avx", nil},
-		{"__driver-ctr-twofish-avx", nil},
-		{"__cbc-twofish-avx", nil},
-		{"__driver-cbc-twofish-avx", nil},
-		{"__ecb-twofish-avx", nil},
-		{"__driver-ecb-twofish-avx", nil},
-		{"__xts-cast6-avx", nil},
-		{"__driver-xts-cast6-avx", nil},
-		{"__lrw-cast6-avx", nil},
-		{"__driver-lrw-cast6-avx", nil},
-		{"__ctr-cast6-avx", nil},
-		{"__driver-ctr-cast6-avx", nil},
-		{"__cbc-cast6-avx", nil},
-		{"__driver-cbc-cast6-avx", nil},
-		{"__ecb-cast6-avx", nil},
-		{"__driver-ecb-cast6-avx", nil},
-		{"__ctr-cast5-avx", nil},
-		{"__driver-ctr-cast5-avx", nil},
-		{"__cbc-cast5-avx", nil},
-		{"__driver-cbc-cast5-avx", nil},
-		{"__ecb-cast5-avx", nil},
-		{"__driver-ecb-cast5-avx", nil},
-		{"__xts-camellia-aesni", nil},
-		{"__driver-xts-camellia-aesni", nil},
-		{"__lrw-camellia-aesni", nil},
-		{"__driver-lrw-camellia-aesni", nil},
-		{"__ctr-camellia-aesni", nil},
-		{"__driver-ctr-camellia-aesni", nil},
-		{"__cbc-camellia-aesni", nil},
-		{"__driver-cbc-camellia-aesni", nil},
-		{"__ecb-camellia-aesni", nil},
-		{"__driver-ecb-camellia-aesni", nil},
-		{"__xts-serpent-sse2", nil},
-		{"__driver-xts-serpent-sse2", nil},
-		{"__lrw-serpent-sse2", nil},
-		{"__driver-lrw-serpent-sse2", nil},
-		{"__ctr-serpent-sse2", nil},
-		{"__driver-ctr-serpent-sse2", nil},
-		{"__cbc-serpent-sse2", nil},
-		{"__driver-cbc-serpent-sse2", nil},
-		{"__ecb-serpent-sse2", nil},
-		{"__driver-ecb-serpent-sse2", nil},
 		{"salsa20-asm", nil},
 		{"xts-twofish-3way", nil},
 		{"lrw-twofish-3way", nil},
@@ -328,8 +241,6 @@ var allAlgs = map[int][]algDesc{
 	},
 	ALG_CIPHER: []algDesc{
 		{"aes", nil},
-		{"__aes", nil},
-		{"__aes-aesni", nil},
 		{"aes-aesni", nil},
 		{"seed", nil},
 		{"seed-generic", nil},
@@ -388,16 +299,10 @@ var allAlgs = map[int][]algDesc{
 		// algorithms:
 		{"sha512", nil},
 		{"sha512_mb", nil},
-		{"__sha512-mb", nil},
-		{"__intel_sha512-mb", nil},
 		{"sha256", nil},
 		{"sha256_mb", nil},
-		{"__sha256-mb", nil},
-		{"__intel_sha256-mb", nil},
 		{"sha1", nil},
 		{"sha1_mb", nil},
-		{"__sha1-mb", nil},
-		{"__intel_sha1-mb", nil},
 		{"ghash", nil},
 		{"ghash-clmulni", nil},
 		{"md4", nil},
@@ -473,8 +378,6 @@ var allAlgs = map[int][]algDesc{
 		{"sha1-avx", nil},
 		{"sha1-ssse3", nil},
 		{"crc32c-intel", nil},
-		{"__ghash", nil},
-		{"__ghash-pclmulqdqni", nil},
 	},
 	ALG_RNG: []algDesc{
 		{"stdrng", nil},
-- 
cgit mrf-deployment