aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-05-03 17:55:57 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-05-03 17:55:57 -0400
commit555905218bff81b9aadf1fff247b29bcc0e67351 (patch)
tree26b13b1c414e80fb9d014e486b58b9ce992b9baf /src
parent6df20b374f265da7097195522a181ec02324a419 (diff)
parentc6e0f06135d36533a7543b0a24f144b44019a9dc (diff)
downloadcryptography-555905218bff81b9aadf1fff247b29bcc0e67351.tar.gz
cryptography-555905218bff81b9aadf1fff247b29bcc0e67351.tar.bz2
cryptography-555905218bff81b9aadf1fff247b29bcc0e67351.zip
Merge pull request #1896 from reaperhulk/aki-fix
Fix AKI authority_cert_issuer type
Diffstat (limited to 'src')
-rw-r--r--src/cryptography/x509.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/cryptography/x509.py b/src/cryptography/x509.py
index 27337092..0d87cd51 100644
--- a/src/cryptography/x509.py
+++ b/src/cryptography/x509.py
@@ -666,8 +666,13 @@ class AuthorityKeyIdentifier(object):
"must both be present or both None"
)
- if not isinstance(authority_cert_issuer, Name):
- raise TypeError("authority_cert_issuer must be a Name")
+ if not all(
+ isinstance(x, GeneralName) for x in authority_cert_issuer
+ ):
+ raise TypeError(
+ "authority_cert_issuer must be a list of GeneralName "
+ "objects"
+ )
if not isinstance(authority_cert_serial_number, six.integer_types):
raise TypeError(