NB! This project is outdated and unmaintained, please refer to the OpenSC WindowsInstaller instead!

Changeset 98


Ignore:
Timestamp:
04/04/08 22:34:01 (4 years ago)
Author:
alonbl
Message:

Sync putty patch

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/alonbl/mingw/putty-0.58-smartcard.diff

    r86 r98  
    1 diff -urNp putty-0.58/config.c putty-0.58+smartcard/config.c 
    2 --- putty-0.58/config.c 2005-04-05 22:37:51.000000000 +0300 
     1diff -urNp putty-0.58.org/config.c putty-0.58+smartcard/config.c 
     2--- putty-0.58.org/config.c     2005-04-05 22:37:51.000000000 +0300 
    33+++ putty-0.58+smartcard/config.c       2005-06-06 12:50:58.000000000 +0300 
    44@@ -1685,6 +1685,21 @@ void setup_config_box(struct controlbox  
    … …  
    5959  
    6060        if (!midsession) { 
    61 diff -urNp putty-0.58/libpkcs11.c putty-0.58+smartcard/libpkcs11.c 
    62 --- putty-0.58/libpkcs11.c      1970-01-01 02:00:00.000000000 +0200 
     61diff -urNp putty-0.58.org/libpkcs11.c putty-0.58+smartcard/libpkcs11.c 
     62--- putty-0.58.org/libpkcs11.c  1970-01-01 02:00:00.000000000 +0200 
    6363+++ putty-0.58+smartcard/libpkcs11.c    2008-03-15 20:32:06.000000000 +0200 
    6464@@ -0,0 +1,268 @@ 
    … …  
    331331+} 
    332332+#endif 
    333 diff -urNp putty-0.58/local_cmd.c putty-0.58+smartcard/local_cmd.c 
    334 --- putty-0.58/local_cmd.c      1970-01-01 02:00:00.000000000 +0200 
     333diff -urNp putty-0.58.org/local_cmd.c putty-0.58+smartcard/local_cmd.c 
     334--- putty-0.58.org/local_cmd.c  1970-01-01 02:00:00.000000000 +0200 
    335335+++ putty-0.58+smartcard/local_cmd.c    2008-03-15 20:34:20.000000000 +0200 
    336336@@ -0,0 +1,69 @@ 
    … …  
    404404+ 
    405405+ 
    406 diff -urNp putty-0.58/mac/Makefile.mpw putty-0.58+smartcard/mac/Makefile.mpw 
    407 --- putty-0.58/mac/Makefile.mpw 2005-04-05 22:40:17.000000000 +0300 
     406diff -urNp putty-0.58.org/mac/Makefile.mpw putty-0.58+smartcard/mac/Makefile.mpw 
     407--- putty-0.58.org/mac/Makefile.mpw     2005-04-05 22:40:17.000000000 +0300 
    408408+++ putty-0.58+smartcard/mac/Makefile.mpw       2008-03-15 20:57:26.000000000 +0200 
    409409@@ -158,17 +158,18 @@ all Ä PuTTY PuTTYgen PuTTYtel 
    … …  
    889889        setfile -t XCOF {Targ} 
    890890        {C_Carbon} ::windows:winpgnt.c -o {Targ} {COptions_Carbon} 
    891 diff -urNp putty-0.58/macosx/Makefile putty-0.58+smartcard/macosx/Makefile 
    892 --- putty-0.58/macosx/Makefile  2005-04-05 22:40:17.000000000 +0300 
     891diff -urNp putty-0.58.org/macosx/Makefile putty-0.58+smartcard/macosx/Makefile 
     892--- putty-0.58.org/macosx/Makefile      2005-04-05 22:40:17.000000000 +0300 
    893893+++ putty-0.58+smartcard/macosx/Makefile        2008-03-15 20:58:32.000000000 +0200 
    894894@@ -104,78 +104,83 @@ PuTTY: PuTTY.app/Contents/MacOS/PuTTY \ 
    … …  
    10831083 winpgntc.o: ../windows/winpgntc.c ../putty.h ../puttyps.h ../network.h \ 
    10841084                ../misc.h ../windows/winstuff.h ../mac/macstuff.h \ 
    1085 diff -urNp putty-0.58/pkcs11.h putty-0.58+smartcard/pkcs11.h 
    1086 --- putty-0.58/pkcs11.h 1970-01-01 02:00:00.000000000 +0200 
     1085diff -urNp putty-0.58.org/pkcs11.h putty-0.58+smartcard/pkcs11.h 
     1086--- putty-0.58.org/pkcs11.h     1970-01-01 02:00:00.000000000 +0200 
    10871087+++ putty-0.58+smartcard/pkcs11.h       2008-03-15 20:26:37.000000000 +0200 
    10881088@@ -0,0 +1,1357 @@ 
    … …  
    24442444+ 
    24452445+#endif /* PKCS11_H */ 
    2446 diff -urNp putty-0.58/ppkcs11.h putty-0.58+smartcard/ppkcs11.h 
    2447 --- putty-0.58/ppkcs11.h        1970-01-01 02:00:00.000000000 +0200 
     2446diff -urNp putty-0.58.org/ppkcs11.h putty-0.58+smartcard/ppkcs11.h 
     2447--- putty-0.58.org/ppkcs11.h    1970-01-01 02:00:00.000000000 +0200 
    24482448+++ putty-0.58+smartcard/ppkcs11.h      2008-03-15 20:31:43.000000000 +0200 
    24492449@@ -0,0 +1,20 @@ 
    … …  
    24682468+ 
    24692469+#endif 
    2470 diff -urNp putty-0.58/putty.h putty-0.58+smartcard/putty.h 
    2471 --- putty-0.58/putty.h  2005-04-05 22:37:51.000000000 +0300 
     2470diff -urNp putty-0.58.org/putty.h putty-0.58+smartcard/putty.h 
     2471--- putty-0.58.org/putty.h      2005-04-05 22:37:51.000000000 +0300 
    24722472+++ putty-0.58+smartcard/putty.h        2005-06-06 12:50:58.000000000 +0300 
    24732473@@ -431,6 +431,9 @@ struct config_tag { 
    … …  
    24912491     int lport_acceptall; /* accept conns from hosts other than localhost */ 
    24922492     int rport_acceptall; /* same for remote forwarded ports (SSH-2 only) */ 
    2493 diff -urNp putty-0.58/Recipe putty-0.58+smartcard/Recipe 
    2494 --- putty-0.58/Recipe   2005-04-05 22:37:51.000000000 +0300 
     2493diff -urNp putty-0.58.org/Recipe putty-0.58+smartcard/Recipe 
     2494--- putty-0.58.org/Recipe       2005-04-05 22:37:51.000000000 +0300 
    24952495+++ putty-0.58+smartcard/Recipe 2005-06-06 13:14:36.000000000 +0300 
    24962496@@ -205,7 +205,7 @@ NONSSH   = telnet raw rlogin ldisc pinge 
    … …  
    25122512 puttygen : [G] winpgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version 
    25132513          + sshrand winnoise sshsha winstore misc winctrls sshrsa sshdss winmisc 
    2514 diff -urNp putty-0.58/settings.c putty-0.58+smartcard/settings.c 
    2515 --- putty-0.58/settings.c       2005-04-05 22:37:51.000000000 +0300 
     2514diff -urNp putty-0.58.org/settings.c putty-0.58+smartcard/settings.c 
     2515--- putty-0.58.org/settings.c   2005-04-05 22:37:51.000000000 +0300 
    25162516+++ putty-0.58+smartcard/settings.c     2005-06-06 12:50:58.000000000 +0300 
    25172517@@ -243,11 +243,16 @@ void save_open_settings(void *sesskey, i 
    … …  
    25502550     gppi(sesskey, "PassiveTelnet", 0, &cfg->passive_telnet); 
    25512551     gppi(sesskey, "BackspaceIsDelete", 1, &cfg->bksp_is_delete); 
    2552 diff -urNp putty-0.58/smartcard.ppk putty-0.58+smartcard/smartcard.ppk 
    2553 --- putty-0.58/smartcard.ppk    1970-01-01 02:00:00.000000000 +0200 
     2552diff -urNp putty-0.58.org/smartcard.ppk putty-0.58+smartcard/smartcard.ppk 
     2553--- putty-0.58.org/smartcard.ppk        1970-01-01 02:00:00.000000000 +0200 
    25542554+++ putty-0.58+smartcard/smartcard.ppk  2005-06-06 22:39:23.000000000 +0300 
    25552555@@ -0,0 +1,2 @@ 
    25562556+PuTTY-User-Smartcard-Key-File- 
    25572557+Testing 
    2558 diff -urNp putty-0.58/ssh.c putty-0.58+smartcard/ssh.c 
    2559 --- putty-0.58/ssh.c    2005-04-05 22:37:51.000000000 +0300 
     2558diff -urNp putty-0.58.org/ssh.c putty-0.58+smartcard/ssh.c 
     2559--- putty-0.58.org/ssh.c        2005-04-05 22:37:51.000000000 +0300 
    25602560+++ putty-0.58+smartcard/ssh.c  2008-03-15 20:37:28.000000000 +0200 
    25612561@@ -6,6 +6,11 @@ 
    … …  
    28682868      */ 
    28692869     if (ssh->mainchan && !ssh->cfg.nopty) { 
    2870 diff -urNp putty-0.58/ssh.h putty-0.58+smartcard/ssh.h 
    2871 --- putty-0.58/ssh.h    2005-04-05 22:37:51.000000000 +0300 
     2870diff -urNp putty-0.58.org/ssh.h putty-0.58+smartcard/ssh.h 
     2871--- putty-0.58.org/ssh.h        2005-04-05 22:37:51.000000000 +0300 
    28722872+++ putty-0.58+smartcard/ssh.h  2005-06-06 13:06:34.000000000 +0300 
    28732873@@ -11,6 +11,10 @@ struct ssh_channel; 
    … …  
    28922892 int key_type(const Filename *filename); 
    28932893 char *key_type_to_str(int type); 
    2894 diff -urNp putty-0.58/sshpubk.c putty-0.58+smartcard/sshpubk.c 
    2895 --- putty-0.58/sshpubk.c        2005-04-05 22:37:51.000000000 +0300 
     2894diff -urNp putty-0.58.org/sshpubk.c putty-0.58+smartcard/sshpubk.c 
     2895--- putty-0.58.org/sshpubk.c    2005-04-05 22:37:51.000000000 +0300 
    28962896+++ putty-0.58+smartcard/sshpubk.c      2005-06-06 12:51:02.000000000 +0300 
    28972897@@ -1182,6 +1182,7 @@ int key_type(const Filename *filename) 
    … …  
    29122912        return SSH_KEYTYPE_SSHCOM; 
    29132913     return SSH_KEYTYPE_UNKNOWN;               /* unrecognised or EOF */ 
    2914 diff -urNp putty-0.58/sshrsa.h putty-0.58+smartcard/sshrsa.h 
    2915 --- putty-0.58/sshrsa.h 1970-01-01 02:00:00.000000000 +0200 
     2914diff -urNp putty-0.58.org/sshrsa.h putty-0.58+smartcard/sshrsa.h 
     2915--- putty-0.58.org/sshrsa.h     1970-01-01 02:00:00.000000000 +0200 
    29162916+++ putty-0.58+smartcard/sshrsa.h       2005-06-06 12:50:58.000000000 +0300 
    29172917@@ -0,0 +1,14 @@ 
    … …  
    29302930+ 
    29312931+ 
    2932 diff -urNp putty-0.58/sshscard.c putty-0.58+smartcard/sshscard.c 
    2933 --- putty-0.58/sshscard.c       1970-01-01 02:00:00.000000000 +0200 
     2932diff -urNp putty-0.58.org/sshscard.c putty-0.58+smartcard/sshscard.c 
     2933--- putty-0.58.org/sshscard.c   1970-01-01 02:00:00.000000000 +0200 
    29342934+++ putty-0.58+smartcard/sshscard.c     2008-03-15 20:33:48.000000000 +0200 
    29352935@@ -0,0 +1,387 @@ 
    … …  
    33213321+} 
    33223322+ 
    3323 diff -urNp putty-0.58/sshscard.h putty-0.58+smartcard/sshscard.h 
    3324 --- putty-0.58/sshscard.h       1970-01-01 02:00:00.000000000 +0200 
     3323diff -urNp putty-0.58.org/sshscard.h putty-0.58+smartcard/sshscard.h 
     3324--- putty-0.58.org/sshscard.h   1970-01-01 02:00:00.000000000 +0200 
    33253325+++ putty-0.58+smartcard/sshscard.h     2005-06-06 12:50:58.000000000 +0300 
    33263326@@ -0,0 +1,15 @@ 
    … …  
    33403340+#endif 
    33413341+ 
    3342 diff -urNp putty-0.58/unix/Makefile.gtk putty-0.58+smartcard/unix/Makefile.gtk 
    3343 --- putty-0.58/unix/Makefile.gtk        2005-04-05 22:40:17.000000000 +0300 
     3342diff -urNp putty-0.58.org/unix/Makefile.gtk putty-0.58+smartcard/unix/Makefile.gtk 
     3343--- putty-0.58.org/unix/Makefile.gtk    2005-04-05 22:40:17.000000000 +0300 
    33443344+++ putty-0.58+smartcard/unix/Makefile.gtk      2008-03-15 20:49:45.000000000 +0200 
    33453345@@ -101,54 +101,57 @@ man1dir=$(mandir)/man1 
    … …  
    35353535 winpgntc.o: ../windows/winpgntc.c ../putty.h ../puttyps.h ../network.h \ 
    35363536                ../misc.h ../windows/winstuff.h ../mac/macstuff.h \ 
    3537 diff -urNp putty-0.58/windows/Makefile.bor putty-0.58+smartcard/windows/Makefile.bor 
    3538 --- putty-0.58/windows/Makefile.bor     2005-04-05 22:40:17.000000000 +0300 
     3537diff -urNp putty-0.58.org/windows/Makefile.bor putty-0.58+smartcard/windows/Makefile.bor 
     3538--- putty-0.58.org/windows/Makefile.bor 2005-04-05 22:40:17.000000000 +0300 
    35393539+++ putty-0.58+smartcard/windows/Makefile.bor   2008-03-15 20:47:07.000000000 +0200 
    35403540@@ -102,55 +102,60 @@ BCB = $(MAKEDIR)\.. 
    … …  
    38183818                ..\misc.h ..\windows\winstuff.h ..\mac\macstuff.h \ 
    38193819                ..\macosx\osx.h ..\unix\unix.h ..\puttymem.h ..\tree234.h \ 
    3820 diff -urNp putty-0.58/windows/Makefile.cyg putty-0.58+smartcard/windows/Makefile.cyg 
    3821 --- putty-0.58/windows/Makefile.cyg     2005-04-05 22:40:17.000000000 +0300 
     3820diff -urNp putty-0.58.org/windows/Makefile.cyg putty-0.58+smartcard/windows/Makefile.cyg 
     3821--- putty-0.58.org/windows/Makefile.cyg 2005-04-05 22:40:17.000000000 +0300 
    38223822+++ putty-0.58+smartcard/windows/Makefile.cyg   2008-03-15 21:15:25.000000000 +0200 
    38233823@@ -91,6 +91,7 @@ RC = $(TOOLPATH)windres 
    … …  
    40614061  
    40624062 winpgntc.o: ../windows/winpgntc.c ../putty.h ../puttyps.h ../network.h \ 
    4063 diff -urNp putty-0.58/windows/Makefile.lcc putty-0.58+smartcard/windows/Makefile.lcc 
    4064 --- putty-0.58/windows/Makefile.lcc     2005-04-05 22:40:17.000000000 +0300 
     4063diff -urNp putty-0.58.org/windows/Makefile.lcc putty-0.58+smartcard/windows/Makefile.lcc 
     4064--- putty-0.58.org/windows/Makefile.lcc 2005-04-05 22:40:17.000000000 +0300 
    40654065+++ putty-0.58+smartcard/windows/Makefile.lcc   2008-03-15 20:48:20.000000000 +0200 
    40664066@@ -91,104 +91,110 @@ CFLAGS = -D_WINDOWS -I..\./ -I..\charset 
    … …  
    43074307 winpgntc.obj: ..\windows\winpgntc.c ..\putty.h ..\puttyps.h ..\network.h \ 
    43084308                ..\misc.h ..\windows\winstuff.h ..\mac\macstuff.h \ 
    4309 diff -urNp putty-0.58/windows/Makefile.vc putty-0.58+smartcard/windows/Makefile.vc 
    4310 --- putty-0.58/windows/Makefile.vc      2005-04-05 22:40:17.000000000 +0300 
     4309diff -urNp putty-0.58.org/windows/Makefile.vc putty-0.58+smartcard/windows/Makefile.vc 
     4310--- putty-0.58.org/windows/Makefile.vc  2005-04-05 22:40:17.000000000 +0300 
    43114311+++ putty-0.58+smartcard/windows/Makefile.vc    2008-03-15 20:45:38.000000000 +0200 
    43124312@@ -91,55 +91,60 @@ LFLAGS = /incremental:no /fixed 
    … …  
    45924592  
    45934593 winpgntc.obj: ..\windows\winpgntc.c ..\putty.h ..\puttyps.h ..\network.h \ 
    4594 diff -urNp putty-0.58/windows/MSVC/pageant/pageant.dsp putty-0.58+smartcard/windows/MSVC/pageant/pageant.dsp 
    4595 --- putty-0.58/windows/MSVC/pageant/pageant.dsp 2005-04-05 22:40:17.000000000 +0300 
     4594diff -urNp putty-0.58.org/windows/MSVC/pageant/pageant.dsp putty-0.58+smartcard/windows/MSVC/pageant/pageant.dsp 
     4595--- putty-0.58.org/windows/MSVC/pageant/pageant.dsp     2005-04-05 22:40:17.000000000 +0300 
    45964596+++ putty-0.58+smartcard/windows/MSVC/pageant/pageant.dsp       2008-03-15 21:11:47.000000000 +0200 
    45974597@@ -94,6 +94,10 @@ LINK32=link.exe 
    … …  
    46474647 # End Source File 
    46484648 # Begin Source File 
    4649 diff -urNp putty-0.58/windows/MSVC/plink/plink.dsp putty-0.58+smartcard/windows/MSVC/plink/plink.dsp 
    4650 --- putty-0.58/windows/MSVC/plink/plink.dsp     2005-04-05 22:40:17.000000000 +0300 
     4649diff -urNp putty-0.58.org/windows/MSVC/plink/plink.dsp putty-0.58+smartcard/windows/MSVC/plink/plink.dsp 
     4650--- putty-0.58.org/windows/MSVC/plink/plink.dsp 2005-04-05 22:40:17.000000000 +0300 
    46514651+++ putty-0.58+smartcard/windows/MSVC/plink/plink.dsp   2008-03-15 21:12:13.000000000 +0200 
    46524652@@ -110,6 +110,14 @@ SOURCE=..\..\..\ldisc.c 
    … …  
    47064706 # End Source File 
    47074707 # Begin Source File 
    4708 diff -urNp putty-0.58/windows/MSVC/pscp/pscp.dsp putty-0.58+smartcard/windows/MSVC/pscp/pscp.dsp 
    4709 --- putty-0.58/windows/MSVC/pscp/pscp.dsp       2005-04-05 22:40:17.000000000 +0300 
     4708diff -urNp putty-0.58.org/windows/MSVC/pscp/pscp.dsp putty-0.58+smartcard/windows/MSVC/pscp/pscp.dsp 
     4709--- putty-0.58.org/windows/MSVC/pscp/pscp.dsp   2005-04-05 22:40:17.000000000 +0300 
    47104710+++ putty-0.58+smartcard/windows/MSVC/pscp/pscp.dsp     2008-03-15 21:12:37.000000000 +0200 
    47114711@@ -110,6 +110,14 @@ SOURCE=..\..\..\int64.c 
    … …  
    47654765 # End Source File 
    47664766 # Begin Source File 
    4767 diff -urNp putty-0.58/windows/MSVC/psftp/psftp.dsp putty-0.58+smartcard/windows/MSVC/psftp/psftp.dsp 
    4768 --- putty-0.58/windows/MSVC/psftp/psftp.dsp     2005-04-05 22:40:17.000000000 +0300 
     4767diff -urNp putty-0.58.org/windows/MSVC/psftp/psftp.dsp putty-0.58+smartcard/windows/MSVC/psftp/psftp.dsp 
     4768--- putty-0.58.org/windows/MSVC/psftp/psftp.dsp 2005-04-05 22:40:17.000000000 +0300 
    47694769+++ putty-0.58+smartcard/windows/MSVC/psftp/psftp.dsp   2008-03-15 21:13:10.000000000 +0200 
    47704770@@ -110,6 +110,14 @@ SOURCE=..\..\..\int64.c 
    … …  
    48244824 # End Source File 
    48254825 # Begin Source File 
    4826 diff -urNp putty-0.58/windows/MSVC/putty/putty.dsp putty-0.58+smartcard/windows/MSVC/putty/putty.dsp 
    4827 --- putty-0.58/windows/MSVC/putty/putty.dsp     2005-04-05 22:40:17.000000000 +0300 
     4826diff -urNp putty-0.58.org/windows/MSVC/putty/putty.dsp putty-0.58+smartcard/windows/MSVC/putty/putty.dsp 
     4827--- putty-0.58.org/windows/MSVC/putty/putty.dsp 2005-04-05 22:40:17.000000000 +0300 
    48284828+++ putty-0.58+smartcard/windows/MSVC/putty/putty.dsp   2008-03-15 21:13:29.000000000 +0200 
    48294829@@ -122,6 +122,14 @@ SOURCE=..\..\..\ldiscucs.c 
    … …  
    48834883 # End Source File 
    48844884 # Begin Source File 
    4885 diff -urNp putty-0.58/windows/winhelp.h putty-0.58+smartcard/windows/winhelp.h 
    4886 --- putty-0.58/windows/winhelp.h        2005-04-05 22:37:38.000000000 +0300 
     4885diff -urNp putty-0.58.org/windows/winhelp.h putty-0.58+smartcard/windows/winhelp.h 
     4886--- putty-0.58.org/windows/winhelp.h    2005-04-05 22:37:38.000000000 +0300 
    48874887+++ putty-0.58+smartcard/windows/winhelp.h      2005-06-06 12:50:58.000000000 +0300 
    48884888@@ -99,6 +99,9 @@ 
    … …  
    49044904 #define WINHELP_CTX_ssh_tunnels_x11auth "ssh.tunnels.x11auth" 
    49054905 #define WINHELP_CTX_ssh_tunnels_portfwd "ssh.tunnels.portfwd" 
    4906 diff -urNp putty-0.58/windows/winpgnt.c putty-0.58+smartcard/windows/winpgnt.c 
    4907 --- putty-0.58/windows/winpgnt.c        2005-04-05 22:37:38.000000000 +0300 
     4906diff -urNp putty-0.58.org/windows/winpgnt.c putty-0.58+smartcard/windows/winpgnt.c 
     4907--- putty-0.58.org/windows/winpgnt.c    2005-04-05 22:37:38.000000000 +0300 
    49084908+++ putty-0.58+smartcard/windows/winpgnt.c      2005-06-06 12:51:02.000000000 +0300 
    49094909@@ -15,6 +15,8 @@ 
Note: See TracChangeset for help on using the changeset viewer.