Do not present users with an option to select the encryption
algorithm. The default is SHA-512. Users can change it with
the auth command in kickstart files.
---
iw/account_gui.py | 25 -----------------
ui/account.glade | 79 -----------------------------------------------------
2 files changed, 0 insertions(+), 104 deletions(-)
diff --git a/iw/account_gui.py b/iw/account_gui.py
index 2afb151..e9764ed 100644
--- a/iw/account_gui.py
+++ b/iw/account_gui.py
@@ -30,7 +30,6 @@ import cracklib
class AccountWindow (InstallWindow):
def getScreen(self, anaconda):
- self.anaconda = anaconda
self.rootPassword = anaconda.id.rootPassword
self.intf = anaconda.intf
@@ -42,22 +41,10 @@ class AccountWindow (InstallWindow):
self.pw = self.xml.get_widget("pw")
self.confirmlabel = self.xml.get_widget("confirmlabel")
self.confirm = self.xml.get_widget("confirm")
- self.algorithms = self.xml.get_widget("algorithms")
# load the icon
gui.readImageFromFile("root-password.png", image=self.icon)
- # populate encoding algorithm combo box
- store = gtk.ListStore(gobject.TYPE_STRING)
- cell = gtk.CellRendererText()
- self.algorithms.set_model(store)
- self.algorithms.pack_start(cell, True)
- self.algorithms.set_attributes(cell, text=0)
-
- self.algorithms.append_text("MD5")
- self.algorithms.append_text("SHA-256")
- self.algorithms.append_text("SHA-512")
-
# connect hotkeys
self.pwlabel.set_text_with_mnemonic(_("Root _Password:"))
self.pwlabel.set_mnemonic_widget(self.pw)
@@ -90,17 +77,6 @@ class AccountWindow (InstallWindow):
else:
label.set_text("")
- def getSelectedAlgo(self):
- model = self.algorithms.get_model()
- active = self.algorithms.get_active()
-
- if active < 0:
- algo = "md5"
- else:
- algo = model[active][0].lower().replace('-', '')
-
- return algo
-
def getNext (self):
pw = self.pw.get_text()
confirm = self.confirm.get_text()
@@ -150,6 +126,5 @@ class AccountWindow (InstallWindow):
self.rootPassword["password"] = self.pw.get_text()
self.rootPassword["isCrypted"] = False
- self.anaconda.id.updatePassAlgo(self.getSelectedAlgo())
return None
diff --git a/ui/account.glade b/ui/account.glade
index cd394d1..08d1f45 100644
--- a/ui/account.glade
+++ b/ui/account.glade
@@ -108,85 +108,6 @@
</child>
<child>
- <widget class="GtkAlignment" id="alignment3">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
-
- <child>
- <widget class="GtkVBox" id="algovbox">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Select default system password encoding algorithm:</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkAlignment" id="alignment5">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xscale">1</property>
- <property name="yscale">1</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">40</property>
- <property name="right_padding">600</property>
-
- <child>
- <widget class="GtkComboBox" id="algorithms">
- <property name="visible">True</property>
- <property name="add_tearoffs">False</property>
- <property name="focus_on_click">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="xalign">0.5</property>
--
1.5.4.1
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
