From c02f12ce2f6ae7acfe7bc3d59cc88670049d0382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Wed, 15 May 2019 12:25:20 +0200
Subject: [PATCH] avoid Cloudflare CAPTCHAs for OpenSSL < 1.1.1

see https://github.com/Anorov/cloudflare-scrape/pull/242
---
 README.rst                     | 2 --
 gallery_dl/extractor/common.py | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index 55792ba3..0ee393fb 100644
--- a/README.rst
+++ b/README.rst
@@ -22,7 +22,6 @@ Optional
 
 - FFmpeg_: Pixiv Ugoira to WebM conversion
 - youtube-dl_: Video downloads
-- pyOpenSSL_: Accessing Cloudflare protected sites
 
 
 Installation
@@ -232,7 +231,6 @@ access to *gallery-dl*. Authorize it and you will be shown one or more
 .. _Requests:   http://docs.python-requests.org/en/master/
 .. _FFmpeg:     https://www.ffmpeg.org/
 .. _youtube-dl: https://ytdl-org.github.io/youtube-dl/
-.. _pyOpenSSL:  https://pyopenssl.org/
 .. _Snapd:      https://docs.snapcraft.io/installing-snapd
 .. _OAuth:      https://en.wikipedia.org/wiki/OAuth
 
diff --git a/gallery_dl/extractor/common.py b/gallery_dl/extractor/common.py
index d64bcaa2..bd95b7c8 100644
--- a/gallery_dl/extractor/common.py
+++ b/gallery_dl/extractor/common.py
@@ -412,6 +412,8 @@ if urllib3.__version__ < "1.25":
         "updating default urllib3 ciphers")
     # cipher list taken from urllib3 1.25
     # https://github.com/urllib3/urllib3/blob/1.25/src/urllib3/util/ssl_.py
+    # with additions from
+    # https://github.com/Anorov/cloudflare-scrape/pull/242
     ssl_.DEFAULT_CIPHERS = (
         "ECDHE+AESGCM:"
         "ECDHE+CHACHA20:"
@@ -423,6 +425,8 @@ if urllib3.__version__ < "1.25":
         "DH+AES:"
         "RSA+AESGCM:"
         "RSA+AES:"
+        "!ECDHE+SHA:"
+        "!AES128-SHA:"
         "!aNULL:"
         "!eNULL:"
         "!MD5:"