Fixed bug in views.py, changed files named 'hash' to 'crypto' since it now includes AES.

4 files changed, 6 insertions, 6 deletions

diff --git a/django/srpproject/srp/views.py b/django/srpproject/srp/views.py
index e7de7c6..cde4e5a 100644
--- a/django/srpproject/srp/views.py
+++ b/django/srpproject/srp/views.py
@@ -45,7 +45,7 @@ def generate_verifier(salt, username, password):
 def login_page(request):
     from django.shortcuts import render_to_response
     return render_to_response('login.html', \
-        {'error': "Invalid username or password" if request.GET["error"] == '1' and not request.user.is_authenticated() else "",\
+        {'error': "Invalid username or password" if "error" in request.GET and request.GET["error"] == '1' and not request.user.is_authenticated() else "",\
         'static_files': "http://%s/srp-test/javascript" % request.get_host(), \
         'srp_url': "http://%s/srp/" % request.get_host()})
 
diff --git a/javascript/jsPacker/build-pack-crypto.sh b/javascript/jsPacker/build-pack-crypto.sh
new file mode 100644
index 0000000..bf902f9
--- /dev/null
+++ b/javascript/jsPacker/build-pack-crypto.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+cat ../aes.js ../cryptoHelpers.js ../SHA1.js ../MD5.js > crypto.js
+perl jsPacker.pl -fsq -e62 -i crypto.js -o crypto.min.js
+rm crypto.js
diff --git a/javascript/jsPacker/build-pack-hash.sh b/javascript/jsPacker/build-pack-hash.sh
deleted file mode 100644
index adeaefe..0000000
--- a/javascript/jsPacker/build-pack-hash.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-cat ../aes.js ../cryptoHelpers.js ../SHA1.js ../MD5.js > hash.js
-perl jsPacker.pl -fsq -e62 -i hash.js -o hash.min.js
-rm hash.js
diff --git a/javascript/srp.js b/javascript/srp.js
index ae7096c..cacc6cd 100644
--- a/javascript/srp.js
+++ b/javascript/srp.js
@@ -284,7 +284,7 @@ function SRP()
         var path = arr.slice(0, arr.length-1).join("/");
         // If this file is called srp.min.js, we will load the packed hash file
         if(arr[arr.length-1] == "srp.min.js")
-            import_file(path+"/hash.min.js");
+            import_file(path+"/crypto.min.js");
         // Otherwise, this file is presumably srp.js, and we will load individual hash files
         else
         {