From 3dce04db0d0c65716fef7d467a108aa0951a0ad1 Mon Sep 17 00:00:00 2001
From: Fred Wenzel <fwenzel@mozilla.com>
Date: Tue, 29 Mar 2011 12:45:23 -0700
Subject: [PATCH] Updated django-sha2 to contain bcrypt/hmac goodness.

---
 settings.py | 6 +++++-
 vendor      | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/settings.py b/settings.py
index f03a2dcea0..b53bb302c9 100644
--- a/settings.py
+++ b/settings.py
@@ -183,6 +183,7 @@ INSTALLED_APPS = (
     # Django contrib apps
     'django.contrib.auth',
     'django_sha2',  # Load after auth to monkey-patch it.
+
     'django.contrib.contenttypes',
     # 'django.contrib.sessions',
     # 'django.contrib.sites',
@@ -225,7 +226,10 @@ DOMAIN_METHODS = {
 JAVA_BIN = '/usr/bin/java'
 
 ## Auth
-AUTHENTICATION_BACKENDS = ('django_sha2.auth.Sha512Backend',)
+PWD_ALGORITHM = 'bcrypt'
+HMAC_KEYS = {
+    #'2011-01-01': 'cheesecake',
+}
 
 ## Tests
 TEST_RUNNER = 'test_utils.runner.RadicalTestSuiteRunner'
diff --git a/vendor b/vendor
index bf70f64627..f4ebd6a68f 160000
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit bf70f6462792796ebdb1b75b7cbf5f2714df5f22
+Subproject commit f4ebd6a68f516c29ac34d11aa471d5e58e7ed3fc