summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sshkeys/main.cpp23
-rw-r--r--noncore/settings/sshkeys/sshkeys.cpp20
-rw-r--r--noncore/settings/sshkeys/sshkeys.h20
3 files changed, 61 insertions, 2 deletions
diff --git a/noncore/settings/sshkeys/main.cpp b/noncore/settings/sshkeys/main.cpp
index a7b1d56..9f19d0f 100644
--- a/noncore/settings/sshkeys/main.cpp
+++ b/noncore/settings/sshkeys/main.cpp
@@ -1,30 +1,49 @@
1/*
2 * ssh-agent key manipulation utility
3 *
4 * (C) 2002 David Woodhouse <dwmw2@infradead.org>
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; either version 2 of the License, or
9 * (at your option) any later version.
10 *
11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details.
15 *
16 * You should have received a copy of the GNU General Public License
17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19 *
20 */
1 21
2#include <qpe/qpeapplication.h> 22#include <qpe/qpeapplication.h>
3#include "sshkeys.h" 23#include "sshkeys.h"
4#include <stdio.h> 24#include <stdio.h>
5#include <sys/types.h> 25#include <sys/types.h>
6#include <sys/stat.h> 26#include <sys/stat.h>
7#include <fcntl.h> 27#include <fcntl.h>
8#include <sys/ioctl.h> 28#include <sys/ioctl.h>
9#include <unistd.h> 29#include <unistd.h>
10 30
11
12int main(int argc, char *argv[]) 31int main(int argc, char *argv[])
13{ 32{
14 QPEApplication a(argc, argv); 33 QPEApplication a(argc, argv);
15 SSHKeysApp app; 34 SSHKeysApp app;
16 int fd; 35 int fd;
17 36
18 /* If we had a controlling TTY, detach from it. 37 /* If we had a controlling TTY, detach from it.
19 This is to ensure the SSH uses ssh-askpass */ 38 This is to ensure that SSH uses ssh-askpass */
20 fd = open("/dev/tty", O_RDONLY); 39 fd = open("/dev/tty", O_RDONLY);
21 if (fd != -1) { 40 if (fd != -1) {
22 ioctl(fd, TIOCNOTTY, NULL); 41 ioctl(fd, TIOCNOTTY, NULL);
23 close(fd); 42 close(fd);
24 } 43 }
25 44
26 a.showMainWidget(&app); 45 a.showMainWidget(&app);
27 46
28 return a.exec(); 47 return a.exec();
29} 48}
30 49
diff --git a/noncore/settings/sshkeys/sshkeys.cpp b/noncore/settings/sshkeys/sshkeys.cpp
index 3b4dce6..88acf94 100644
--- a/noncore/settings/sshkeys/sshkeys.cpp
+++ b/noncore/settings/sshkeys/sshkeys.cpp
@@ -1,24 +1,44 @@
1/*
2 * ssh-agent key manipulation utility
3 *
4 * (C) 2002 David Woodhouse <dwmw2@infradead.org>
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; either version 2 of the License, or
9 * (at your option) any later version.
10 *
11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details.
15 *
16 * You should have received a copy of the GNU General Public License
17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19 *
20 */
1#include "sshkeys.h" 21#include "sshkeys.h"
2 22
3#include <qpe/qpeapplication.h> 23#include <qpe/qpeapplication.h>
4#include <opie/oprocess.h> 24#include <opie/oprocess.h>
5#include <qmultilineedit.h> 25#include <qmultilineedit.h>
6#include <qpushbutton.h> 26#include <qpushbutton.h>
7#include <qlistview.h> 27#include <qlistview.h>
8#include <qcombobox.h> 28#include <qcombobox.h>
9 29
10#include <sys/types.h> 30#include <sys/types.h>
11#include <sys/stat.h> 31#include <sys/stat.h>
12#include <stdlib.h> 32#include <stdlib.h>
13#include <unistd.h> 33#include <unistd.h>
14#include <stdio.h> 34#include <stdio.h>
15#include <ctype.h> 35#include <ctype.h>
16 36
17static char *keynames[] = { "identity", "id_rsa", "id_dsa" }; 37static char *keynames[] = { "identity", "id_rsa", "id_dsa" };
18 38
19SSHKeysApp::SSHKeysApp( QWidget* parent, const char* name, WFlags fl ) 39SSHKeysApp::SSHKeysApp( QWidget* parent, const char* name, WFlags fl )
20 : SSHKeysBase( parent, name, fl ) 40 : SSHKeysBase( parent, name, fl )
21{ 41{
22 char *home = getenv("HOME"); 42 char *home = getenv("HOME");
23 unsigned i; 43 unsigned i;
24 44
diff --git a/noncore/settings/sshkeys/sshkeys.h b/noncore/settings/sshkeys/sshkeys.h
index 9a39a2c..5e306d1 100644
--- a/noncore/settings/sshkeys/sshkeys.h
+++ b/noncore/settings/sshkeys/sshkeys.h
@@ -1,24 +1,44 @@
1/*
2 * ssh-agent key manipulation utility
3 *
4 * (C) 2002 David Woodhouse <dwmw2@infradead.org>
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; either version 2 of the License, or
9 * (at your option) any later version.
10 *
11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details.
15 *
16 * You should have received a copy of the GNU General Public License
17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19 *
20 */
1 21
2#ifndef SSHKEYSAPP_H 22#ifndef SSHKEYSAPP_H
3#define SSHKEYSAPP_H 23#define SSHKEYSAPP_H
4 24
5#include "sshkeysbase.h" 25#include "sshkeysbase.h"
6#include <opie/oprocess.h> 26#include <opie/oprocess.h>
7 27
8class SSHKeysApp : public SSHKeysBase 28class SSHKeysApp : public SSHKeysBase
9{ 29{
10 Q_OBJECT 30 Q_OBJECT
11 31
12 public: 32 public:
13 SSHKeysApp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); 33 SSHKeysApp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
14 ~SSHKeysApp(); 34 ~SSHKeysApp();
15 35
16 private: 36 private:
17 void log_text(const char *text); 37 void log_text(const char *text);
18 enum { Noise, KeyName, KeySize, KeyFingerprint } keystate; 38 enum { Noise, KeyName, KeySize, KeyFingerprint } keystate;
19 QString incoming_keyname; 39 QString incoming_keyname;
20 QString incoming_keysize; 40 QString incoming_keysize;
21 QString incoming_keyfingerprint; 41 QString incoming_keyfingerprint;
22 QString incoming_noise; 42 QString incoming_noise;
23 OProcess addprocess; 43 OProcess addprocess;
24 44