diff options
| author | Simeon Simeonov | 2015-12-16 08:03:01 +0100 |
|---|---|---|
| committer | Simeon Simeonov | 2015-12-16 08:03:01 +0100 |
| commit | fec60828bc210af96a5c04de6965c5f5499c8c4c (patch) | |
| tree | 93ba8d6ae96150fc37f44565f9f61bfd43dd0962 | |
| parent | ae9225cf2b731cc1fa5116d73ddef6945af79efd (diff) | |
Remove SSLv3 supportpmaster
| -rwxr-xr-x | beinc_generic_client.py | 3 | ||||
| -rwxr-xr-x | beinc_poller.py | 3 | ||||
| -rw-r--r-- | beinc_weechat.py | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/beinc_generic_client.py b/beinc_generic_client.py index f90164d..c76a88c 100755 --- a/beinc_generic_client.py +++ b/beinc_generic_client.py | |||
| @@ -34,8 +34,7 @@ __version__ = '2.0' | |||
| 34 | __license__ = 'GPL3' | 34 | __license__ = 'GPL3' |
| 35 | 35 | ||
| 36 | 36 | ||
| 37 | BEINC_SSL_METHODS = {'SSLv3': ssl.PROTOCOL_SSLv3, | 37 | BEINC_SSL_METHODS = {'TLSv1': ssl.PROTOCOL_TLSv1} |
| 38 | 'TLSv1': ssl.PROTOCOL_TLSv1} | ||
| 39 | try: | 38 | try: |
| 40 | BEINC_SSL_METHODS.update({'TLSv1_1': ssl.PROTOCOL_TLSv1_1}) | 39 | BEINC_SSL_METHODS.update({'TLSv1_1': ssl.PROTOCOL_TLSv1_1}) |
| 41 | BEINC_SSL_METHODS.update({'TLSv1_2': ssl.PROTOCOL_TLSv1_2}) | 40 | BEINC_SSL_METHODS.update({'TLSv1_2': ssl.PROTOCOL_TLSv1_2}) |
diff --git a/beinc_poller.py b/beinc_poller.py index 31d1a37..5cceeaa 100755 --- a/beinc_poller.py +++ b/beinc_poller.py | |||
| @@ -52,8 +52,7 @@ __version__ = '2.0' | |||
| 52 | __license__ = 'GPL3' | 52 | __license__ = 'GPL3' |
| 53 | 53 | ||
| 54 | 54 | ||
| 55 | BEINC_SSL_METHODS = {'SSLv3': ssl.PROTOCOL_SSLv3, | 55 | BEINC_SSL_METHODS = {'TLSv1': ssl.PROTOCOL_TLSv1} |
| 56 | 'TLSv1': ssl.PROTOCOL_TLSv1} | ||
| 57 | try: | 56 | try: |
| 58 | BEINC_SSL_METHODS.update({'TLSv1_1': ssl.PROTOCOL_TLSv1_1}) | 57 | BEINC_SSL_METHODS.update({'TLSv1_1': ssl.PROTOCOL_TLSv1_1}) |
| 59 | BEINC_SSL_METHODS.update({'TLSv1_2': ssl.PROTOCOL_TLSv1_2}) | 58 | BEINC_SSL_METHODS.update({'TLSv1_2': ssl.PROTOCOL_TLSv1_2}) |
diff --git a/beinc_weechat.py b/beinc_weechat.py index 486c4f7..a71258c 100644 --- a/beinc_weechat.py +++ b/beinc_weechat.py | |||
| @@ -43,8 +43,7 @@ BEINC_POLICY_ALL = 1 | |||
| 43 | BEINC_POLICY_LIST_ONLY = 2 | 43 | BEINC_POLICY_LIST_ONLY = 2 |
| 44 | BEINC_CURRENT_CONFIG_VERSION = 2 | 44 | BEINC_CURRENT_CONFIG_VERSION = 2 |
| 45 | 45 | ||
| 46 | BEINC_SSL_METHODS = {'SSLv3': ssl.PROTOCOL_SSLv3, | 46 | BEINC_SSL_METHODS = {'TLSv1': ssl.PROTOCOL_TLSv1} |
| 47 | 'TLSv1': ssl.PROTOCOL_TLSv1} | ||
| 48 | try: | 47 | try: |
| 49 | BEINC_SSL_METHODS.update({'TLSv1_1': ssl.PROTOCOL_TLSv1_1}) | 48 | BEINC_SSL_METHODS.update({'TLSv1_1': ssl.PROTOCOL_TLSv1_1}) |
| 50 | BEINC_SSL_METHODS.update({'TLSv1_2': ssl.PROTOCOL_TLSv1_2}) | 49 | BEINC_SSL_METHODS.update({'TLSv1_2': ssl.PROTOCOL_TLSv1_2}) |
