From ef8e8ebd917dd911ad6af4f71fc754b631ba4e49 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Thu, 7 May 2015 16:46:38 +0100
Subject: [PATCH] pynacl-0.3.0 was released so we can finally start using it
 directly from pypi

---
 synapse/handlers/register.py   | 2 +-
 synapse/python_dependencies.py | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
index 7b68585a17..c0036e1f40 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -82,7 +82,7 @@ class RegistrationHandler(BaseHandler):
         yield run_on_reactor()
         password_hash = None
         if password:
-            password_hash = bcrypt.hashpw(password, bcrypt.gensalt())
+            password_hash = bcrypt.hashpw(password, bcrypt.gensalt(1))
 
         if localpart:
             yield self.check_username(localpart)
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py
index df4b8f7f94..0d0db4d543 100644
--- a/synapse/python_dependencies.py
+++ b/synapse/python_dependencies.py
@@ -24,7 +24,7 @@ REQUIREMENTS = {
     "pyopenssl>=0.14": ["OpenSSL>=0.14"],
     "pyyaml": ["yaml"],
     "pyasn1": ["pyasn1"],
-    "pynacl": ["nacl"],
+    "pynacl>=0.0.3": ["nacl>=0.0.3"],
     "daemonize": ["daemonize"],
     "py-bcrypt": ["bcrypt"],
     "frozendict>=0.4": ["frozendict"],
@@ -50,11 +50,6 @@ def github_link(project, version, egg):
     return "https://github.com/%s/tarball/%s/#egg=%s" % (project, version, egg)
 
 DEPENDENCY_LINKS = [
-    github_link(
-        project="pyca/pynacl",
-        version="d4d3175589b892f6ea7c22f466e0e223853516fa",
-        egg="pynacl-0.3.0",
-    ),
     github_link(
         project="matrix-org/syutil",
         version="v0.0.6",