aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-05-02 22:31:47 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-05-02 22:31:47 -0500
commitf506bca3d2bb449c3889cbbaba11749304e81563 (patch)
treef3b9206790a07fe1ec7d0ef5eca6dc6fd7f529e6 /src
parent3e6d558d1b845cf2df31efec08235b15998174d4 (diff)
downloadcryptography-f506bca3d2bb449c3889cbbaba11749304e81563.tar.gz
cryptography-f506bca3d2bb449c3889cbbaba11749304e81563.tar.bz2
cryptography-f506bca3d2bb449c3889cbbaba11749304e81563.zip
updates based on review feedback
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/x509.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py
index 2bbd14d7..27337092 100644
--- a/src/cryptography/x509.py
+++ b/src/cryptography/x509.py
@@ -67,8 +67,8 @@ _OID_NAMES = {
"1.3.6.1.5.5.7.1.1": "authorityInfoAccess",
"1.3.6.1.5.5.7.1.11": "subjectInfoAccess",
"1.3.6.1.5.5.7.48.1.5": "OCSPNoCheck",
- "1.3.6.1.5.5.7.48.2": "caIssuers",
"1.3.6.1.5.5.7.48.1": "OCSP",
+ "1.3.6.1.5.5.7.48.2": "caIssuers",
}
@@ -428,7 +428,9 @@ class AuthorityInformationAccess(object):
class AccessDescription(object):
def __init__(self, access_method, access_location):
if not (access_method == OID_OCSP or access_method == OID_CA_ISSUERS):
- raise TypeError("access_method must be OID_OCSP or OID_CA_ISSUERS")
+ raise ValueError(
+ "access_method must be OID_OCSP or OID_CA_ISSUERS"
+ )
if not isinstance(access_location, GeneralName):
raise TypeError("access_location must be a GeneralName")