diff options
| -rw-r--r-- | requirements.txt | 5 | ||||
| -rw-r--r-- | searx/engines/btdigg.py | 4 | ||||
| -rw-r--r-- | searx/engines/kickass.py | 4 | ||||
| -rw-r--r-- | searx/engines/photon.py | 3 | ||||
| -rw-r--r-- | setup.py | 5 | ||||
| -rw-r--r-- | versions.cfg | 5 |
6 files changed, 15 insertions, 11 deletions
diff --git a/requirements.txt b/requirements.txt index 2d434825d..e021c4a25 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,3 +5,8 @@ lxml pyyaml pygments python-dateutil +ndg-httpsclient +pyopenssl +pyasn1 +pyasn1-modules +certifi diff --git a/searx/engines/btdigg.py b/searx/engines/btdigg.py index d0f05ec2d..944250628 100644 --- a/searx/engines/btdigg.py +++ b/searx/engines/btdigg.py @@ -29,10 +29,6 @@ def request(query, params): params['url'] = search_url.format(search_term=quote(query), pageno=params['pageno']-1) - # FIX: SSLError: hostname 'btdigg.org' - # doesn't match either of 'ssl2000.cloudflare.com', 'cloudflare.com', '*.cloudflare.com' - params['verify'] = False - return params diff --git a/searx/engines/kickass.py b/searx/engines/kickass.py index ea7f17c23..9c4639c32 100644 --- a/searx/engines/kickass.py +++ b/searx/engines/kickass.py @@ -34,10 +34,6 @@ def request(query, params): params['url'] = search_url.format(search_term=quote(query), pageno=params['pageno']) - # FIX: SSLError: hostname 'kickass.so' - # doesn't match either of '*.kickass.to', 'kickass.to' - params['verify'] = False - return params diff --git a/searx/engines/photon.py b/searx/engines/photon.py index a9c558c4b..869916cd4 100644 --- a/searx/engines/photon.py +++ b/searx/engines/photon.py @@ -41,9 +41,6 @@ def request(query, params): # using searx User-Agent params['headers']['User-Agent'] = searx_useragent() - # FIX: SSLError: SSL3_GET_SERVER_CERTIFICATE:certificate verify failed - params['verify'] = False - return params @@ -47,6 +47,11 @@ setup( 'pygments', 'setuptools', 'python-dateutil', + 'pyopenssl', + 'ndg-httpsclient', + 'pyasn1', + 'pyasn1-modules', + 'certifi' ], extras_require={ 'test': [ diff --git a/versions.cfg b/versions.cfg index 7f1734908..1c6f15d40 100644 --- a/versions.cfg +++ b/versions.cfg @@ -32,6 +32,11 @@ speaklater = 1.3 unittest2 = 0.5.1 waitress = 0.8.8 zc.recipe.testrunner = 2.0.0 +pyopenssl = 0.15.1 +ndg-httpsclient = 0.3.3 +pyasn1 = 0.1.7 +pyasn1-modules = 0.0.5 +certifi = 14.05.14 # Required by: # WebTest==2.0.11 |