From c0a9f62a2143bcf32ee9a6db656c8682094cda68 Mon Sep 17 00:00:00 2001 From: Zaran Date: Thu, 19 May 2011 18:23:01 +0200 Subject: Remove the salt field from the registration form. The privkey is handled by the sjcl as a JSON structure containing the ciphertext, the salt, etc. so we don't need a separate field for the salt. --- server/xep_0077.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/server/xep_0077.py b/server/xep_0077.py index ba6523d..f461fb6 100644 --- a/server/xep_0077.py +++ b/server/xep_0077.py @@ -51,10 +51,9 @@ class Registration(ElementBase): def add_form(self): aliasform = Form(None, self) - aliasform.addField(ftype="hidden",var="FORM_TYPE",value="alias:register") - aliasform.addField(var="pubkey",ftype="text-single", label="Public Key", required=True) - aliasform.addField(var="privkey",ftype="text-single", label="Private Key", required=True) - aliasform.addField(var="salt",ftype="text-single", label="Salt", required=True) + aliasform.addField(ftype = "hidden", var = "FORM_TYPE", value = "alias:register") + aliasform.addField(var = "pubkey", ftype = "text-single", label = "Public Key", required = True) + aliasform.addField(var = "privkey", ftype = "text-single", label = "Private Key", required = True) def get_form(self): return Form(self.xml.find('{jabber:x:data}x')).getValues() @@ -70,7 +69,7 @@ class xep_0077(base_plugin): def plugin_init(self): self.description = "In-Band Registration" self.xep = "0077" - self.form_fields = ("privkey", "pubkey", "salt") + self.form_fields = ("privkey", "pubkey") self.form_instructions = "Please provide the following information to register\ an alias account" -- cgit v1.2.3-70-g09d2