aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | Address dreid's commentsAlex Gaynor2013-12-161-10/+16
| | | | | |
| | * | | | Merge branch 'master' into fernetAlex Gaynor2013-12-154-4/+4
| | |\
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
@@ -26,6 +26,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/log2.h>
+#include <linux/of.h>
 
 #include "rt2x00.h"
 #include "rt2x00lib.h"
@@ -951,6 +952,16 @@ static int rt2x00lib_probe_hw_modes(stru
 	struct ieee80211_rate *rates;
 	unsigned int num_rates;
 	unsigned int i;
+#ifdef CONFIG_OF
+	struct device_node *np = rt2x00dev->dev->of_node;
+	unsigned int enabled;
+	if (!of_property_read_u32(np, "ralink,2ghz",
+                                          &enabled) && !enabled)
+		spec->supported_bands &= ~SUPPORT_BAND_2GHZ;
+	if (!of_property_read_u32(np, "ralink,5ghz",
+                                          &enabled) && !enabled)
+		spec->supported_bands &= ~SUPPORT_BAND_5GHZ;
+#endif /* CONFIG_OF */
 
 	if (rt2x00dev->dev->platform_data) {
 		struct rt2x00_platform_data *pdata;
> | | | fix, technicallyAlex Gaynor2013-11-221-1/+1 | | | | | | | | | | | | | | * | | | | | | | | | Hide the dangerous bitsAlex Gaynor2013-11-221-8/+7 | | | | | | | | | | | | | | * | | | | | | | | | Key in the right placeAlex Gaynor2013-11-201-5/+5 | | | | | | | | | | | | | | * | | | | | | | | | Merge branch 'master' into fernetAlex Gaynor2013-11-1918-362/+471 | | |\ \ \ \ \ \ \ \ \ \ | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fernetAlex Gaynor2013-11-0716-54/+1856 | | |\ \ \ \ \ \ \ \ \ \ \ | | * | | | | | | | | | | | Include the licenseAlex Gaynor2013-11-021-0/+13 | | | | | | | | | | | | | | | | * | | | | | | | | | | | Merge branch 'master' into fernetAlex Gaynor2013-11-0113-77/+549 | | |\ \ \ \ \ \ \ \ \ \ \ \ | | * | | | | | | | | | | | | py3k fixesAlex Gaynor2013-10-311-2/+2 | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | write more readablyAlex Gaynor2013-10-311-3/+1 | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | Merge branch 'master' into fernetAlex Gaynor2013-10-312-24/+2 | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | * | | | | | | | | | | | | | A test for roundtrippingAlex Gaynor2013-10-311-0/+7 | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | Fixed pep8 issuesAlex Gaynor2013-10-311-6/+4 | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | Started working on the invalid casesAlex Gaynor2013-10-312-6/+80 | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | Use raw vector filesAlex Gaynor2013-10-313-19/+55 | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | Merge branch 'master' into fernetAlex Gaynor2013-10-31238-347/+336 | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | * | | | | | | | | | | | | | | py3k syntax fixAlex Gaynor2013-10-311-2/+2 | | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | Address pep8 concernsAlex Gaynor2013-10-311-3/+5 | | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | Fixed test and implementationAlex Gaynor2013-10-311-2/+8 | | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | Added test cases, fixed a bugAlex Gaynor2013-10-311-0/+23 | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | missing #Paul Kehrer2014-01-041-1/+1 | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | make the dummy_initializer fail with an actual verify callPaul Kehrer2014-01-041-1/+2 | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | remove unneeded mark now that is_available is therePaul Kehrer2014-01-043-41/+2 | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | fix py3Paul Kehrer2014-01-041-9/+10 | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | add commoncrypto mark to skip on non-OS X platformsPaul Kehrer2014-01-045-2/+74 | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | instantiate hash objects for hmac checks tooPaul Kehrer2014-01-042-8/+8 | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | Instantiate our hash objects used for supported checksPaul Kehrer2014-01-042-16/+16 | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | Merge pull request #272 from alex/validate-ivDavid Reid2014-01-032-0/+40 | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Validate the IV/nonce length for a given algorithm. | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into validate-ivAlex Gaynor2014-01-023-17/+31 | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cryptography/hazmat/primitives/ciphers/modes.py | | * | | | | | | | | | | | | | | | Merge branch 'master' into validate-ivAlex Gaynor2014-01-0117-491/+600 | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/hazmat/backends/test_openssl.py tests/hazmat/primitives/test_block.py | | * | | | | | | | | | | | | | | | Merge branch 'master' into validate-ivAlex Gaynor2013-12-158-9/+279 | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cryptography/hazmat/primitives/ciphers/modes.py tests/hazmat/primitives/test_block.py | | * | | | | | | | | | | | | | | | Merge branch 'master' into validate-ivAlex Gaynor2013-11-271-2/+2 | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | Merge branch 'master' into validate-ivAlex Gaynor2013-11-275-30/+59 | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/hazmat/primitives/test_block.py | | * | | | | | | | | | | | | | | | fixed typoAlex Gaynor2013-11-191-1/+1 | | | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | test for ctrAlex Gaynor2013-11-191-0/+8 | | | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | Tests for OFB and CFBAlex Gaynor2013-11-191-0/+16 | | | | | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | Validate the IV/nonce length for a given algorithm.Alex Gaynor2013-11-192-2/+18 | | | |_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #159 | * | | | | | | | | | | | | | | | backend support check now lists which backend caused the skipPaul Kehrer2014-01-032-2/+4 | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | * | | | | | | | | | | | | | | | handle lib/ffi on backend becoming privatePaul Kehrer2014-01-021-64/+64 | | | | | | | | | | | | | | | | * | | | | | | | | | | | | | | | Merge branch 'master' into urandom-enginePaul Kehrer2014-01-021-11/+6 |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Revert "Travis now has an up to date pypy" Make capitalization in the glossary consistent and sort it Make lib and ffi be private on backend | * | | | | | | | | | | | | | | Merge branch 'master' into privatize-me-captainAlex Gaynor2014-01-011-6/+3 | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cryptography/hazmat/backends/openssl/backend.py | * | | | | | | | | | | | | | | | Make lib and ffi be private on backendAlex Gaynor2014-01-011-11/+6 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because now they are public on a binding instance if you need them! * | | | | | | | | | | | | | | | | Merge branch 'master' into urandom-enginePaul Kehrer2014-01-012-6/+25 |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Split OpenSSL binding Fixed test for earlier exceptino Rearrange Move GCM tag size/value validation farther forward -- this makes it easier by not requiring future backends to implement the same checks expose num_locks and {get,set}_{id,locking}_callback Make the PyPy tox job consistent with the main one. THis should be a seperate PR Typo fix This page has been subsumed by the index Bump the copyright year Document compiling OpenSSL to avoid conflicts Conflicts: cryptography/hazmat/backends/openssl/backend.py