Author: Brian Kearns <[email protected]>
Branch: stdlib-2.7.6
Changeset: r69601:607fcb7dfabe
Date: 2014-03-02 03:02 -0500
http://bitbucket.org/pypy/pypy/changeset/607fcb7dfabe/
Log: another try at the stubborn ssl rffi usage
diff --git a/pypy/module/_ssl/interp_ssl.py b/pypy/module/_ssl/interp_ssl.py
--- a/pypy/module/_ssl/interp_ssl.py
+++ b/pypy/module/_ssl/interp_ssl.py
@@ -597,7 +597,8 @@
v = space.wrap("URI")
else:
assert False
- as_ = rffi.cast(ASN1_STRING, name[0].c_d)
+ as_ = libssl_pypy_GENERAL_NAME_dirn(name)
+ as_ = rffi.cast(ASN1_STRING, as_)
buf = libssl_ASN1_STRING_data(as_)
length = libssl_ASN1_STRING_length(as_)
w_t = space.newtuple([v,
diff --git a/rpython/rlib/ropenssl.py b/rpython/rlib/ropenssl.py
--- a/rpython/rlib/ropenssl.py
+++ b/rpython/rlib/ropenssl.py
@@ -136,8 +136,7 @@
('d2i', lltype.Ptr(X509V3_EXT_D2I))])
GENERAL_NAME_st = rffi_platform.Struct(
'struct GENERAL_NAME_st',
- [('type', rffi.INT),
- ('d', rffi.VOIDP)])
+ [('type', rffi.INT)])
EVP_MD_st = rffi_platform.Struct(
'EVP_MD',
[('md_size', rffi.INT),
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
