diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2015-08-11 08:38:02 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2015-08-11 08:38:02 -0400 |
| commit | db86de59b02be0793dea5e862090586c31998ad1 (patch) | |
| tree | 6f7eafd9c152d4bd0ee921d96b08ada47b3da827 /docs/x509/tutorial.rst | |
| parent | 305021546cb097726ecaab8937cb3e7eb7b4105b (diff) | |
| parent | 246daf7ffe997fbe3c8429e25421125408130bcc (diff) | |
| download | cryptography-db86de59b02be0793dea5e862090586c31998ad1.tar.gz cryptography-db86de59b02be0793dea5e862090586c31998ad1.tar.bz2 cryptography-db86de59b02be0793dea5e862090586c31998ad1.zip | |
Merge pull request #2252 from reaperhulk/x509-ref-update
Update x509 docs to use namespace OIDs
Diffstat (limited to 'docs/x509/tutorial.rst')
| -rw-r--r-- | docs/x509/tutorial.rst | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/docs/x509/tutorial.rst b/docs/x509/tutorial.rst index bcaec809..5e8d54eb 100644 --- a/docs/x509/tutorial.rst +++ b/docs/x509/tutorial.rst @@ -57,14 +57,15 @@ a few details: .. code-block:: pycon >>> from cryptography import x509 + >>> from cryptography.x509.oid import NameOID >>> # Generate a CSR >>> csr = x509.CertificateSigningRequestBuilder().subject_name(x509.Name([ ... # Provide various details about who we are. - ... x509.NameAttribute(x509.OID_COUNTRY_NAME, u"US"), - ... x509.NameAttribute(x509.OID_STATE_OR_PROVINCE_NAME, u"CA"), - ... x509.NameAttribute(x509.OID_LOCALITY_NAME, u"San Francisco"), - ... x509.NameAttribute(x509.OID_ORGANIZATION_NAME, u"My Company"), - ... x509.NameAttribute(x509.COMMON_NAME, u"mysite.com"), + ... x509.NameAttribute(NameOID.COUNTRY_NAME, u"US"), + ... x509.NameAttribute(NameOID.STATE_OR_PROVINCE_NAME, u"CA"), + ... 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"), |