4 files changed, 7 insertions, 12 deletions

diff --git a/noncore/comm/keypebble/d3des.c b/noncore/comm/keypebble/d3des.c
index b0f065e..7f50da4 100644
--- a/noncore/comm/keypebble/d3des.c
+++ b/noncore/comm/keypebble/d3des.c
@@ -1,90 +1,83 @@
 /*
  * This is D3DES (V5.09) by Richard Outerbridge with the double and
  * triple-length support removed for use in VNC.  Also the bytebit[] array
  * has been reversed so that the most significant bit in each byte of the
  * key is ignored, not the least significant.
  *
  * These changes are Copyright (C) 1998 Olivetti & Oracle Research Laboratory
  *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  */
 
 /* D3DES (V5.09) -
  *
  * A portable, public domain, version of the Data Encryption Standard.
  *
  * Written with Symantec's THINK (Lightspeed) C by Richard Outerbridge.
  * Thanks to: Dan Hoey for his excellent Initial and Inverse permutation
  * code;  Jim Gillogly & Phil Karn for the DES key schedule code; Dennis
  * Ferguson, Eric Young and Dana How for comparing notes; and Ray Lau,
  * for humouring me on.
  *
  * Copyright (c) 1988,1989,1990,1991,1992 by Richard Outerbridge.
  * (GEnie : OUTER; CIS : [71755,204]) Graven Imagery, 1992.
  */
 
 #include "d3des.h"
 
 static void scrunch(unsigned char *, unsigned long *);
 static void unscrun(unsigned long *, unsigned char *);
 static void desfunc(unsigned long *, unsigned long *);
 static void cookey(unsigned long *);
 
 static unsigned long KnL[32] = { 0L };
-static unsigned long KnR[32] = { 0L };
-static unsigned long Kn3[32] = { 0L };
-static unsigned char Df_Key[24] = {
-        0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef,
-        0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10,
-        0x89,0xab,0xcd,0xef,0x01,0x23,0x45,0x67 };
-
         static unsigned short bytebit[8]= {
         01, 02, 04, 010, 020, 040, 0100, 0200 };
 
 static unsigned long bigbyte[24] = {
                 0x800000L,      0x400000L,      0x200000L,0x100000L,
                 0x80000L,       0x40000L,       0x20000L,0x10000L,
                 0x8000L,        0x4000L,        0x2000L,0x1000L,
                 0x800L,         0x400L,         0x200L, 0x100L,
                 0x80L,          0x40L,          0x20L,  0x10L,
                 0x8L,           0x4L,           0x2L,           0x1L};
 
 /* Use the key schedule specified in the Standard (ANSI X3.92-1981). */
 
 static unsigned char pc1[56] = {
                 56, 48, 40, 32, 24, 16,  8, 0, 57, 49, 41, 33, 25, 17,
                  9,  1, 58, 50, 42, 34, 26,18, 10,  2, 59, 51, 43, 35,
                 62, 54, 46, 38, 30, 22, 14, 6, 61, 53, 45, 37, 29, 21,
                 13,  5, 60, 52, 44, 36, 28,20, 12,  4, 27, 19, 11,  3 };
 
 static unsigned char totrot[16] = {
         1,2,4,6,8,10,12,14,15,17,19,21,23,25,27,28 };
 
 static unsigned char pc2[48] = {
         13, 16, 10, 23,  0,  4,  2, 27, 14,  5, 20,  9,
         22, 18, 11,  3, 25,  7, 15,  6, 26, 19, 12,  1,
         40, 51, 30, 36, 46, 54, 29, 39, 50, 44, 32, 47,
         43, 48, 38, 55, 33, 52, 45, 41, 49, 35, 28, 31 };
 
         void deskey(key, edf)/* Thanks to James Gillogly & Phil Karn! */
 unsigned char *key;
 short edf;
 {
         register int i, j, l, m, n;
         unsigned char pc1m[56], pcr[56];
         unsigned long kn[32];
 
         for ( j = 0; j < 56; j++ ) {
                 l = pc1[j];
                 m = l & 07;
                 pc1m[j] = (key[l >> 3] & bytebit[m]) ? 1 : 0;
                 }
         for( i = 0; i < 16; i++ ) {
                 if( edf == DE1 ) m = (15 - i) << 1;
                 else m = i << 1;
                 n = m + 1;
                 kn[m] = kn[n] = 0L;
                 for( j = 0; j < 28; j++ ) {
                         l = j + totrot[i];
diff --git a/noncore/comm/keypebble/krfbcanvas.cpp b/noncore/comm/keypebble/krfbcanvas.cpp
index b3525df..d5b8ce7 100644
--- a/noncore/comm/keypebble/krfbcanvas.cpp
+++ b/noncore/comm/keypebble/krfbcanvas.cpp
@@ -1,129 +1,131 @@
 #include "krfbconnection.h"
 #include "krfbcanvas.h"
 #include "krfbbuffer.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <qpe/qpeapplication.h>
 using namespace Opie::Core;
 
 /* QT */
 #include <qclipboard.h>
 
 KRFBCanvas::KRFBCanvas( QWidget *parent, const char *name )
   : QScrollView( parent, name )
 {
     connection_ = new KRFBConnection();
     connect( connection_, SIGNAL( loggedIn() ),
             this, SLOT( loggedIn() ) );
 
     loggedIn_ = false;
 
                 //QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold);
 
     viewport()->setFocusPolicy( QWidget::StrongFocus );
     viewport()->setFocus();
 
     nextRightClick=0;
     nextDoubleClick=0;
 }
 
 KRFBCanvas::~KRFBCanvas()
 {
 }
 
 
 void KRFBCanvas::openConnection(KRFBServer server)
 {
 
-  
+
                 QCString host = server.hostname.latin1();
                 password=server.password;
                 connection_->connectTo( server);
 }
 
 
 void KRFBCanvas::openURL( const QUrl &url )
 {
   if ( loggedIn_ ) {
-      owarn << "openURL invoked when logged in\n" << oendl; 
+      owarn << "openURL invoked when logged in\n" << oendl;
       return;
   }
 
   QCString host = url.host().latin1();
   int display = url.port();
+  Q_UNUSED( host )
+  Q_UNUSED( display )
 
 //  connection_->connectTo( host, display );
 }
 
 void KRFBCanvas::closeConnection()
 {
   loggedIn_ = false;
   connection_->disconnect();
 
   viewport()->setMouseTracking( false );
   viewport()->setBackgroundMode( PaletteDark );
   setBackgroundMode( PaletteDark );
   update();
 }
 
 
 void KRFBCanvas::bell()
 {
   if ( connection_->options()->deIconify ) {
     topLevelWidget()->raise();
     topLevelWidget()->show();
   }
 }
 
 void KRFBCanvas::loggedIn()
 {
-  owarn << "Ok, we're logged in" << oendl; 
+  owarn << "Ok, we're logged in" << oendl;
 
   //
   // Get ready for action
   //
   loggedIn_ = true;
   viewport()->setMouseTracking( true );
   viewport()->setBackgroundMode( NoBackground );
   setBackgroundMode( NoBackground );
 
   // Start using the buffer
   connect( connection_->buffer(), SIGNAL( sizeChanged(int,int) ),
            this, SLOT( resizeContents(int,int) ) );
   connect( connection_->buffer(), SIGNAL( updated(int,int,int,int) ),
            this, SLOT( viewportUpdate(int,int,int,int) ) );
   connect( connection_->buffer(), SIGNAL( bell() ),
            this, SLOT( bell() ) );
   connect( qApp->clipboard(), SIGNAL( dataChanged() ),
            this, SLOT( clipboardChanged() ) );
 }
 
 void KRFBCanvas::viewportPaintEvent( QPaintEvent *e )
 {
   QRect r = e->rect();
 
   if ( loggedIn_ ) {
                         QPixmap p;
 
     bitBlt( viewport(), r.x(), r.y(),
             connection_->buffer()->pixmap(),
             r.x() + contentsX(), r.y() + contentsY(),
             r.width(), r.height() );
   }
   else {
     QScrollView::viewportPaintEvent( e );
   }
 }
 
 void KRFBCanvas::viewportUpdate( int x, int y, int w, int h )
 {
   updateContents( x, y, w, h );
 }
 
 void KRFBCanvas::contentsMousePressEvent( QMouseEvent *e )
 {
 
   if (nextDoubleClick) {
     connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonPress, e->pos(),LeftButton,LeftButton));
     connection_->buffer()->mouseEvent( &QMouseEvent(QEvent::MouseButtonRelease, e->pos(),LeftButton,0));
diff --git a/noncore/comm/keypebble/kvnc.cpp b/noncore/comm/keypebble/kvnc.cpp
index 88cb50b..3a8e919 100644
--- a/noncore/comm/keypebble/kvnc.cpp
+++ b/noncore/comm/keypebble/kvnc.cpp
@@ -1,94 +1,94 @@
 #include <qaction.h>
 #include <qpopupmenu.h>
 #include <qpushbutton.h>
 #include <qmessagebox.h>
 #include <qlistbox.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 
 #include <assert.h>
 
 #include "kvnc.h"
 #include "krfbcanvas.h"
 #include "krfbconnection.h"
 #include "kvncconndlg.h"
 
 static int u_id = 1;
 static int get_unique_id()
 {
                 return u_id++;
 }
 
 
 /* XPM */
 static char * menu_xpm[] = {
 "12 12 5 1",
         " c None",
         ".c #000000",
         "+c #FFFDAD",
         "@c #FFFF00",
         "#c #E5E100",
 "            ",
 "            ",
 "  ......... ",
 "  .+++++++. ",
 "  .+@@@@#.  ",
 "  .+@@@#.   ",
 "  .+@@#.    ",
 "  .+@#.     ",
 "  .+#.      ",
 "  .+.       ",
 "  ..        ",
 "            "};
 
 const int StatusTextId = 0;
 
-KVNC::KVNC(  QWidget *parent, const char *name, WFlags f) : QMainWindow( 0, name ,WStyle_ContextHelp)
+KVNC::KVNC(  QWidget *parent, const char *name, WFlags ) : QMainWindow( parent, name ,WStyle_ContextHelp)
 {
     setCaption( tr("VNC Viewer") );
     fullscreen = false;
 
                 stack = new QWidgetStack( this );
                 setCentralWidget( stack );
 
                 bookmarkSelector=new KVNCBookmarkDlg();
                 stack->addWidget(bookmarkSelector,get_unique_id());
                 stack->raiseWidget( bookmarkSelector );
 
                 canvas = new KRFBCanvas( stack, "canvas" );
                 stack->addWidget(canvas,get_unique_id());
     setCentralWidget( stack );
 
 
     connect( bookmarkSelector->bookmarkList, SIGNAL(clicked(QListBoxItem*)),
             this, SLOT(openConnection(QListBoxItem*)) );
     connect( canvas->connection(), SIGNAL(statusChanged(const QString&)),
             this, SLOT(statusMessage(const QString&)) );
     connect( canvas->connection(), SIGNAL(error(const QString&)),
             this, SLOT(error(const QString&)) );
     connect( canvas->connection(), SIGNAL(connected()), this, SLOT(connected()) );
     connect( canvas->connection(), SIGNAL(loggedIn()), this, SLOT(loggedIn()) );
     connect( canvas->connection(), SIGNAL(disconnected()), this, SLOT(disconnected()) );
 
     setupActions();
 
     cornerButton = new QPushButton( this );
     cornerButton->setPixmap( QPixmap( (const char**)menu_xpm ) );
     connect( cornerButton, SIGNAL(pressed()), this, SLOT(showMenu()) );
     canvas->setCornerWidget( cornerButton );
 
                 stack->raiseWidget( bookmarkSelector );
 
 
                 bar= new QToolBar( this );
                 setToolBarsMovable( false );
                 setRightJustification(false);
 
 
                  QAction *n = new QAction( tr( "New Connection" ), Resource::loadPixmap( "new" ),
                                 QString::null, 0, this, 0 );
                  connect( n, SIGNAL( activated() ),
                                                 this, SLOT( newConnection() ) );
                 n->addTo( bar );
 
                  QAction *o = new QAction( tr( "Open Bookmark" ), Resource::loadPixmap( "fileopen" ),
diff --git a/noncore/comm/keypebble/vncauth.c b/noncore/comm/keypebble/vncauth.c
index dc276bf..277d145 100644
--- a/noncore/comm/keypebble/vncauth.c
+++ b/noncore/comm/keypebble/vncauth.c
@@ -4,97 +4,97 @@
  *  This is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This software is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,
  *  USA.
  */
 
 /*
  * vncauth.c - Functions for VNC password management and authentication.
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <time.h>
 #include "vncauth.h"
 #include "d3des.h"
 
 
 /*
  * We use a fixed key to store passwords, since we assume that our local
  * file system is secure but nonetheless don't want to store passwords
  * as plaintext.
  */
 
 unsigned char fixedkey[8] = {23,82,107,6,35,78,88,7};
 
 
 /*
  * Encrypt a password and store it in a file.  Returns 0 if successful,
  * 1 if the file could not be written.
  */
 
 int
 vncEncryptAndStorePasswd(char *passwd, char *fname)
 {
     FILE *fp;
-    int i;
+    uint i;
     unsigned char encryptedPasswd[8];
 
     if ((fp = fopen(fname,"w")) == NULL) return 1;
 
     chmod(fname, S_IRUSR|S_IWUSR);
 
     /* pad password with nulls */
 
     for (i = 0; i < 8; i++) {
         if (i < strlen(passwd)) {
             encryptedPasswd[i] = passwd[i];
         } else {
             encryptedPasswd[i] = 0;
         }
     }
 
     /* Do encryption in-place - this way we overwrite our copy of the plaintext
        password */
 
     deskey(fixedkey, EN0);
     des(encryptedPasswd, encryptedPasswd);
 
     for (i = 0; i < 8; i++) {
         putc(encryptedPasswd[i], fp);
     }
   
     fclose(fp);
     return 0;
 }
 
 
 /*
  * Decrypt a password from a file.  Returns a pointer to a newly allocated
  * string containing the password or a null pointer if the password could
  * not be retrieved for some reason.
  */
 
 char *
 vncDecryptPasswdFromFile(char *fname)
 {
     FILE *fp;
     int i, ch;
     unsigned char *passwd = (unsigned char *)malloc(9);
 
     if ((fp = fopen(fname,"r")) == NULL) return NULL;
 
     for (i = 0; i < 8; i++) {
         ch = getc(fp);