Skip to content

Commit 51fccd0

Browse files
committed
update cryptography to 1.2.3
1 parent 93728aa commit 51fccd0

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

pythonforandroid/recipes/cryptography/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
class CryptographyRecipe(CompiledComponentsPythonRecipe):
77
name = 'cryptography'
8-
version = '1.1.2'
8+
version = '1.2.3'
99
url = 'https://pypi.python.org/packages/source/c/cryptography/cryptography-{version}.tar.gz'
1010

1111
depends = [('python2', 'python3crystax'), 'cffi', 'enum34', 'openssl', 'ipaddress', 'idna']

pythonforandroid/recipes/cryptography/link-static.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
--- cryptography/src/_cffi_src/build_openssl.py 2015-12-10 13:53:28.000000000 -0600
2-
+++ b/src/_cffi_src/build_openssl.py 2016-01-06 14:58:59.735728893 -0600
3-
@@ -10,50 +10,6 @@
4-
from _cffi_src.utils import build_ffi_for_binding, extra_link_args
1+
--- cryptography/src/_cffi_src/build_openssl.py 2016-03-07 17:20:59.771109661 -0600
2+
+++ b/src/_cffi_src/build_openssl.py 2016-03-07 17:22:00.167111227 -0600
3+
@@ -12,50 +12,6 @@
4+
)
55

66

77
-def _get_openssl_libraries(platform):
@@ -51,14 +51,14 @@
5151
ffi = build_ffi_for_binding(
5252
module_name="_openssl",
5353
module_prefix="_cffi_src.openssl.",
54-
@@ -89,8 +45,6 @@
55-
"x509_vfy",
54+
@@ -92,8 +48,6 @@
5655
"pkcs7",
56+
"callbacks",
5757
],
5858
- pre_include=_OSX_PRE_INCLUDE,
5959
- post_include=_OSX_POST_INCLUDE,
6060
- libraries=_get_openssl_libraries(sys.platform),
61-
- extra_link_args=extra_link_args(sys.platform),
61+
- extra_link_args=extra_link_args(compiler_type()),
6262
+ libraries=[],
6363
+ extra_link_args=[os.environ['LIBSSL'], os.environ['LIBCRYPTO']],
6464
)

0 commit comments

Comments
 (0)