aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Heimes <christian@python.org>2015-11-19 15:14:47 +0100
committerPaul Kehrer <paul.l.kehrer@gmail.com>2016-01-07 11:38:34 -0800
commit7d79649e8d9fc6a4994c814022c5b584ef2670f7 (patch)
tree2d85f632bca053e59699a3499f997d250a99b217
parent952df2ffa4723b390b47205ea932b413a65405fd (diff)
downloadcryptography-7d79649e8d9fc6a4994c814022c5b584ef2670f7.tar.gz
cryptography-7d79649e8d9fc6a4994c814022c5b584ef2670f7.tar.bz2
cryptography-7d79649e8d9fc6a4994c814022c5b584ef2670f7.zip
Change password callback to use userdata pointer
Instead of a closure the pem_password_cb now uses the void *userdata argument to exchange data with the callback function. It's a necessary step to port all callbacks to new static callbacks. See: #2477 Signed-off-by: Christian Heimes <christian@python.org>
-rw-r--r--src/cryptography/hazmat/backends/openssl/backend.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/backend.py b/src/cryptography/hazmat/backends/openssl/backend.py
index e8b0322e..30ad9766 100644
--- a/src/cryptography/hazmat/backends/openssl/backend.py
+++ b/src/cryptography/hazmat/backends/openssl/backend.py
@@ -43,6 +43,7 @@ from cryptography.hazmat.backends.openssl.x509 import (
)
from cryptography.hazmat.bindings._openssl import ffi as _ffi
from cryptography.hazmat.bindings.openssl import binding
+from cryptography.hazmat.bindings._openssl import ffi as _ffi
from cryptography.hazmat.primitives import hashes, serialization
from cryptography.hazmat.primitives.asymmetric import dsa, ec, rsa
from cryptography.hazmat.primitives.asymmetric.padding import (