[pypy-commit] pypy py3.6: The session.id is a bytes string with NULs, use ffi.unpack() instead of ffi.string()

[amauryfa]

Author: Amaury Forgeot d'Arc <amaur...@gmail.com>
Branch: py3.6
Changeset: r94419:3f675393a946
Date: 2018-04-22 21:40 +0200
http://bitbucket.org/pypy/pypy/changeset/3f675393a946/

Log:    The session.id is a bytes string with NULs, use ffi.unpack() instead
        of ffi.string()

diff --git a/lib_pypy/_cffi_ssl/_stdssl/__init__.py 
b/lib_pypy/_cffi_ssl/_stdssl/__init__.py
--- a/lib_pypy/_cffi_ssl/_stdssl/__init__.py
+++ b/lib_pypy/_cffi_ssl/_stdssl/__init__.py
@@ -761,7 +761,7 @@
     def id(self):
         lenp = ffi.new("unsigned int*")
         id = lib.SSL_SESSION_get_id(self._session, lenp)
-        return ffi.string(id, lenp[0])
+        return ffi.unpack(id, lenp[0])
 
     @property
     def time(self):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit