From 99b16a7a19b68d8ab7638a2b8b36aa5a5440ed76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=A3=E5=8F=AF=E5=8F=A3=E5=8F=AF?= <32983588+zkqiang@users.noreply.github.com> Date: Thu, 1 Nov 2018 14:21:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=2011.10=20=E8=8A=82?= =?UTF-8?q?=E7=9A=84=E7=BC=A9=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/c11/p10_add_ssl_to_network_services.rst | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/source/c11/p10_add_ssl_to_network_services.rst b/source/c11/p10_add_ssl_to_network_services.rst index 17419faa..53bc8dd6 100644 --- a/source/c11/p10_add_ssl_to_network_services.rst +++ b/source/c11/p10_add_ssl_to_network_services.rst @@ -78,13 +78,13 @@ .. code-block:: python - import ssl + import ssl - class SSLMixin: - ''' - Mixin class that adds support for SSL to existing servers based - on the socketserver module. - ''' + class SSLMixin: + ''' + Mixin class that adds support for SSL to existing servers based + on the socketserver module. + ''' def __init__(self, *args, keyfile=None, certfile=None, ca_certs=None, cert_reqs=ssl.CERT_NONE, @@ -253,7 +253,7 @@ 例如,web浏览器保存了主要的认证机构的证书,并使用它来为每一个HTTPS连接确认证书的合法性。 对本小节示例而言,只是为了测试,我们可以创建自签名的证书,下面是主要步骤: - +:: bash % openssl req -new -x509 -days 365 -nodes -out server_cert.pem \ -keyout server_key.pem Generating a 1024 bit RSA private key @@ -282,6 +282,7 @@ 在创建证书的时候,各个值的设定可以是任意的,但是”Common Name“的值通常要包含服务器的DNS主机名。 如果你只是在本机测试,那么就使用”localhost“,否则使用服务器的域名。 +:: -----BEGIN RSA PRIVATE KEY----- MIICXQIBAAKBgQCZrCNLoEyAKF+f9UNcFaz5Osa6jf7qkbUl8si5xQrY3ZYC7juu nL1dZLn/VbEFIITaUOgvBtPv1qUWTJGwga62VSG1oFE0ODIx3g2Nh4sRf+rySsx2 @@ -300,6 +301,7 @@ 服务器证书文件server_cert.pem内容类似下面这样: +:: -----BEGIN CERTIFICATE----- MIIC+DCCAmGgAwIBAgIJAPMd+vi45js3MA0GCSqGSIb3DQEBBQUAMFwxCzAJBgNV BAYTAlVTMREwDwYDVQQIEwhJbGxpbm9pczEQMA4GA1UEBxMHQ2hpY2FnbzEUMBIG From 9a5c5c4f60ae628d7b96930c71684965605301b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=A3=E5=8F=AF=E5=8F=A3=E5=8F=AF?= <32983588+zkqiang@users.noreply.github.com> Date: Thu, 1 Nov 2018 14:25:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=2011.10=20=E8=8A=82?= =?UTF-8?q?=E7=9A=84=E7=BC=A9=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/c11/p10_add_ssl_to_network_services.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/c11/p10_add_ssl_to_network_services.rst b/source/c11/p10_add_ssl_to_network_services.rst index 53bc8dd6..8fe9f383 100644 --- a/source/c11/p10_add_ssl_to_network_services.rst +++ b/source/c11/p10_add_ssl_to_network_services.rst @@ -81,10 +81,10 @@ import ssl class SSLMixin: - ''' - Mixin class that adds support for SSL to existing servers based - on the socketserver module. - ''' + ''' + Mixin class that adds support for SSL to existing servers based + on the socketserver module. + ''' def __init__(self, *args, keyfile=None, certfile=None, ca_certs=None, cert_reqs=ssl.CERT_NONE,