aboutsummaryrefslogtreecommitdiffstats
path: root/cryptography
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-02-24 19:04:46 -0600
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-02-24 19:04:46 -0600
commit0377f5a78de949f2f1e719ac89cf8b98b910bf81 (patch)
tree47247662ee64c5e00625de410abd2d9a6ab50fc7 /cryptography
parent8dd9713ae2a69a3e870275c088df08ce2a50dce9 (diff)
downloadcryptography-0377f5a78de949f2f1e719ac89cf8b98b910bf81.tar.gz
cryptography-0377f5a78de949f2f1e719ac89cf8b98b910bf81.tar.bz2
cryptography-0377f5a78de949f2f1e719ac89cf8b98b910bf81.zip
rename PKCS1->PKCS1v15 & UnsupportedAsymmetricPadding->UnsupportedPadding
Diffstat (limited to 'cryptography')
-rw-r--r--cryptography/exceptions.py2
-rw-r--r--cryptography/hazmat/primitives/asymmetric/padding.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/cryptography/exceptions.py b/cryptography/exceptions.py
index 1144cb94..b4962591 100644
--- a/cryptography/exceptions.py
+++ b/cryptography/exceptions.py
@@ -48,5 +48,5 @@ class InvalidToken(Exception):
pass
-class UnsupportedAsymmetricPadding(Exception):
+class UnsupportedPadding(Exception):
pass
diff --git a/cryptography/hazmat/primitives/asymmetric/padding.py b/cryptography/hazmat/primitives/asymmetric/padding.py
index ca00e94b..6bafe314 100644
--- a/cryptography/hazmat/primitives/asymmetric/padding.py
+++ b/cryptography/hazmat/primitives/asymmetric/padding.py
@@ -18,5 +18,5 @@ from cryptography.hazmat.primitives import interfaces
@utils.register_interface(interfaces.AsymmetricPadding)
-class PKCS1(object):
+class PKCS1v15(object):
name = "EMSA-PKCS1-v1_5"