aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-09-04 14:09:25 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-09-04 14:09:25 -0500
commit209e6300a5e53e1024e548664174419cbb55b942 (patch)
treece79e9af74261f785c535238bc369e2324708e57 /docs
parent8d242c78255eb872f53c685230459a2670217e19 (diff)
parentcad58d7bfa1a01ade66828498dcb2894993838b9 (diff)
downloadcryptography-209e6300a5e53e1024e548664174419cbb55b942.tar.gz
cryptography-209e6300a5e53e1024e548664174419cbb55b942.tar.bz2
cryptography-209e6300a5e53e1024e548664174419cbb55b942.zip
Merge branch 'master' into docs-fix
Diffstat (limited to 'docs')
-rw-r--r--docs/x509/tutorial.rst15
1 files changed, 9 insertions, 6 deletions
diff --git a/docs/x509/tutorial.rst b/docs/x509/tutorial.rst
index d1c8ba14..0fa061a2 100644
--- a/docs/x509/tutorial.rst
+++ b/docs/x509/tutorial.rst
@@ -67,13 +67,16 @@ a few details:
... x509.NameAttribute(NameOID.LOCALITY_NAME, u"San Francisco"),
... x509.NameAttribute(NameOID.ORGANIZATION_NAME, u"My Company"),
... x509.NameAttribute(NameOID.COMMON_NAME, u"mysite.com"),
- ... ])).add_extension(x509.SubjectAlternativeName([
- ... # Describe what sites we want this certificate for.
- ... x509.DNSName(u"mysite.com"),
- ... x509.DNSName(u"www.mysite.com"),
- ... x509.DNSName(u"subdomain.mysite.com"),
+ ... ])).add_extension(
+ ... x509.SubjectAlternativeName([
+ ... # Describe what sites we want this certificate for.
+ ... x509.DNSName(u"mysite.com"),
+ ... x509.DNSName(u"www.mysite.com"),
+ ... x509.DNSName(u"subdomain.mysite.com"),
+ ... ]),
+ ... critical=False,
... # Sign the CSR with our private key.
- ... ])).sign(key, hashes.SHA256(), default_backend())
+ ... ).sign(key, hashes.SHA256(), default_backend())
>>> # Write our CSR out to disk.
>>> with open("path/to/csr.pem", "wb") as f:
... f.write(csr.public_bytes(serialization.Encoding.PEM))