diff options
| author | ausiv4 <ausiv4@eb105b4a-77de-11de-a249-6bf219df57d5> | 2009-07-24 15:41:07 +0000 |
|---|---|---|
| committer | ausiv4 <ausiv4@eb105b4a-77de-11de-a249-6bf219df57d5> | 2009-07-24 15:41:07 +0000 |
| commit | 24bea39a0932c2123ead106ab7b72e871ace8e25 (patch) | |
| tree | 87cee88a8df89eb5393d943601bd1a097599c9b1 | |
| parent | 6aeb3f1f571f9bc0df30614d2d599d924f2d409b (diff) | |
Fixed error in jsbn.js, cleaned tables in login and register views.
| -rw-r--r-- | django/srpproject/srp/views.py | 18 | ||||
| -rw-r--r-- | javascript/jsbn.js | 6 |
2 files changed, 11 insertions, 13 deletions
diff --git a/django/srpproject/srp/views.py b/django/srpproject/srp/views.py index 9d2563b..834bce0 100644 --- a/django/srpproject/srp/views.py +++ b/django/srpproject/srp/views.py @@ -12,7 +12,7 @@ from srp import models def generate_salt(): import string, random randomgen = random.SystemRandom() - salt_chars = "!@#$%^&*(),./?`~;:" + string.ascii_letters + string.digits + salt_chars = "./" + string.ascii_letters + string.digits return "".join([randomgen.choice(salt_chars) for i in range(0,16)]) # We want to avoid information leakage. For users that don't exist, we need salts to be consistent. @@ -22,7 +22,7 @@ def generate_salt(): def generate_fake_salt(I): import string, random, settings, hashlib random.seed("%s:%s" % (I, settings.SECRET_KEY)) - salt_chars = "!@#$%^&*(),./?`~;:" + string.ascii_letters + string.digits + salt_chars = "./" + string.ascii_letters + string.digits salt = "".join([random.choice(salt_chars) for i in range(0,16)]) return salt, int(hashlib.sha256("%s:%s" % (salt, settings.SECRET_KEY)).hexdigest(), 16) @@ -44,8 +44,10 @@ def login_page(request): </head> <body> <form action="." onsubmit="return srp_identify()"> - Username: <input type="text" id="srp_username" /><br/> - Password: <input type="password" id="srp_password" /><br/> + <table> + <tr><td>Username:</td><td><input type="text" id="srp_username" /></td></tr> + <tr><td>Password:</td><td><input type="password" id="srp_password" /></td></tr> + </table> <input type="submit"/> </form> </body> @@ -79,9 +81,11 @@ function srp_success() </head> <body> <form action="." onsubmit="return register()"> - Username: <input type="text" id="srp_username" /><br/> - Password: <input type="password" id="srp_password" /><br/> - Password: <input type="password" id="confirm_password" /><br/> + <table> + <tr><td>Username:</td><td><input type="text" id="srp_username" /></td></tr> + <tr><td>Password:</td><td><input type="password" id="srp_password" /></td></tr> + <tr><td>Confirm:</td><td><input type="password" id="confirm_password" /></td></tr> + </table> <input type="submit"/> </form> </body> diff --git a/javascript/jsbn.js b/javascript/jsbn.js index 044abc8..f557d12 100644 --- a/javascript/jsbn.js +++ b/javascript/jsbn.js @@ -29,12 +29,6 @@ * and disclaimer. */ -Address all questions regarding this license to: - - Tom Wu - tjw@cs.Stanford.EDU - - // Basic JavaScript BN library - subset useful for RSA encryption. // Bits per digit |