From dca275040714a7c83da791ecc19940ec6e8f268d Mon Sep 17 00:00:00 2001
From: Roderik van der Veer <roderik.van.der.veer@kunstmaan.be>
Date: Sun, 3 Apr 2016 10:18:44 +0200
Subject: [PATCH 1/2] Update the cryptography dependency to 1.2.3
This fixes the `conflicting types for 'BIO_new_mem_buf'` error when running with a recent openssl version, e.g. under Alpine Linux. See https://github.com/pyca/cryptography/issues/2750
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index 6156b417..26670814 100644
--- a/setup.py
+++ b/setup.py
@@ -71,7 +71,7 @@ setup(
'rethinkdb==2.2.0.post4',
'pysha3==0.3',
'pytz==2015.7',
- 'cryptography==1.2.1',
+ 'cryptography==1.2.3',
'statsd==3.2.1',
'python-rapidjson==0.0.6',
'logstats==0.2.1',
From 722cc323931f44985a71c7d882a04e493beea786 Mon Sep 17 00:00:00 2001
From: Roderik van der Veer <roderik.van.der.veer@kunstmaan.be>
Date: Sun, 3 Apr 2016 11:43:25 +0200
Subject: [PATCH 2/2] Update the documentation to reflect the move of
generate_keys to the crypto module
---
docs/source/python-server-api-examples.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/docs/source/python-server-api-examples.md b/docs/source/python-server-api-examples.md
index cfb313ef..25fc5b19 100644
--- a/docs/source/python-server-api-examples.md
+++ b/docs/source/python-server-api-examples.md
@@ -40,8 +40,10 @@ At a high level, a "digital asset" is something which can be represented digital
In BigchainDB, only the federation nodes are allowed to create digital assets, by doing a special kind of transaction: a `CREATE` transaction.
```python
+from bigchaindb import crypto
+
# create a test user
-testuser1_priv, testuser1_pub = b.generate_keys()
+testuser1_priv, testuser1_pub = crypto.generate_key_pair()
# define a digital asset data payload
digital_asset_payload = {'msg': 'Hello BigchainDB!'}