summaryrefslogtreecommitdiff
authorbenmeyer <benmeyer>2002-12-12 15:50:46 (UTC)
committer benmeyer <benmeyer>2002-12-12 15:50:46 (UTC)
commit2ebde078dcdc50434acb10f2fa245b0d3dd483bd (patch) (side-by-side diff)
treef58b4c658e34aaa867bbe22e0ad6b481cbdda0dd
parent6c34d8a9165d46eb3d7d28c859e592d0aecbc92f (diff)
downloadopie-2ebde078dcdc50434acb10f2fa245b0d3dd483bd.zip
opie-2ebde078dcdc50434acb10f2fa245b0d3dd483bd.tar.gz
opie-2ebde078dcdc50434acb10f2fa245b0d3dd483bd.tar.bz2
Encryption issues fixed
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/networksetup/wlan/wlanimp.cpp22
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.cpp22
2 files changed, 20 insertions, 24 deletions
diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp
index 84e0bae..cc18fba 100644
--- a/noncore/net/networksetup/wlan/wlanimp.cpp
+++ b/noncore/net/networksetup/wlan/wlanimp.cpp
@@ -95,19 +95,19 @@ void WLANImp::parseSettingFile(){
else{
networkType->setCurrentItem(1);
networkChannel->setEnabled(true);
channelLabel->setEnabled(true);
}
}
- if(line.contains("KEY0="))
+ if(line.contains("#KEY0="))
keyLineEdit0->setText(line.mid(5, line.length()));
- if(line.contains("KEY1="))
+ if(line.contains("#KEY1="))
keyLineEdit1->setText(line.mid(5, line.length()));
- if(line.contains("KEY2="))
+ if(line.contains("#KEY2="))
keyLineEdit2->setText(line.mid(5, line.length()));
- if(line.contains("KEY3="))
+ if(line.contains("#KEY3="))
keyLineEdit3->setText(line.mid(5, line.length()));
if(line.contains("KEY=")){
wepEnabled->setChecked(true);
QString key;
if(line.right(5) == (" open")){
@@ -162,24 +162,23 @@ void WLANImp::changeAndSaveSettingFile(){
if(!line.contains("esac"))
stream << line << "\n";
if(!essAny->isChecked() == true){
stream << "\tESSID=any\n";
stream << "\tMODE=Managed\n";
- stream << "\tCHANNEL=6\n";
}
else{
stream << "\tESSID=" << essSpecificLineEdit->text() << '\n';
stream << "\tMODE=" << ( networkType->currentItem() == 0 ? "Managed" : "ad-hoc") << '\n';
stream << "\tCHANNEL=" << networkChannel->value() << "\n";
}
- stream << "\tKEY0=" << keyLineEdit0->text() << "\n";
- stream << "\tKEY1=" << keyLineEdit1->text() << "\n";
- stream << "\tKEY2=" << keyLineEdit2->text() << "\n";
- stream << "\tKEY3=" << keyLineEdit3->text() << "\n";
+ stream << "\t#KEY0=" << keyLineEdit0->text() << "\n";
+ stream << "\t#KEY1=" << keyLineEdit1->text() << "\n";
+ stream << "\t#KEY2=" << keyLineEdit2->text() << "\n";
+ stream << "\t#KEY3=" << keyLineEdit3->text() << "\n";
if(wepEnabled->isChecked()){
stream << "\tKEY=\"";
if(keyRadio0->isChecked()) stream << keyLineEdit0->text();
if(keyRadio1->isChecked()) stream << keyLineEdit1->text();
if(keyRadio2->isChecked()) stream << keyLineEdit2->text();
@@ -205,20 +204,19 @@ void WLANImp::changeAndSaveSettingFile(){
/**
* Check to see if the current config is valid
* Save wireless.opts, save interfaces
*/
void WLANImp::accept(){
if(wepEnabled->isChecked()){
- if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() )
- {
+ if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() ){
QMessageBox::information(this, "Error", "Please enter a key for WEP.", QMessageBox::Ok);
return;
}
}
- if(essSpecificLineEdit->text().isEmpty()){
+ if(essAny->isChecked() && essSpecificLineEdit->text().isEmpty()){
QMessageBox::information(this, "Error", "Please enter a ESS-ID.", QMessageBox::Ok);
return;
}
// Ok settings are good here, save
changeAndSaveSettingFile();
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index 84e0bae..cc18fba 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -95,19 +95,19 @@ void WLANImp::parseSettingFile(){
else{
networkType->setCurrentItem(1);
networkChannel->setEnabled(true);
channelLabel->setEnabled(true);
}
}
- if(line.contains("KEY0="))
+ if(line.contains("#KEY0="))
keyLineEdit0->setText(line.mid(5, line.length()));
- if(line.contains("KEY1="))
+ if(line.contains("#KEY1="))
keyLineEdit1->setText(line.mid(5, line.length()));
- if(line.contains("KEY2="))
+ if(line.contains("#KEY2="))
keyLineEdit2->setText(line.mid(5, line.length()));
- if(line.contains("KEY3="))
+ if(line.contains("#KEY3="))
keyLineEdit3->setText(line.mid(5, line.length()));
if(line.contains("KEY=")){
wepEnabled->setChecked(true);
QString key;
if(line.right(5) == (" open")){
@@ -162,24 +162,23 @@ void WLANImp::changeAndSaveSettingFile(){
if(!line.contains("esac"))
stream << line << "\n";
if(!essAny->isChecked() == true){
stream << "\tESSID=any\n";
stream << "\tMODE=Managed\n";
- stream << "\tCHANNEL=6\n";
}
else{
stream << "\tESSID=" << essSpecificLineEdit->text() << '\n';
stream << "\tMODE=" << ( networkType->currentItem() == 0 ? "Managed" : "ad-hoc") << '\n';
stream << "\tCHANNEL=" << networkChannel->value() << "\n";
}
- stream << "\tKEY0=" << keyLineEdit0->text() << "\n";
- stream << "\tKEY1=" << keyLineEdit1->text() << "\n";
- stream << "\tKEY2=" << keyLineEdit2->text() << "\n";
- stream << "\tKEY3=" << keyLineEdit3->text() << "\n";
+ stream << "\t#KEY0=" << keyLineEdit0->text() << "\n";
+ stream << "\t#KEY1=" << keyLineEdit1->text() << "\n";
+ stream << "\t#KEY2=" << keyLineEdit2->text() << "\n";
+ stream << "\t#KEY3=" << keyLineEdit3->text() << "\n";
if(wepEnabled->isChecked()){
stream << "\tKEY=\"";
if(keyRadio0->isChecked()) stream << keyLineEdit0->text();
if(keyRadio1->isChecked()) stream << keyLineEdit1->text();
if(keyRadio2->isChecked()) stream << keyLineEdit2->text();
@@ -205,20 +204,19 @@ void WLANImp::changeAndSaveSettingFile(){
/**
* Check to see if the current config is valid
* Save wireless.opts, save interfaces
*/
void WLANImp::accept(){
if(wepEnabled->isChecked()){
- if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() )
- {
+ if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() ){
QMessageBox::information(this, "Error", "Please enter a key for WEP.", QMessageBox::Ok);
return;
}
}
- if(essSpecificLineEdit->text().isEmpty()){
+ if(essAny->isChecked() && essSpecificLineEdit->text().isEmpty()){
QMessageBox::information(this, "Error", "Please enter a ESS-ID.", QMessageBox::Ok);
return;
}
// Ok settings are good here, save
changeAndSaveSettingFile();