aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kivilinna <jussi.kivilinna@mbnet.fi>2012-11-13 04:47:37 -0500
committerHerbert Xu <herbert@gondor.apana.org.au>2012-12-06 04:16:27 -0500
commitf56349bdd62480ca73e318aff510868a4be7e769 (patch)
tree5f7af96e56cc8c524e22df785ed5a66da53295bb
parent4e84c1792d544f525ebfd207acebf53e57a57d61 (diff)
crypto: testmgr - clean alg_test_null entries in alg_test_descs[]
Currently alg_test_null entries set .suite values to zero, which is unneeded. So perform clean-up of null test entries. Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--crypto/testmgr.c372
1 files changed, 0 insertions, 372 deletions
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index b8695bfd6606..37b4c0718994 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -1638,300 +1638,66 @@ static const struct alg_test_desc alg_test_descs[] = {
1638 { 1638 {
1639 .alg = "__cbc-cast5-avx", 1639 .alg = "__cbc-cast5-avx",
1640 .test = alg_test_null, 1640 .test = alg_test_null,
1641 .suite = {
1642 .cipher = {
1643 .enc = {
1644 .vecs = NULL,
1645 .count = 0
1646 },
1647 .dec = {
1648 .vecs = NULL,
1649 .count = 0
1650 }
1651 }
1652 }
1653 }, { 1641 }, {
1654 .alg = "__cbc-cast6-avx", 1642 .alg = "__cbc-cast6-avx",
1655 .test = alg_test_null, 1643 .test = alg_test_null,
1656 .suite = {
1657 .cipher = {
1658 .enc = {
1659 .vecs = NULL,
1660 .count = 0
1661 },
1662 .dec = {
1663 .vecs = NULL,
1664 .count = 0
1665 }
1666 }
1667 }
1668 }, { 1644 }, {
1669 .alg = "__cbc-serpent-avx", 1645 .alg = "__cbc-serpent-avx",
1670 .test = alg_test_null, 1646 .test = alg_test_null,
1671 .suite = {
1672 .cipher = {
1673 .enc = {
1674 .vecs = NULL,
1675 .count = 0
1676 },
1677 .dec = {
1678 .vecs = NULL,
1679 .count = 0
1680 }
1681 }
1682 }
1683 }, { 1647 }, {
1684 .alg = "__cbc-serpent-sse2", 1648 .alg = "__cbc-serpent-sse2",
1685 .test = alg_test_null, 1649 .test = alg_test_null,
1686 .suite = {
1687 .cipher = {
1688 .enc = {
1689 .vecs = NULL,
1690 .count = 0
1691 },
1692 .dec = {
1693 .vecs = NULL,
1694 .count = 0
1695 }
1696 }
1697 }
1698 }, { 1650 }, {
1699 .alg = "__cbc-twofish-avx", 1651 .alg = "__cbc-twofish-avx",
1700 .test = alg_test_null, 1652 .test = alg_test_null,
1701 .suite = {
1702 .cipher = {
1703 .enc = {
1704 .vecs = NULL,
1705 .count = 0
1706 },
1707 .dec = {
1708 .vecs = NULL,
1709 .count = 0
1710 }
1711 }
1712 }
1713 }, { 1653 }, {
1714 .alg = "__driver-cbc-aes-aesni", 1654 .alg = "__driver-cbc-aes-aesni",
1715 .test = alg_test_null, 1655 .test = alg_test_null,
1716 .fips_allowed = 1, 1656 .fips_allowed = 1,
1717 .suite = {
1718 .cipher = {
1719 .enc = {
1720 .vecs = NULL,
1721 .count = 0
1722 },
1723 .dec = {
1724 .vecs = NULL,
1725 .count = 0
1726 }
1727 }
1728 }
1729 }, { 1657 }, {
1730 .alg = "__driver-cbc-camellia-aesni", 1658 .alg = "__driver-cbc-camellia-aesni",
1731 .test = alg_test_null, 1659 .test = alg_test_null,
1732 .suite = {
1733 .cipher = {
1734 .enc = {
1735 .vecs = NULL,
1736 .count = 0
1737 },
1738 .dec = {
1739 .vecs = NULL,
1740 .count = 0
1741 }
1742 }
1743 }
1744 }, { 1660 }, {
1745 .alg = "__driver-cbc-cast5-avx", 1661 .alg = "__driver-cbc-cast5-avx",
1746 .test = alg_test_null, 1662 .test = alg_test_null,
1747 .suite = {
1748 .cipher = {
1749 .enc = {
1750 .vecs = NULL,
1751 .count = 0
1752 },
1753 .dec = {
1754 .vecs = NULL,
1755 .count = 0
1756 }
1757 }
1758 }
1759 }, { 1663 }, {
1760 .alg = "__driver-cbc-cast6-avx", 1664 .alg = "__driver-cbc-cast6-avx",
1761 .test = alg_test_null, 1665 .test = alg_test_null,
1762 .suite = {
1763 .cipher = {
1764 .enc = {
1765 .vecs = NULL,
1766 .count = 0
1767 },
1768 .dec = {
1769 .vecs = NULL,
1770 .count = 0
1771 }
1772 }
1773 }
1774 }, { 1666 }, {
1775 .alg = "__driver-cbc-serpent-avx", 1667 .alg = "__driver-cbc-serpent-avx",
1776 .test = alg_test_null, 1668 .test = alg_test_null,
1777 .suite = {
1778 .cipher = {
1779 .enc = {
1780 .vecs = NULL,
1781 .count = 0
1782 },
1783 .dec = {
1784 .vecs = NULL,
1785 .count = 0
1786 }
1787 }
1788 }
1789 }, { 1669 }, {
1790 .alg = "__driver-cbc-serpent-sse2", 1670 .alg = "__driver-cbc-serpent-sse2",
1791 .test = alg_test_null, 1671 .test = alg_test_null,
1792 .suite = {
1793 .cipher = {
1794 .enc = {
1795 .vecs = NULL,
1796 .count = 0
1797 },
1798 .dec = {
1799 .vecs = NULL,
1800 .count = 0
1801 }
1802 }
1803 }
1804 }, { 1672 }, {
1805 .alg = "__driver-cbc-twofish-avx", 1673 .alg = "__driver-cbc-twofish-avx",
1806 .test = alg_test_null, 1674 .test = alg_test_null,
1807 .suite = {
1808 .cipher = {
1809 .enc = {
1810 .vecs = NULL,
1811 .count = 0
1812 },
1813 .dec = {
1814 .vecs = NULL,
1815 .count = 0
1816 }
1817 }
1818 }
1819 }, { 1675 }, {
1820 .alg = "__driver-ecb-aes-aesni", 1676 .alg = "__driver-ecb-aes-aesni",
1821 .test = alg_test_null, 1677 .test = alg_test_null,
1822 .fips_allowed = 1, 1678 .fips_allowed = 1,
1823 .suite = {
1824 .cipher = {
1825 .enc = {
1826 .vecs = NULL,
1827 .count = 0
1828 },
1829 .dec = {
1830 .vecs = NULL,
1831 .count = 0
1832 }
1833 }
1834 }
1835 }, { 1679 }, {
1836 .alg = "__driver-ecb-camellia-aesni", 1680 .alg = "__driver-ecb-camellia-aesni",
1837 .test = alg_test_null, 1681 .test = alg_test_null,
1838 .suite = {
1839 .cipher = {
1840 .enc = {
1841 .vecs = NULL,
1842 .count = 0
1843 },
1844 .dec = {
1845 .vecs = NULL,
1846 .count = 0
1847 }
1848 }
1849 }
1850 }, { 1682 }, {
1851 .alg = "__driver-ecb-cast5-avx", 1683 .alg = "__driver-ecb-cast5-avx",
1852 .test = alg_test_null, 1684 .test = alg_test_null,
1853 .suite = {
1854 .cipher = {
1855 .enc = {
1856 .vecs = NULL,
1857 .count = 0
1858 },
1859 .dec = {
1860 .vecs = NULL,
1861 .count = 0
1862 }
1863 }
1864 }
1865 }, { 1685 }, {
1866 .alg = "__driver-ecb-cast6-avx", 1686 .alg = "__driver-ecb-cast6-avx",
1867 .test = alg_test_null, 1687 .test = alg_test_null,
1868 .suite = {
1869 .cipher = {
1870 .enc = {
1871 .vecs = NULL,
1872 .count = 0
1873 },
1874 .dec = {
1875 .vecs = NULL,
1876 .count = 0
1877 }
1878 }
1879 }
1880 }, { 1688 }, {
1881 .alg = "__driver-ecb-serpent-avx", 1689 .alg = "__driver-ecb-serpent-avx",
1882 .test = alg_test_null, 1690 .test = alg_test_null,
1883 .suite = {
1884 .cipher = {
1885 .enc = {
1886 .vecs = NULL,
1887 .count = 0
1888 },
1889 .dec = {
1890 .vecs = NULL,
1891 .count = 0
1892 }
1893 }
1894 }
1895 }, { 1691 }, {
1896 .alg = "__driver-ecb-serpent-sse2", 1692 .alg = "__driver-ecb-serpent-sse2",
1897 .test = alg_test_null, 1693 .test = alg_test_null,
1898 .suite = {
1899 .cipher = {
1900 .enc = {
1901 .vecs = NULL,
1902 .count = 0
1903 },
1904 .dec = {
1905 .vecs = NULL,
1906 .count = 0
1907 }
1908 }
1909 }
1910 }, { 1694 }, {
1911 .alg = "__driver-ecb-twofish-avx", 1695 .alg = "__driver-ecb-twofish-avx",
1912 .test = alg_test_null, 1696 .test = alg_test_null,
1913 .suite = {
1914 .cipher = {
1915 .enc = {
1916 .vecs = NULL,
1917 .count = 0
1918 },
1919 .dec = {
1920 .vecs = NULL,
1921 .count = 0
1922 }
1923 }
1924 }
1925 }, { 1697 }, {
1926 .alg = "__ghash-pclmulqdqni", 1698 .alg = "__ghash-pclmulqdqni",
1927 .test = alg_test_null, 1699 .test = alg_test_null,
1928 .fips_allowed = 1, 1700 .fips_allowed = 1,
1929 .suite = {
1930 .hash = {
1931 .vecs = NULL,
1932 .count = 0
1933 }
1934 }
1935 }, { 1701 }, {
1936 .alg = "ansi_cprng", 1702 .alg = "ansi_cprng",
1937 .test = alg_test_cprng, 1703 .test = alg_test_cprng,
@@ -2160,165 +1926,39 @@ static const struct alg_test_desc alg_test_descs[] = {
2160 .alg = "cryptd(__driver-cbc-aes-aesni)", 1926 .alg = "cryptd(__driver-cbc-aes-aesni)",
2161 .test = alg_test_null, 1927 .test = alg_test_null,
2162 .fips_allowed = 1, 1928 .fips_allowed = 1,
2163 .suite = {
2164 .cipher = {
2165 .enc = {
2166 .vecs = NULL,
2167 .count = 0
2168 },
2169 .dec = {
2170 .vecs = NULL,
2171 .count = 0
2172 }
2173 }
2174 }
2175 }, { 1929 }, {
2176 .alg = "cryptd(__driver-cbc-camellia-aesni)", 1930 .alg = "cryptd(__driver-cbc-camellia-aesni)",
2177 .test = alg_test_null, 1931 .test = alg_test_null,
2178 .suite = {
2179 .cipher = {
2180 .enc = {
2181 .vecs = NULL,
2182 .count = 0
2183 },
2184 .dec = {
2185 .vecs = NULL,
2186 .count = 0
2187 }
2188 }
2189 }
2190 }, { 1932 }, {
2191 .alg = "cryptd(__driver-ecb-aes-aesni)", 1933 .alg = "cryptd(__driver-ecb-aes-aesni)",
2192 .test = alg_test_null, 1934 .test = alg_test_null,
2193 .fips_allowed = 1, 1935 .fips_allowed = 1,
2194 .suite = {
2195 .cipher = {
2196 .enc = {
2197 .vecs = NULL,
2198 .count = 0
2199 },
2200 .dec = {
2201 .vecs = NULL,
2202 .count = 0
2203 }
2204 }
2205 }
2206 }, { 1936 }, {
2207 .alg = "cryptd(__driver-ecb-camellia-aesni)", 1937 .alg = "cryptd(__driver-ecb-camellia-aesni)",
2208 .test = alg_test_null, 1938 .test = alg_test_null,
2209 .suite = {
2210 .cipher = {
2211 .enc = {
2212 .vecs = NULL,
2213 .count = 0
2214 },
2215 .dec = {
2216 .vecs = NULL,
2217 .count = 0
2218 }
2219 }
2220 }
2221 }, { 1939 }, {
2222 .alg = "cryptd(__driver-ecb-cast5-avx)", 1940 .alg = "cryptd(__driver-ecb-cast5-avx)",
2223 .test = alg_test_null, 1941 .test = alg_test_null,
2224 .suite = {
2225 .cipher = {
2226 .enc = {
2227 .vecs = NULL,
2228 .count = 0
2229 },
2230 .dec = {
2231 .vecs = NULL,
2232 .count = 0
2233 }
2234 }
2235 }
2236 }, { 1942 }, {
2237 .alg = "cryptd(__driver-ecb-cast6-avx)", 1943 .alg = "cryptd(__driver-ecb-cast6-avx)",
2238 .test = alg_test_null, 1944 .test = alg_test_null,
2239 .suite = {
2240 .cipher = {
2241 .enc = {
2242 .vecs = NULL,
2243 .count = 0
2244 },
2245 .dec = {
2246 .vecs = NULL,
2247 .count = 0
2248 }
2249 }
2250 }
2251 }, { 1945 }, {
2252 .alg = "cryptd(__driver-ecb-serpent-avx)", 1946 .alg = "cryptd(__driver-ecb-serpent-avx)",
2253 .test = alg_test_null, 1947 .test = alg_test_null,
2254 .suite = {
2255 .cipher = {
2256 .enc = {
2257 .vecs = NULL,
2258 .count = 0
2259 },
2260 .dec = {
2261 .vecs = NULL,
2262 .count = 0
2263 }
2264 }
2265 }
2266 }, { 1948 }, {
2267 .alg = "cryptd(__driver-ecb-serpent-sse2)", 1949 .alg = "cryptd(__driver-ecb-serpent-sse2)",
2268 .test = alg_test_null, 1950 .test = alg_test_null,
2269 .suite = {
2270 .cipher = {
2271 .enc = {
2272 .vecs = NULL,
2273 .count = 0
2274 },
2275 .dec = {
2276 .vecs = NULL,
2277 .count = 0
2278 }
2279 }
2280 }
2281 }, { 1951 }, {
2282 .alg = "cryptd(__driver-ecb-twofish-avx)", 1952 .alg = "cryptd(__driver-ecb-twofish-avx)",
2283 .test = alg_test_null, 1953 .test = alg_test_null,
2284 .suite = {
2285 .cipher = {
2286 .enc = {
2287 .vecs = NULL,
2288 .count = 0
2289 },
2290 .dec = {
2291 .vecs = NULL,
2292 .count = 0
2293 }
2294 }
2295 }
2296 }, { 1954 }, {
2297 .alg = "cryptd(__driver-gcm-aes-aesni)", 1955 .alg = "cryptd(__driver-gcm-aes-aesni)",
2298 .test = alg_test_null, 1956 .test = alg_test_null,
2299 .fips_allowed = 1, 1957 .fips_allowed = 1,
2300 .suite = {
2301 .cipher = {
2302 .enc = {
2303 .vecs = NULL,
2304 .count = 0
2305 },
2306 .dec = {
2307 .vecs = NULL,
2308 .count = 0
2309 }
2310 }
2311 }
2312 }, { 1958 }, {
2313 .alg = "cryptd(__ghash-pclmulqdqni)", 1959 .alg = "cryptd(__ghash-pclmulqdqni)",
2314 .test = alg_test_null, 1960 .test = alg_test_null,
2315 .fips_allowed = 1, 1961 .fips_allowed = 1,
2316 .suite = {
2317 .hash = {
2318 .vecs = NULL,
2319 .count = 0
2320 }
2321 }
2322 }, { 1962 }, {
2323 .alg = "ctr(aes)", 1963 .alg = "ctr(aes)",
2324 .test = alg_test_skcipher, 1964 .test = alg_test_skcipher,
@@ -2489,18 +2129,6 @@ static const struct alg_test_desc alg_test_descs[] = {
2489 .alg = "ecb(__aes-aesni)", 2129 .alg = "ecb(__aes-aesni)",
2490 .test = alg_test_null, 2130 .test = alg_test_null,
2491 .fips_allowed = 1, 2131 .fips_allowed = 1,
2492 .suite = {
2493 .cipher = {
2494 .enc = {
2495 .vecs = NULL,
2496 .count = 0
2497 },
2498 .dec = {
2499 .vecs = NULL,
2500 .count = 0
2501 }
2502 }
2503 }
2504 }, { 2132 }, {
2505 .alg = "ecb(aes)", 2133 .alg = "ecb(aes)",
2506 .test = alg_test_skcipher, 2134 .test = alg_test_skcipher,