Context Navigation

← Previous Changeset
Next Changeset →

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

Changeset 100

Timestamp:

04/04/08 22:37:09 (4 years ago)

Author:

alonbl

Message:

Make putty patch use free pkcs11.h header

File:

: 1 edited

trunk/putty-0.58-smartcard.diff (modified) (108 diffs)

Legend:

: Unmodified
: Added
: Removed

trunk/putty-0.58-smartcard.diff

-                      r21
+                      r100
+diff -udrNP putty-0.58.orig/Recipe putty-0.58/Recipe
+--- putty-0.58.orig/Recipe      2005-04-05 21:37:51.000000000 +0200
++++ putty-0.58/Recipe   2005-06-06 12:14:36.878106032 +0200
+@@ -205,7 +205,7 @@
+ # SSH back end (putty, plink, pscp, psftp).
+ SSH      = ssh sshcrc sshdes sshmd5 sshrsa sshrand sshsha sshblowf
+          + sshdh sshcrcda sshpubk sshzlib sshdss x11fwd portfwd
+-         + sshaes sshsh512 sshbn wildcard pinger
++         + sshaes sshsh512 sshbn wildcard pinger libpkcs11 sshscard local_cmd
+ WINSSH   = SSH winnoise winpgntc
+ UXSSH    = SSH uxnoise uxagentc
+ MACSSH   = SSH macnoise
+@@ -252,7 +252,7 @@
+ pageant  : [G] winpgnt sshrsa sshpubk sshdes sshbn sshmd5 version tree234
+          + misc sshaes sshsha winpgntc sshdss sshsh512 winutils winmisc
+-         + pageant.res LIBS
++         + pageant.res libpkcs11 sshscard LIBS
+ puttygen : [G] winpgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
+          + sshrand winnoise sshsha winstore misc winctrls sshrsa sshdss winmisc
+diff -udrNP putty-0.58.orig/config.c putty-0.58/config.c
+--- putty-0.58.orig/config.c    2005-04-05 21:37:51.000000000 +0200
++++ putty-0.58/config.c 2005-06-06 11:50:58.469736880 +0200
+@@ -1685,6 +1685,21 @@
+diff -urNp putty-0.58.org/config.c putty-0.58+smartcard/config.c
+--- putty-0.58.org/config.c     2005-04-05 22:37:51.000000000 +0300
++++ putty-0.58+smartcard/config.c       2005-06-06 12:50:58.000000000 +0300
+@@ -1685,6 +1685,21 @@ void setup_config_box(struct controlbox
                           I(offsetof(Config,ssh2_des_cbc)));
+        }
 …
          * The Connection/SSH/Kex panel. (Owing to repeat key
          * exchange, this is all meaningful in mid-session _if_
@@ -1736,7 +1751,10 @@
+@@ -1736,7 +1751,10 @@ void setup_config_box(struct controlbox
                           'i', HELPCTX(ssh_auth_ki),
                           dlg_stdcheckbox_handler,
 …
                             "Authentication parameters");
             ctrl_checkbox(s, "Allow agent forwarding", 'f',
@@ -1746,10 +1764,21 @@
+@@ -1746,10 +1764,21 @@ void setup_config_box(struct controlbox
                           HELPCTX(ssh_auth_changeuser),
                           dlg_stdcheckbox_handler,
 …
         if (!midsession) {
 diff -udrNP putty-0.58.orig/libpkcs11.c putty-0.58/libpkcs11.c
 --- putty-0.58.orig/libpkcs11.c 1970-01-01 01:00:00.000000000 +0100
 +++ putty-0.58/libpkcs11.c      2005-06-06 11:50:58.470736728 +0200
+diff -urNp putty-0.58.org/libpkcs11.c putty-0.58+smartcard/libpkcs11.c
+--- putty-0.58.org/libpkcs11.c  1970-01-01 02:00:00.000000000 +0200
++++ putty-0.58+smartcard/libpkcs11.c    2008-03-15 20:32:06.000000000 +0200
@@ -0,0 +1,268 @@
 +/*
 …
 + */
++
 +#include "pkcs11.h"
++#include "ppkcs11.h"
 +#include <stdlib.h>
 +#include <stdio.h>
 …
 +}
 +#endif
 diff -udrNP putty-0.58.orig/local_cmd.c putty-0.58/local_cmd.c
 --- putty-0.58.orig/local_cmd.c 1970-01-01 01:00:00.000000000 +0100
 +++ putty-0.58/local_cmd.c      2005-06-06 11:50:58.471736576 +0200
+diff -urNp putty-0.58.org/local_cmd.c putty-0.58+smartcard/local_cmd.c
+--- putty-0.58.org/local_cmd.c  1970-01-01 02:00:00.000000000 +0200
++++ putty-0.58+smartcard/local_cmd.c    2008-03-15 20:34:20.000000000 +0200
@@ -0,0 +1,69 @@
 +#include <windows.h>
 …
 +void do_close(void * ssh);
++
 +unsigned long __stdcall WaitToClose(void * params);
++static unsigned long __stdcall WaitToClose(void * params);
++
 +struct CloseParam {
 …
++
++
 diff -udrNP putty-0.58.orig/mac/Makefile.mpw putty-0.58/mac/Makefile.mpw
 --- putty-0.58.orig/mac/Makefile.mpw    2005-06-06 11:51:12.736567992 +0200
 +++ putty-0.58/mac/Makefile.mpw 2005-06-06 12:14:39.499707488 +0200
@@ -158,17 +158,18 @@
+diff -urNp putty-0.58.org/mac/Makefile.mpw putty-0.58+smartcard/mac/Makefile.mpw
+--- putty-0.58.org/mac/Makefile.mpw     2005-04-05 22:40:17.000000000 +0300
++++ putty-0.58+smartcard/mac/Makefile.mpw       2008-03-15 20:57:26.000000000 +0200
+@@ -158,17 +158,18 @@ all Ä PuTTY PuTTYgen PuTTYtel
  PuTTY Ä PuTTY.68k PuTTY.ppc PuTTY.carbon
 …
                 telnet.68k.o terminal.68k.o testback.68k.o timing.68k.o ¶
                 toucs.68k.o tree234.68k.o utf8.68k.o version.68k.o ¶
@@ -177,17 +178,18 @@
+@@ -177,17 +178,18 @@ PuTTY.68k Ä be_all.68k.o config.68k.o cp
         Duplicate -y mac_res.rsrc {Targ}
         {Link_68K} -o {Targ} -fragname PuTTY {LinkOptions_68K} be_all.68k.o ¶
 …
                 terminal.68k.o testback.68k.o timing.68k.o toucs.68k.o ¶
                 tree234.68k.o utf8.68k.o version.68k.o vsnprint.68k.o ¶
@@ -197,20 +199,21 @@
+@@ -197,20 +199,21 @@ PuTTY.68k Ä be_all.68k.o config.68k.o cp
  PuTTY.cfm68k Ä be_all.cfm68k.o config.cfm68k.o cproxy.cfm68k.o ¶
 …
                 stricmp.cfm68k.o telnet.cfm68k.o terminal.cfm68k.o ¶
                 testback.cfm68k.o timing.cfm68k.o toucs.cfm68k.o ¶
@@ -221,20 +224,21 @@
+@@ -221,20 +224,21 @@ PuTTY.cfm68k Ä be_all.cfm68k.o config.cf
         {Link_CFM68K} -o {Targ} -fragname PuTTY {LinkOptions_CFM68K} ¶
                 be_all.cfm68k.o config.cfm68k.o cproxy.cfm68k.o ¶
 …
                 stricmp.cfm68k.o telnet.cfm68k.o terminal.cfm68k.o ¶
                 testback.cfm68k.o timing.cfm68k.o toucs.cfm68k.o ¶
@@ -244,17 +248,18 @@
+@@ -244,17 +248,18 @@ PuTTY.cfm68k Ä be_all.cfm68k.o config.cf
         SetFile -a BMi {Targ}
 …
                 telnet.ppc.o terminal.ppc.o testback.ppc.o timing.ppc.o ¶
                 toucs.ppc.o tree234.ppc.o utf8.ppc.o version.ppc.o ¶
@@ -263,17 +268,18 @@
+@@ -263,17 +268,18 @@ PuTTY.ppc Ä be_all.ppc.o config.ppc.o cp
         Duplicate -y mac_res.rsrc {Targ}
         {Link_PPC} -o {Targ} -fragname PuTTY {LinkOptions_PPC} be_all.ppc.o ¶
 …
                 terminal.ppc.o testback.ppc.o timing.ppc.o toucs.ppc.o ¶
                 tree234.ppc.o utf8.ppc.o version.ppc.o vsnprint.ppc.o ¶
@@ -283,20 +289,21 @@
+@@ -283,20 +289,21 @@ PuTTY.ppc Ä be_all.ppc.o config.ppc.o cp
  PuTTY.carbon Ä be_all.carbon.o config.carbon.o cproxy.carbon.o ¶
 …
                 stricmp.carbon.o telnet.carbon.o terminal.carbon.o ¶
                 testback.carbon.o timing.carbon.o toucs.carbon.o ¶
@@ -307,20 +314,21 @@
+@@ -307,20 +314,21 @@ PuTTY.carbon Ä be_all.carbon.o config.ca
         {Link_Carbon} -o {Targ} -fragname PuTTY {LinkOptions_Carbon} ¶
                 be_all.carbon.o config.carbon.o cproxy.carbon.o ¶
 …
                 stricmp.carbon.o telnet.carbon.o terminal.carbon.o ¶
                 testback.carbon.o timing.carbon.o toucs.carbon.o ¶
@@ -657,6 +665,14 @@
+@@ -657,6 +665,12 @@ ldiscucs.68k.o Ä ::ldiscucs.c ::putty.h
                 ::windows:winhelp.h ::charset:charset.h
         {C_68K} ::ldiscucs.c -o {Targ} {COptions_68K}
++libpkcs11.68k.o Ä ::libpkcs11.c ::pkcs11.h ::rsaref:win32.h ¶
++               ::rsaref:pkcs11.h ::rsaref:unix.h ::rsaref:pkcs11t.h ¶
++               ::rsaref:pkcs11f.h
++libpkcs11.68k.o Ä ::libpkcs11.c ::pkcs11.h ::ppkcs11.h
 +       {C_68K} ::libpkcs11.c -o {Targ} {COptions_68K}
++
 …
                 ::charset:internal.h
         {C_68K} ::charset:localenc.c -o {Targ} {COptions_68K}
@@ -902,9 +918,11 @@
+@@ -902,8 +916,9 @@ slookup.68k.o Ä ::charset:slookup.c ::ch
                 ::charset:enum.c ::charset:sbcsdat.c ::charset:utf8.c
         {C_68K} ::charset:slookup.c -o {Targ} {COptions_68K}
 …
 -ssh.68k.o Ä ::ssh.c ::putty.h ::tree234.h ::ssh.h ::puttyps.h ::network.h ¶
 -               ::misc.h ::puttymem.h ::int64.h ::windows:winstuff.h ¶
 +ssh.68k.o Ä ::ssh.c ::putty.h ::tree234.h ::ssh.h ::pkcs11.h ::sshscard.h ¶
++ssh.68k.o Ä ::ssh.c ::putty.h ::tree234.h ::ssh.h ::pkcs11.h ::ppkcs11.h ::sshscard.h ¶
 +               ::puttyps.h ::network.h ::misc.h ::puttymem.h ::int64.h ¶
 +               ::rsaref:win32.h ::rsaref:pkcs11.h ::windows:winstuff.h ¶
++               ::windows:winstuff.h ¶
                 ::mac:macstuff.h ::macosx:osx.h ::unix:unix.h ¶
-+               ::rsaref:unix.h ::rsaref:pkcs11t.h ::rsaref:pkcs11f.h ¶
                 ::windows:winhelp.h ::charset:charset.h
         {C_68K} ::ssh.c -o {Targ} {COptions_68K}
+@@ -970,6 +988,15 @@
+@@ -970,6 +985,14 @@ sshrsag.68k.o Ä ::sshrsag.c ::ssh.h ::pu
                 ::misc.h
         {C_68K} ::sshrsag.c -o {Targ} {COptions_68K}
 +sshscard.68k.o Ä ::sshscard.c ::ssh.h ::sshrsa.h ::pkcs11.h ::sshscard.h ¶
++sshscard.68k.o Ä ::sshscard.c ::ssh.h ::sshrsa.h ::pkcs11.h ::ppkcs11.h ::sshscard.h ¶
 +               ::putty.h ::puttymem.h ::network.h ::int64.h ::misc.h ¶
++               ::rsaref:win32.h ::rsaref:pkcs11.h ::puttyps.h ¶
++               ::rsaref:unix.h ::rsaref:pkcs11t.h ::rsaref:pkcs11f.h ¶
++               ::puttyps.h ¶
 +               ::windows:winstuff.h ::mac:macstuff.h ::macosx:osx.h ¶
 +               ::unix:unix.h ::tree234.h ::windows:winhelp.h ¶
 …
                 ::misc.h
         {C_68K} ::sshsh512.c -o {Targ} {COptions_68K}
@@ -1224,7 +1251,7 @@
+@@ -1224,7 +1247,7 @@ winpgen.68k.o Ä ::windows:winpgen.c ::pu
         {C_68K} ::windows:winpgen.c -o {Targ} {COptions_68K}
 …
                 ::unix:unix.h ::windows:winhelp.h ::charset:charset.h
         {C_68K} ::windows:winpgnt.c -o {Targ} {COptions_68K}
@@ -1389,6 +1416,14 @@
+@@ -1389,6 +1412,12 @@ ldiscucs.cfm68k.o Ä ::ldiscucs.c ::putty
                 ::charset:charset.h
         {C_CFM68K} ::ldiscucs.c -o {Targ} {COptions_CFM68K}
++libpkcs11.cfm68k.o Ä ::libpkcs11.c ::pkcs11.h ::rsaref:win32.h ¶
++               ::rsaref:pkcs11.h ::rsaref:unix.h ::rsaref:pkcs11t.h ¶
++               ::rsaref:pkcs11f.h
++libpkcs11.cfm68k.o Ä ::libpkcs11.c ::pkcs11.h ::ppkcs11.h
 +       {C_CFM68K} ::libpkcs11.c -o {Targ} {COptions_CFM68K}
++
 …
                 ::charset:internal.h
         {C_CFM68K} ::charset:localenc.c -o {Targ} {COptions_CFM68K}
@@ -1639,9 +1674,11 @@
+@@ -1639,8 +1668,9 @@ slookup.cfm68k.o Ä ::charset:slookup.c :
                 ::charset:utf8.c
         {C_CFM68K} ::charset:slookup.c -o {Targ} {COptions_CFM68K}
 …
 -ssh.cfm68k.o Ä ::ssh.c ::putty.h ::tree234.h ::ssh.h ::puttyps.h ::network.h ¶
 -               ::misc.h ::puttymem.h ::int64.h ::windows:winstuff.h ¶
 +ssh.cfm68k.o Ä ::ssh.c ::putty.h ::tree234.h ::ssh.h ::pkcs11.h ::sshscard.h ¶
++ssh.cfm68k.o Ä ::ssh.c ::putty.h ::tree234.h ::ssh.h ::pkcs11.h ::ppkcs11.h ::sshscard.h ¶
 +               ::puttyps.h ::network.h ::misc.h ::puttymem.h ::int64.h ¶
 +               ::rsaref:win32.h ::rsaref:pkcs11.h ::windows:winstuff.h ¶
++               ::windows:winstuff.h ¶
                 ::mac:macstuff.h ::macosx:osx.h ::unix:unix.h ¶
-+               ::rsaref:unix.h ::rsaref:pkcs11t.h ::rsaref:pkcs11f.h ¶
                 ::windows:winhelp.h ::charset:charset.h
         {C_CFM68K} ::ssh.c -o {Targ} {COptions_CFM68K}
+@@ -1709,6 +1746,15 @@
+@@ -1709,6 +1739,14 @@ sshrsag.cfm68k.o Ä ::sshrsag.c ::ssh.h :
                 ::misc.h
         {C_CFM68K} ::sshrsag.c -o {Targ} {COptions_CFM68K}
 +sshscard.cfm68k.o Ä ::sshscard.c ::ssh.h ::sshrsa.h ::pkcs11.h ::sshscard.h ¶
++sshscard.cfm68k.o Ä ::sshscard.c ::ssh.h ::sshrsa.h ::pkcs11.h ::ppkcs11.h ::sshscard.h ¶
 +               ::putty.h ::puttymem.h ::network.h ::int64.h ::misc.h ¶
++               ::rsaref:win32.h ::rsaref:pkcs11.h ::puttyps.h ¶
++               ::rsaref:unix.h ::rsaref:pkcs11t.h ::rsaref:pkcs11f.h ¶
++               ::puttyps.h ¶
 +               ::windows:winstuff.h ::mac:macstuff.h ::macosx:osx.h ¶
 +               ::unix:unix.h ::tree234.h ::windows:winhelp.h ¶
 …
                 ::misc.h
         {C_CFM68K} ::sshsh512.c -o {Targ} {COptions_CFM68K}
@@ -1963,9 +2009,10 @@
+@@ -1963,9 +2001,10 @@ winpgen.cfm68k.o Ä ::windows:winpgen.c :
         {C_CFM68K} ::windows:winpgen.c -o {Targ} {COptions_CFM68K}
 …
  winpgntc.cfm68k.o Ä ::windows:winpgntc.c ::putty.h ::puttyps.h ::network.h ¶
@@ -2162,6 +2209,18 @@
+@@ -2162,6 +2201,16 @@ ldiscucs.ppc.o Ä ::ldiscucs.c ::putty.h
         setfile -t XCOF {Targ}
         {C_PPC} ::ldiscucs.c -o {Targ} {COptions_PPC}
++libpkcs11.ppc.o Ä ::libpkcs11.c ::pkcs11.h ::rsaref:win32.h ¶
++               ::rsaref:pkcs11.h ::rsaref:unix.h ::rsaref:pkcs11t.h ¶
++               ::rsaref:pkcs11f.h
++libpkcs11.ppc.o Ä ::libpkcs11.c ::pkcs11.h ::ppkcs11.h
 +       echo -n > {Targ}
 +       setfile -t XCOF {Targ}
 …
                 ::charset:internal.h
         echo -n > {Targ}
@@ -2491,9 +2550,11 @@
+@@ -2491,8 +2540,9 @@ slookup.ppc.o Ä ::charset:slookup.c ::ch
         setfile -t XCOF {Targ}
         {C_PPC} ::charset:slookup.c -o {Targ} {COptions_PPC}
 …
 -ssh.ppc.o Ä ::ssh.c ::putty.h ::tree234.h ::ssh.h ::puttyps.h ::network.h ¶
 -               ::misc.h ::puttymem.h ::int64.h ::windows:winstuff.h ¶
 +ssh.ppc.o Ä ::ssh.c ::putty.h ::tree234.h ::ssh.h ::pkcs11.h ::sshscard.h ¶
++ssh.ppc.o Ä ::ssh.c ::putty.h ::tree234.h ::ssh.h ::pkcs11.h ::ppkcs11.h ::sshscard.h ¶
 +               ::puttyps.h ::network.h ::misc.h ::puttymem.h ::int64.h ¶
 +               ::rsaref:win32.h ::rsaref:pkcs11.h ::windows:winstuff.h ¶
++               ::windows:winstuff.h ¶
                 ::mac:macstuff.h ::macosx:osx.h ::unix:unix.h ¶
-+               ::rsaref:unix.h ::rsaref:pkcs11t.h ::rsaref:pkcs11f.h ¶
                 ::windows:winhelp.h ::charset:charset.h
         echo -n > {Targ}
+        setfile -t XCOF {Targ}
+@@ -2591,6 +2652,17 @@
+@@ -2591,6 +2641,16 @@ sshrsag.ppc.o Ä ::sshrsag.c ::ssh.h ::pu
         setfile -t XCOF {Targ}
         {C_PPC} ::sshrsag.c -o {Targ} {COptions_PPC}
 +sshscard.ppc.o Ä ::sshscard.c ::ssh.h ::sshrsa.h ::pkcs11.h ::sshscard.h ¶
++sshscard.ppc.o Ä ::sshscard.c ::ssh.h ::sshrsa.h ::pkcs11.h ::ppkcs11.h ::sshscard.h ¶
 +               ::putty.h ::puttymem.h ::network.h ::int64.h ::misc.h ¶
++               ::rsaref:win32.h ::rsaref:pkcs11.h ::puttyps.h ¶
++               ::rsaref:unix.h ::rsaref:pkcs11t.h ::rsaref:pkcs11f.h ¶
++               ::puttyps.h ¶
 +               ::windows:winstuff.h ::mac:macstuff.h ::macosx:osx.h ¶
 +               ::unix:unix.h ::tree234.h ::windows:winhelp.h ¶
 …
                 ::misc.h
         echo -n > {Targ}
@@ -2935,7 +3007,7 @@
+@@ -2935,7 +2995,7 @@ winpgen.ppc.o Ä ::windows:winpgen.c ::pu
         {C_PPC} ::windows:winpgen.c -o {Targ} {COptions_PPC}
 …
                 ::unix:unix.h ::windows:winhelp.h ::charset:charset.h
         echo -n > {Targ}
@@ -3160,6 +3232,18 @@
+@@ -3160,6 +3220,16 @@ ldiscucs.carbon.o Ä ::ldiscucs.c ::putty
         setfile -t XCOF {Targ}
         {C_Carbon} ::ldiscucs.c -o {Targ} {COptions_Carbon}
++libpkcs11.carbon.o Ä ::libpkcs11.c ::pkcs11.h ::rsaref:win32.h ¶
++               ::rsaref:pkcs11.h ::rsaref:unix.h ::rsaref:pkcs11t.h ¶
++               ::rsaref:pkcs11f.h
++libpkcs11.carbon.o Ä ::libpkcs11.c ::pkcs11.h ::ppkcs11.h
 +       echo -n > {Targ}
 +       setfile -t XCOF {Targ}
 …
                 ::charset:internal.h
         echo -n > {Targ}
@@ -3494,9 +3578,11 @@
+@@ -3494,8 +3564,9 @@ slookup.carbon.o Ä ::charset:slookup.c :
         setfile -t XCOF {Targ}
         {C_Carbon} ::charset:slookup.c -o {Targ} {COptions_Carbon}
 …
 -ssh.carbon.o Ä ::ssh.c ::putty.h ::tree234.h ::ssh.h ::puttyps.h ::network.h ¶
 -               ::misc.h ::puttymem.h ::int64.h ::windows:winstuff.h ¶
 +ssh.carbon.o Ä ::ssh.c ::putty.h ::tree234.h ::ssh.h ::pkcs11.h ::sshscard.h ¶
++ssh.carbon.o Ä ::ssh.c ::putty.h ::tree234.h ::ssh.h ::pkcs11.h ::ppkcs11.h ::sshscard.h ¶
 +               ::puttyps.h ::network.h ::misc.h ::puttymem.h ::int64.h ¶
 +               ::rsaref:win32.h ::rsaref:pkcs11.h ::windows:winstuff.h ¶
++               ::windows:winstuff.h ¶
                 ::mac:macstuff.h ::macosx:osx.h ::unix:unix.h ¶
-+               ::rsaref:unix.h ::rsaref:pkcs11t.h ::rsaref:pkcs11f.h ¶
                 ::windows:winhelp.h ::charset:charset.h
         echo -n > {Targ}
+        setfile -t XCOF {Targ}
+@@ -3596,6 +3682,17 @@
+@@ -3596,6 +3667,16 @@ sshrsag.carbon.o Ä ::sshrsag.c ::ssh.h :
         setfile -t XCOF {Targ}
         {C_Carbon} ::sshrsag.c -o {Targ} {COptions_Carbon}
 +sshscard.carbon.o Ä ::sshscard.c ::ssh.h ::sshrsa.h ::pkcs11.h ::sshscard.h ¶
++sshscard.carbon.o Ä ::sshscard.c ::ssh.h ::sshrsa.h ::pkcs11.h ::ppkcs11.h ::sshscard.h ¶
 +               ::putty.h ::puttymem.h ::network.h ::int64.h ::misc.h ¶
++               ::rsaref:win32.h ::rsaref:pkcs11.h ::puttyps.h ¶
++               ::rsaref:unix.h ::rsaref:pkcs11t.h ::rsaref:pkcs11f.h ¶
++               ::puttyps.h ¶
 +               ::windows:winstuff.h ::mac:macstuff.h ::macosx:osx.h ¶
 +               ::unix:unix.h ::tree234.h ::windows:winhelp.h ¶
 …
                 ::misc.h
         echo -n > {Targ}
@@ -3940,9 +4037,10 @@
+@@ -3940,9 +4021,10 @@ winpgen.carbon.o Ä ::windows:winpgen.c :
         {C_Carbon} ::windows:winpgen.c -o {Targ} {COptions_Carbon}
 …
         setfile -t XCOF {Targ}
         {C_Carbon} ::windows:winpgnt.c -o {Targ} {COptions_Carbon}
 diff -udrNP putty-0.58.orig/macosx/Makefile putty-0.58/macosx/Makefile
 --- putty-0.58.orig/macosx/Makefile     2005-06-06 11:51:12.776561912 +0200
 +++ putty-0.58/macosx/Makefile  2005-06-06 12:14:39.540701256 +0200
@@ -104,78 +104,83 @@
+diff -urNp putty-0.58.org/macosx/Makefile putty-0.58+smartcard/macosx/Makefile
+--- putty-0.58.org/macosx/Makefile      2005-04-05 22:40:17.000000000 +0300
++++ putty-0.58+smartcard/macosx/Makefile        2008-03-15 20:58:32.000000000 +0200
+@@ -104,78 +104,83 @@ PuTTY: PuTTY.app/Contents/MacOS/PuTTY \
                 PuTTY.app/Contents/Info.plist $(PuTTY_extra)
 …
  puttygen: cmdgen.o import.o misc.o notiming.o sshaes.o sshbn.o sshdes.o \
                 sshdss.o sshdssg.o sshmd5.o sshprime.o sshpubk.o sshrand.o \
@@ -269,6 +274,11 @@
+@@ -269,6 +274,10 @@ ldiscucs.o: ../ldiscucs.c ../putty.h ../
                 ../mac/macstuff.h ../macosx/osx.h ../unix/unix.h \
                 ../puttymem.h ../windows/winhelp.h ../charset/charset.h
         $(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) -c $<
++libpkcs11.o: ../libpkcs11.c ../pkcs11.h ../rsaref/win32.h ../rsaref/pkcs11.h \
++               ../rsaref/unix.h ../rsaref/pkcs11t.h ../rsaref/pkcs11f.h
++libpkcs11.o: ../libpkcs11.c ../pkcs11.h ../ppkcs11.h
 +       $(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) -c $<
 +local_cmd.o: ../local_cmd.c
 …
         $(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) -c $<
  logging.o: ../logging.c ../putty.h ../puttyps.h ../network.h ../misc.h \
@@ -476,9 +486,11 @@
+@@ -476,8 +485,9 @@ sizetip.o: ../windows/sizetip.c ../putty
  slookup.o: ../charset/slookup.c ../charset/charset.h ../charset/internal.h \
                 ../charset/enum.c ../charset/sbcsdat.c ../charset/utf8.c
 …
 -ssh.o: ../ssh.c ../putty.h ../tree234.h ../ssh.h ../puttyps.h ../network.h \
 -               ../misc.h ../puttymem.h ../int64.h ../windows/winstuff.h \
 +ssh.o: ../ssh.c ../putty.h ../tree234.h ../ssh.h ../pkcs11.h ../sshscard.h \
++ssh.o: ../ssh.c ../putty.h ../tree234.h ../ssh.h ../pkcs11.h ../ppkcs11.h ../sshscard.h \
 +               ../puttyps.h ../network.h ../misc.h ../puttymem.h ../int64.h \
 +               ../rsaref/win32.h ../rsaref/pkcs11.h ../windows/winstuff.h \
++               ../windows/winstuff.h \
                 ../mac/macstuff.h ../macosx/osx.h ../unix/unix.h \
-+               ../rsaref/unix.h ../rsaref/pkcs11t.h ../rsaref/pkcs11f.h \
                 ../windows/winhelp.h ../charset/charset.h
         $(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) -c $<
+ sshaes.o: ../sshaes.c ../ssh.h ../puttymem.h ../network.h ../int64.h \
+@@ -528,6 +540,14 @@
+@@ -528,6 +538,13 @@ sshrsa.o: ../sshrsa.c ../ssh.h ../misc.h
  sshrsag.o: ../sshrsag.c ../ssh.h ../puttymem.h ../network.h ../int64.h \
                 ../misc.h
         $(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) -c $<
 +sshscard.o: ../sshscard.c ../ssh.h ../sshrsa.h ../pkcs11.h ../sshscard.h \
++sshscard.o: ../sshscard.c ../ssh.h ../sshrsa.h ../pkcs11.h ../ppkcs11.h ../sshscard.h \
 +               ../putty.h ../puttymem.h ../network.h ../int64.h ../misc.h \
++               ../rsaref/win32.h ../rsaref/pkcs11.h ../puttyps.h \
++               ../rsaref/unix.h ../rsaref/pkcs11t.h ../rsaref/pkcs11f.h \
++               ../puttyps.h \
 +               ../windows/winstuff.h ../mac/macstuff.h ../macosx/osx.h \
 +               ../unix/unix.h ../tree234.h ../windows/winhelp.h \
 …
                 ../misc.h
         $(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) -c $<
@@ -741,9 +761,10 @@
+@@ -741,9 +758,10 @@ winpgen.o: ../windows/winpgen.c ../putty
                 ../charset/charset.h
         $(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) -c $<
 …
  winpgntc.o: ../windows/winpgntc.c ../putty.h ../puttyps.h ../network.h \
                 ../misc.h ../windows/winstuff.h ../mac/macstuff.h \
+diff -udrNP putty-0.58.orig/pkcs11.h putty-0.58/pkcs11.h
+--- putty-0.58.orig/pkcs11.h    1970-01-01 01:00:00.000000000 +0100
++++ putty-0.58/pkcs11.h 2005-06-06 11:50:58.478735512 +0200
+@@ -0,0 +1,48 @@
++/*
++ * pkcs11.h: OpenSC project's PKCS#11 library header
++ *
++ * Copyright (C) 2002  Timo Teräs <timo.teras@iki.fi>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library 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
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++
++#ifndef OPENSC_PKCS11_H
++#define OPENSC_PKCS11_H
++
++#ifndef _WINDOWS
++#include <rsaref/unix.h>
++#include <rsaref/pkcs11.h>
+diff -urNp putty-0.58.org/pkcs11.h putty-0.58+smartcard/pkcs11.h
+--- putty-0.58.org/pkcs11.h     1970-01-01 02:00:00.000000000 +0200
++++ putty-0.58+smartcard/pkcs11.h       2008-03-15 20:26:37.000000000 +0200
+@@ -0,0 +1,1357 @@
++/* pkcs11.h
++   Copyright 2006, 2007 g10 Code GmbH
++   Copyright 2006 Andreas Jellinghaus
++
++   This file is free software; as a special exception the author gives
++   unlimited permission to copy and/or distribute it, with or without
++   modifications, as long as this notice is preserved.
++
++   This file is distributed in the hope that it will be useful, but
++   WITHOUT ANY WARRANTY, to the extent permitted by law; without even
++   the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
++   PURPOSE.  */
++
++/* Please submit changes back to the Scute project at
++   http://www.scute.org/ (or send them to marcus@g10code.com), so that
++   they can be picked up by other projects from there as well.  */
++
++/* This file is a modified implementation of the PKCS #11 standard by
++   RSA Security Inc.  It is mostly a drop-in replacement, with the
++   following change:
++
++   This header file does not require any macro definitions by the user
++   (like CK_DEFINE_FUNCTION etc).  In fact, it defines those macros
++   for you (if useful, some are missing, let me know if you need
++   more).
++
++   There is an additional API available that does comply better to the
++   GNU coding standard.  It can be switched on by defining
++   CRYPTOKI_GNU before including this header file.  For this, the
++   following changes are made to the specification:
++
++   All structure types are changed to a "struct ck_foo" where CK_FOO
++   is the type name in PKCS #11.
++
++   All non-structure types are changed to ck_foo_t where CK_FOO is the
++   lowercase version of the type name in PKCS #11.  The basic types
++   (CK_ULONG et al.) are removed without substitute.
++
++   All members of structures are modified in the following way: Type
++   indication prefixes are removed, and underscore characters are
++   inserted before words.  Then the result is lowercased.
++
++   Note that function names are still in the original case, as they
++   need for ABI compatibility.
++
++   CK_FALSE, CK_TRUE and NULL_PTR are removed without substitute.  Use
++   <stdbool.h>.
++
++   If CRYPTOKI_COMPAT is defined before including this header file,
++   then none of the API changes above take place, and the API is the
++   one defined by the PKCS #11 standard.  */
++
++#ifndef PKCS11_H
++#define PKCS11_H 1
++
++#if defined(__cplusplus)
++extern "C" {
++#endif
++
++
++/* The version of cryptoki we implement.  The revision is changed with
++   each modification of this file.  If you do not use the "official"
++   version of this file, please consider deleting the revision macro
++   (you may use a macro with a different name to keep track of your
++   versions).  */
++#define CRYPTOKI_VERSION_MAJOR         2
++#define CRYPTOKI_VERSION_MINOR         20
++#define CRYPTOKI_VERSION_REVISION      6
++
++
++/* Compatibility interface is default, unless CRYPTOKI_GNU is
++   given.  */
++#ifndef CRYPTOKI_GNU
++#ifndef CRYPTOKI_COMPAT
++#define CRYPTOKI_COMPAT 1
++#endif
++#endif
++
++/* System dependencies.  */
++
++#if defined(_WIN32) || defined(CRYPTOKI_FORCE_WIN32)
++
++/* There is a matching pop below.  */
++#pragma pack(push, cryptoki, 1)
++
++#ifdef CRYPTOKI_EXPORTS
++#define CK_SPEC __declspec(dllexport)
 +#else
++#include "rsaref/win32.h"
++#pragma pack(push, cryptoki, 1)
++#include "rsaref/pkcs11.h"
++#define CK_SPEC __declspec(dllimport)
++#endif
++
++#else
++
++#define CK_SPEC
++
++#endif
++
++
++#ifdef CRYPTOKI_COMPAT
++  /* If we are in compatibility mode, switch all exposed names to the
++     PKCS #11 variant.  There are corresponding #undefs below.  */
++
++#define ck_flags_t CK_FLAGS
++#define ck_version _CK_VERSION
++
++#define ck_info _CK_INFO
++#define cryptoki_version cryptokiVersion
++#define manufacturer_id manufacturerID
++#define library_description libraryDescription
++#define library_version libraryVersion
++
++#define ck_notification_t CK_NOTIFICATION
++#define ck_slot_id_t CK_SLOT_ID
++
++#define ck_slot_info _CK_SLOT_INFO
++#define slot_description slotDescription
++#define hardware_version hardwareVersion
++#define firmware_version firmwareVersion
++
++#define ck_token_info _CK_TOKEN_INFO
++#define serial_number serialNumber
++#define max_session_count ulMaxSessionCount
++#define session_count ulSessionCount
++#define max_rw_session_count ulMaxRwSessionCount
++#define rw_session_count ulRwSessionCount
++#define max_pin_len ulMaxPinLen
++#define min_pin_len ulMinPinLen
++#define total_public_memory ulTotalPublicMemory
++#define free_public_memory ulFreePublicMemory
++#define total_private_memory ulTotalPrivateMemory
++#define free_private_memory ulFreePrivateMemory
++#define utc_time utcTime
++
++#define ck_session_handle_t CK_SESSION_HANDLE
++#define ck_user_type_t CK_USER_TYPE
++#define ck_state_t CK_STATE
++
++#define ck_session_info _CK_SESSION_INFO
++#define slot_id slotID
++#define device_error ulDeviceError
++
++#define ck_object_handle_t CK_OBJECT_HANDLE
++#define ck_object_class_t CK_OBJECT_CLASS
++#define ck_hw_feature_type_t CK_HW_FEATURE_TYPE
++#define ck_key_type_t CK_KEY_TYPE
++#define ck_certificate_type_t CK_CERTIFICATE_TYPE
++#define ck_attribute_type_t CK_ATTRIBUTE_TYPE
++
++#define ck_attribute _CK_ATTRIBUTE
++#define value pValue
++#define value_len ulValueLen
++
++#define ck_date _CK_DATE
++
++#define ck_mechanism_type_t CK_MECHANISM_TYPE
++
++#define ck_mechanism _CK_MECHANISM
++#define parameter pParameter
++#define parameter_len ulParameterLen
++
++#define ck_mechanism_info _CK_MECHANISM_INFO
++#define min_key_size ulMinKeySize
++#define max_key_size ulMaxKeySize
++
++#define ck_rv_t CK_RV
++#define ck_notify_t CK_NOTIFY
++
++#define ck_function_list _CK_FUNCTION_LIST
++
++#define ck_createmutex_t CK_CREATEMUTEX
++#define ck_destroymutex_t CK_DESTROYMUTEX
++#define ck_lockmutex_t CK_LOCKMUTEX
++#define ck_unlockmutex_t CK_UNLOCKMUTEX
++
++#define ck_c_initialize_args _CK_C_INITIALIZE_ARGS
++#define create_mutex CreateMutex
++#define destroy_mutex DestroyMutex
++#define lock_mutex LockMutex
++#define unlock_mutex UnlockMutex
++#define reserved pReserved
++
++#endif /* CRYPTOKI_COMPAT */
++
++
++
++typedef unsigned long ck_flags_t;
++
++struct ck_version
++{
++  unsigned char major;
++  unsigned char minor;
++};
++
++
++struct ck_info
++{
++  struct ck_version cryptoki_version;
++  unsigned char manufacturer_id[32];
++  ck_flags_t flags;
++  unsigned char library_description[32];
++  struct ck_version library_version;
++};
++
++
++typedef unsigned long ck_notification_t;
++
++#define CKN_SURRENDER  (0)
++
++
++typedef unsigned long ck_slot_id_t;
++
++
++struct ck_slot_info
++{
++  unsigned char slot_description[64];
++  unsigned char manufacturer_id[32];
++  ck_flags_t flags;
++  struct ck_version hardware_version;
++  struct ck_version firmware_version;
++};
++
++
++#define CKF_TOKEN_PRESENT      (1 << 0)
++#define CKF_REMOVABLE_DEVICE   (1 << 1)
++#define CKF_HW_SLOT            (1 << 2)
++#define CKF_ARRAY_ATTRIBUTE    (1 << 30)
++
++
++struct ck_token_info
++{
++  unsigned char label[32];
++  unsigned char manufacturer_id[32];
++  unsigned char model[16];
++  unsigned char serial_number[16];
++  ck_flags_t flags;
++  unsigned long max_session_count;
++  unsigned long session_count;
++  unsigned long max_rw_session_count;
++  unsigned long rw_session_count;
++  unsigned long max_pin_len;
++  unsigned long min_pin_len;
++  unsigned long total_public_memory;
++  unsigned long free_public_memory;
++  unsigned long total_private_memory;
++  unsigned long free_private_memory;
++  struct ck_version hardware_version;
++  struct ck_version firmware_version;
++  unsigned char utc_time[16];
++};
++
++
++#define CKF_RNG                                        (1 << 0)
++#define CKF_WRITE_PROTECTED                    (1 << 1)
++#define CKF_LOGIN_REQUIRED                     (1 << 2)
++#define CKF_USER_PIN_INITIALIZED               (1 << 3)
++#define CKF_RESTORE_KEY_NOT_NEEDED             (1 << 5)
++#define CKF_CLOCK_ON_TOKEN                     (1 << 6)
++#define CKF_PROTECTED_AUTHENTICATION_PATH      (1 << 8)
++#define CKF_DUAL_CRYPTO_OPERATIONS             (1 << 9)
++#define CKF_TOKEN_INITIALIZED                  (1 << 10)
++#define CKF_SECONDARY_AUTHENTICATION           (1 << 11)
++#define CKF_USER_PIN_COUNT_LOW                 (1 << 16)
++#define CKF_USER_PIN_FINAL_TRY                 (1 << 17)
++#define CKF_USER_PIN_LOCKED                    (1 << 18)
++#define CKF_USER_PIN_TO_BE_CHANGED             (1 << 19)
++#define CKF_SO_PIN_COUNT_LOW                   (1 << 20)
++#define CKF_SO_PIN_FINAL_TRY                   (1 << 21)
++#define CKF_SO_PIN_LOCKED                      (1 << 22)
++#define CKF_SO_PIN_TO_BE_CHANGED               (1 << 23)
++
++#define CK_UNAVAILABLE_INFORMATION     ((unsigned long) -1)
++#define CK_EFFECTIVELY_INFINITE                (0)
++
++
++typedef unsigned long ck_session_handle_t;
++
++#define CK_INVALID_HANDLE      (0)
++
++
++typedef unsigned long ck_user_type_t;
++
++#define CKU_SO                 (0)
++#define CKU_USER               (1)
++#define CKU_CONTEXT_SPECIFIC   (2)
++
++
++typedef unsigned long ck_state_t;
++
++#define CKS_RO_PUBLIC_SESSION  (0)
++#define CKS_RO_USER_FUNCTIONS  (1)
++#define CKS_RW_PUBLIC_SESSION  (2)
++#define CKS_RW_USER_FUNCTIONS  (3)
++#define CKS_RW_SO_FUNCTIONS    (4)
++
++
++struct ck_session_info
++{
++  ck_slot_id_t slot_id;
++  ck_state_t state;
++  ck_flags_t flags;
++  unsigned long device_error;
++};
++
++#define CKF_RW_SESSION         (1 << 1)
++#define CKF_SERIAL_SESSION     (1 << 2)
++
++
++typedef unsigned long ck_object_handle_t;
++
++
++typedef unsigned long ck_object_class_t;
++
++#define CKO_DATA               (0)
++#define CKO_CERTIFICATE                (1)
++#define CKO_PUBLIC_KEY         (2)
++#define CKO_PRIVATE_KEY                (3)
++#define CKO_SECRET_KEY         (4)
++#define CKO_HW_FEATURE         (5)
++#define CKO_DOMAIN_PARAMETERS  (6)
++#define CKO_MECHANISM          (7)
++#define CKO_VENDOR_DEFINED     ((unsigned long) (1 << 31))
++
++
++typedef unsigned long ck_hw_feature_type_t;
++
++#define CKH_MONOTONIC_COUNTER  (1)
++#define CKH_CLOCK              (2)
++#define CKH_USER_INTERFACE     (3)
++#define CKH_VENDOR_DEFINED     ((unsigned long) (1 << 31))
++
++
++typedef unsigned long ck_key_type_t;
++
++#define CKK_RSA                        (0)
++#define CKK_DSA                        (1)
++#define CKK_DH                 (2)
++#define CKK_ECDSA              (3)
++#define CKK_EC                 (3)
++#define CKK_X9_42_DH           (4)
++#define CKK_KEA                        (5)
++#define CKK_GENERIC_SECRET     (0x10)
++#define CKK_RC2                        (0x11)
++#define CKK_RC4                        (0x12)
++#define CKK_DES                        (0x13)
++#define CKK_DES2               (0x14)
++#define CKK_DES3               (0x15)
++#define CKK_CAST               (0x16)
++#define CKK_CAST3              (0x17)
++#define CKK_CAST128            (0x18)
++#define CKK_RC5                        (0x19)
++#define CKK_IDEA               (0x1a)
++#define CKK_SKIPJACK           (0x1b)
++#define CKK_BATON              (0x1c)
++#define CKK_JUNIPER            (0x1d)
++#define CKK_CDMF               (0x1e)
++#define CKK_AES                        (0x1f)
++#define CKK_BLOWFISH           (0x20)
++#define CKK_TWOFISH            (0x21)
++#define CKK_VENDOR_DEFINED     ((unsigned long) (1 << 31))
++
++
++typedef unsigned long ck_certificate_type_t;
++
++#define CKC_X_509              (0)
++#define CKC_X_509_ATTR_CERT    (1)
++#define CKC_WTLS               (2)
++#define CKC_VENDOR_DEFINED     ((unsigned long) (1 << 31))
++
++
++typedef unsigned long ck_attribute_type_t;
++
++#define CKA_CLASS                      (0)
++#define CKA_TOKEN                      (1)
++#define CKA_PRIVATE                    (2)
++#define CKA_LABEL                      (3)
++#define CKA_APPLICATION                        (0x10)
++#define CKA_VALUE                      (0x11)
++#define CKA_OBJECT_ID                  (0x12)
++#define CKA_CERTIFICATE_TYPE           (0x80)
++#define CKA_ISSUER                     (0x81)
++#define CKA_SERIAL_NUMBER              (0x82)
++#define CKA_AC_ISSUER                  (0x83)
++#define CKA_OWNER                      (0x84)
++#define CKA_ATTR_TYPES                 (0x85)
++#define CKA_TRUSTED                    (0x86)
++#define CKA_CERTIFICATE_CATEGORY       (0x87)
++#define CKA_JAVA_MIDP_SECURITY_DOMAIN  (0x88)
++#define CKA_URL                                (0x89)
++#define CKA_HASH_OF_SUBJECT_PUBLIC_KEY (0x8a)
++#define CKA_HASH_OF_ISSUER_PUBLIC_KEY  (0x8b)
++#define CKA_CHECK_VALUE                        (0x90)
++#define CKA_KEY_TYPE                   (0x100)
++#define CKA_SUBJECT                    (0x101)
++#define CKA_ID                         (0x102)
++#define CKA_SENSITIVE                  (0x103)
++#define CKA_ENCRYPT                    (0x104)
++#define CKA_DECRYPT                    (0x105)
++#define CKA_WRAP                       (0x106)
++#define CKA_UNWRAP                     (0x107)
++#define CKA_SIGN                       (0x108)
++#define CKA_SIGN_RECOVER               (0x109)
++#define CKA_VERIFY                     (0x10a)
++#define CKA_VERIFY_RECOVER             (0x10b)
++#define CKA_DERIVE                     (0x10c)
++#define CKA_START_DATE                 (0x110)
++#define CKA_END_DATE                   (0x111)
++#define CKA_MODULUS                    (0x120)
++#define CKA_MODULUS_BITS               (0x121)
++#define CKA_PUBLIC_EXPONENT            (0x122)
++#define CKA_PRIVATE_EXPONENT           (0x123)
++#define CKA_PRIME_1                    (0x124)
++#define CKA_PRIME_2                    (0x125)
++#define CKA_EXPONENT_1                 (0x126)
++#define CKA_EXPONENT_2                 (0x127)
++#define CKA_COEFFICIENT                        (0x128)
++#define CKA_PRIME                      (0x130)
++#define CKA_SUBPRIME                   (0x131)
++#define CKA_BASE                       (0x132)
++#define CKA_PRIME_BITS                 (0x133)
++#define CKA_SUB_PRIME_BITS             (0x134)
++#define CKA_VALUE_BITS                 (0x160)
++#define CKA_VALUE_LEN                  (0x161)
++#define CKA_EXTRACTABLE                        (0x162)
++#define CKA_LOCAL                      (0x163)
++#define CKA_NEVER_EXTRACTABLE          (0x164)
++#define CKA_ALWAYS_SENSITIVE           (0x165)
++#define CKA_KEY_GEN_MECHANISM          (0x166)
++#define CKA_MODIFIABLE                 (0x170)
++#define CKA_ECDSA_PARAMS               (0x180)
++#define CKA_EC_PARAMS                  (0x180)
++#define CKA_EC_POINT                   (0x181)
++#define CKA_SECONDARY_AUTH             (0x200)
++#define CKA_AUTH_PIN_FLAGS             (0x201)
++#define CKA_ALWAYS_AUTHENTICATE                (0x202)
++#define CKA_WRAP_WITH_TRUSTED          (0x210)
++#define CKA_HW_FEATURE_TYPE            (0x300)
++#define CKA_RESET_ON_INIT              (0x301)
++#define CKA_HAS_RESET                  (0x302)
++#define CKA_PIXEL_X                    (0x400)
++#define CKA_PIXEL_Y                    (0x401)
++#define CKA_RESOLUTION                 (0x402)
++#define CKA_CHAR_ROWS                  (0x403)
++#define CKA_CHAR_COLUMNS               (0x404)
++#define CKA_COLOR                      (0x405)
++#define CKA_BITS_PER_PIXEL             (0x406)
++#define CKA_CHAR_SETS                  (0x480)
++#define CKA_ENCODING_METHODS           (0x481)
++#define CKA_MIME_TYPES                 (0x482)
++#define CKA_MECHANISM_TYPE             (0x500)
++#define CKA_REQUIRED_CMS_ATTRIBUTES    (0x501)
++#define CKA_DEFAULT_CMS_ATTRIBUTES     (0x502)
++#define CKA_SUPPORTED_CMS_ATTRIBUTES   (0x503)
++#define CKA_WRAP_TEMPLATE              (CKF_ARRAY_ATTRIBUTE | 0x211)
++#define CKA_UNWRAP_TEMPLATE            (CKF_ARRAY_ATTRIBUTE | 0x212)
++#define CKA_ALLOWED_MECHANISMS         (CKF_ARRAY_ATTRIBUTE | 0x600)
++#define CKA_VENDOR_DEFINED             ((unsigned long) (1 << 31))
++
++
++struct ck_attribute
++{
++  ck_attribute_type_t type;
++  void *value;
++  unsigned long value_len;
++};
++
++
++struct ck_date
++{
++  unsigned char year[4];
++  unsigned char month[2];
++  unsigned char day[2];
++};
++
++
++typedef unsigned long ck_mechanism_type_t;
++
++#define CKM_RSA_PKCS_KEY_PAIR_GEN      (0)
++#define CKM_RSA_PKCS                   (1)
++#define CKM_RSA_9796                   (2)
++#define CKM_RSA_X_509                  (3)
++#define CKM_MD2_RSA_PKCS               (4)
++#define CKM_MD5_RSA_PKCS               (5)
++#define CKM_SHA1_RSA_PKCS              (6)
++#define CKM_RIPEMD128_RSA_PKCS         (7)
++#define CKM_RIPEMD160_RSA_PKCS         (8)
++#define CKM_RSA_PKCS_OAEP              (9)
++#define CKM_RSA_X9_31_KEY_PAIR_GEN     (0xa)
++#define CKM_RSA_X9_31                  (0xb)
++#define CKM_SHA1_RSA_X9_31             (0xc)
++#define CKM_RSA_PKCS_PSS               (0xd)
++#define CKM_SHA1_RSA_PKCS_PSS          (0xe)
++#define CKM_DSA_KEY_PAIR_GEN           (0x10)
++#define        CKM_DSA                         (0x11)
++#define CKM_DSA_SHA1                   (0x12)
++#define CKM_DH_PKCS_KEY_PAIR_GEN       (0x20)
++#define CKM_DH_PKCS_DERIVE             (0x21)
++#define        CKM_X9_42_DH_KEY_PAIR_GEN       (0x30)
++#define CKM_X9_42_DH_DERIVE            (0x31)
++#define CKM_X9_42_DH_HYBRID_DERIVE     (0x32)
++#define CKM_X9_42_MQV_DERIVE           (0x33)
++#define CKM_SHA256_RSA_PKCS            (0x40)
++#define CKM_SHA384_RSA_PKCS            (0x41)
++#define CKM_SHA512_RSA_PKCS            (0x42)
++#define CKM_SHA256_RSA_PKCS_PSS                (0x43)
++#define CKM_SHA384_RSA_PKCS_PSS                (0x44)
++#define CKM_SHA512_RSA_PKCS_PSS                (0x45)
++#define CKM_RC2_KEY_GEN                        (0x100)
++#define CKM_RC2_ECB                    (0x101)
++#define        CKM_RC2_CBC                     (0x102)
++#define        CKM_RC2_MAC                     (0x103)
++#define CKM_RC2_MAC_GENERAL            (0x104)
++#define CKM_RC2_CBC_PAD                        (0x105)
++#define CKM_RC4_KEY_GEN                        (0x110)
++#define CKM_RC4                                (0x111)
++#define CKM_DES_KEY_GEN                        (0x120)
++#define CKM_DES_ECB                    (0x121)
++#define CKM_DES_CBC                    (0x122)
++#define CKM_DES_MAC                    (0x123)
++#define CKM_DES_MAC_GENERAL            (0x124)
++#define CKM_DES_CBC_PAD                        (0x125)
++#define CKM_DES2_KEY_GEN               (0x130)
++#define CKM_DES3_KEY_GEN               (0x131)
++#define CKM_DES3_ECB                   (0x132)
++#define CKM_DES3_CBC                   (0x133)
++#define CKM_DES3_MAC                   (0x134)
++#define CKM_DES3_MAC_GENERAL           (0x135)
++#define CKM_DES3_CBC_PAD               (0x136)
++#define CKM_CDMF_KEY_GEN               (0x140)
++#define CKM_CDMF_ECB                   (0x141)
++#define CKM_CDMF_CBC                   (0x142)
++#define CKM_CDMF_MAC                   (0x143)
++#define CKM_CDMF_MAC_GENERAL           (0x144)
++#define CKM_CDMF_CBC_PAD               (0x145)
++#define CKM_MD2                                (0x200)
++#define CKM_MD2_HMAC                   (0x201)
++#define CKM_MD2_HMAC_GENERAL           (0x202)
++#define CKM_MD5                                (0x210)
++#define CKM_MD5_HMAC                   (0x211)
++#define CKM_MD5_HMAC_GENERAL           (0x212)
++#define CKM_SHA_1                      (0x220)
++#define CKM_SHA_1_HMAC                 (0x221)
++#define CKM_SHA_1_HMAC_GENERAL         (0x222)
++#define CKM_RIPEMD128                  (0x230)
++#define CKM_RIPEMD128_HMAC             (0x231)
++#define CKM_RIPEMD128_HMAC_GENERAL     (0x232)
++#define CKM_RIPEMD160                  (0x240)
++#define CKM_RIPEMD160_HMAC             (0x241)
++#define CKM_RIPEMD160_HMAC_GENERAL     (0x242)
++#define CKM_SHA256                     (0x250)
++#define CKM_SHA256_HMAC                        (0x251)
++#define CKM_SHA256_HMAC_GENERAL                (0x252)
++#define CKM_SHA384                     (0x260)
++#define CKM_SHA384_HMAC                        (0x261)
++#define CKM_SHA384_HMAC_GENERAL                (0x262)
++#define CKM_SHA512                     (0x270)
++#define CKM_SHA512_HMAC                        (0x271)
++#define CKM_SHA512_HMAC_GENERAL                (0x272)
++#define CKM_CAST_KEY_GEN               (0x300)
++#define CKM_CAST_ECB                   (0x301)
++#define CKM_CAST_CBC                   (0x302)
++#define CKM_CAST_MAC                   (0x303)
++#define CKM_CAST_MAC_GENERAL           (0x304)
++#define CKM_CAST_CBC_PAD               (0x305)
++#define CKM_CAST3_KEY_GEN              (0x310)
++#define CKM_CAST3_ECB                  (0x311)
++#define CKM_CAST3_CBC                  (0x312)
++#define CKM_CAST3_MAC                  (0x313)
++#define CKM_CAST3_MAC_GENERAL          (0x314)
++#define CKM_CAST3_CBC_PAD              (0x315)
++#define CKM_CAST5_KEY_GEN              (0x320)
++#define CKM_CAST128_KEY_GEN            (0x320)
++#define CKM_CAST5_ECB                  (0x321)
++#define CKM_CAST128_ECB                        (0x321)
++#define CKM_CAST5_CBC                  (0x322)
++#define CKM_CAST128_CBC                        (0x322)
++#define CKM_CAST5_MAC                  (0x323)
++#define        CKM_CAST128_MAC                 (0x323)
++#define CKM_CAST5_MAC_GENERAL          (0x324)
++#define CKM_CAST128_MAC_GENERAL                (0x324)
++#define CKM_CAST5_CBC_PAD              (0x325)
++#define CKM_CAST128_CBC_PAD            (0x325)
++#define CKM_RC5_KEY_GEN                        (0x330)
++#define CKM_RC5_ECB                    (0x331)
++#define CKM_RC5_CBC                    (0x332)
++#define CKM_RC5_MAC                    (0x333)
++#define CKM_RC5_MAC_GENERAL            (0x334)
++#define CKM_RC5_CBC_PAD                        (0x335)
++#define CKM_IDEA_KEY_GEN               (0x340)
++#define CKM_IDEA_ECB                   (0x341)
++#define        CKM_IDEA_CBC                    (0x342)
++#define CKM_IDEA_MAC                   (0x343)
++#define CKM_IDEA_MAC_GENERAL           (0x344)
++#define CKM_IDEA_CBC_PAD               (0x345)
++#define CKM_GENERIC_SECRET_KEY_GEN     (0x350)
++#define CKM_CONCATENATE_BASE_AND_KEY   (0x360)
++#define CKM_CONCATENATE_BASE_AND_DATA  (0x362)
++#define CKM_CONCATENATE_DATA_AND_BASE  (0x363)
++#define CKM_XOR_BASE_AND_DATA          (0x364)
++#define CKM_EXTRACT_KEY_FROM_KEY       (0x365)
++#define CKM_SSL3_PRE_MASTER_KEY_GEN    (0x370)
++#define CKM_SSL3_MASTER_KEY_DERIVE     (0x371)
++#define CKM_SSL3_KEY_AND_MAC_DERIVE    (0x372)
++#define CKM_SSL3_MASTER_KEY_DERIVE_DH  (0x373)
++#define CKM_TLS_PRE_MASTER_KEY_GEN     (0x374)
++#define CKM_TLS_MASTER_KEY_DERIVE      (0x375)
++#define CKM_TLS_KEY_AND_MAC_DERIVE     (0x376)
++#define CKM_TLS_MASTER_KEY_DERIVE_DH   (0x377)
++#define CKM_SSL3_MD5_MAC               (0x380)
++#define CKM_SSL3_SHA1_MAC              (0x381)
++#define CKM_MD5_KEY_DERIVATION         (0x390)
++#define CKM_MD2_KEY_DERIVATION         (0x391)
++#define CKM_SHA1_KEY_DERIVATION                (0x392)
++#define CKM_PBE_MD2_DES_CBC            (0x3a0)
++#define CKM_PBE_MD5_DES_CBC            (0x3a1)
++#define CKM_PBE_MD5_CAST_CBC           (0x3a2)
++#define CKM_PBE_MD5_CAST3_CBC          (0x3a3)
++#define CKM_PBE_MD5_CAST5_CBC          (0x3a4)
++#define CKM_PBE_MD5_CAST128_CBC                (0x3a4)
++#define CKM_PBE_SHA1_CAST5_CBC         (0x3a5)
++#define CKM_PBE_SHA1_CAST128_CBC       (0x3a5)
++#define CKM_PBE_SHA1_RC4_128           (0x3a6)
++#define CKM_PBE_SHA1_RC4_40            (0x3a7)
++#define CKM_PBE_SHA1_DES3_EDE_CBC      (0x3a8)
++#define CKM_PBE_SHA1_DES2_EDE_CBC      (0x3a9)
++#define CKM_PBE_SHA1_RC2_128_CBC       (0x3aa)
++#define CKM_PBE_SHA1_RC2_40_CBC                (0x3ab)
++#define CKM_PKCS5_PBKD2                        (0x3b0)
++#define CKM_PBA_SHA1_WITH_SHA1_HMAC    (0x3c0)
++#define CKM_KEY_WRAP_LYNKS             (0x400)
++#define CKM_KEY_WRAP_SET_OAEP          (0x401)
++#define CKM_SKIPJACK_KEY_GEN           (0x1000)
++#define CKM_SKIPJACK_ECB64             (0x1001)
++#define CKM_SKIPJACK_CBC64             (0x1002)
++#define CKM_SKIPJACK_OFB64             (0x1003)
++#define CKM_SKIPJACK_CFB64             (0x1004)
++#define CKM_SKIPJACK_CFB32             (0x1005)
++#define CKM_SKIPJACK_CFB16             (0x1006)
++#define CKM_SKIPJACK_CFB8              (0x1007)
++#define CKM_SKIPJACK_WRAP              (0x1008)
++#define CKM_SKIPJACK_PRIVATE_WRAP      (0x1009)
++#define CKM_SKIPJACK_RELAYX            (0x100a)
++#define CKM_KEA_KEY_PAIR_GEN           (0x1010)
++#define CKM_KEA_KEY_DERIVE             (0x1011)
++#define CKM_FORTEZZA_TIMESTAMP         (0x1020)
++#define CKM_BATON_KEY_GEN              (0x1030)
++#define CKM_BATON_ECB128               (0x1031)
++#define CKM_BATON_ECB96                        (0x1032)
++#define CKM_BATON_CBC128               (0x1033)
++#define CKM_BATON_COUNTER              (0x1034)
++#define CKM_BATON_SHUFFLE              (0x1035)
++#define CKM_BATON_WRAP                 (0x1036)
++#define CKM_ECDSA_KEY_PAIR_GEN         (0x1040)
++#define CKM_EC_KEY_PAIR_GEN            (0x1040)
++#define CKM_ECDSA                      (0x1041)
++#define CKM_ECDSA_SHA1                 (0x1042)
++#define CKM_ECDH1_DERIVE               (0x1050)
++#define CKM_ECDH1_COFACTOR_DERIVE      (0x1051)
++#define CKM_ECMQV_DERIVE               (0x1052)
++#define CKM_JUNIPER_KEY_GEN            (0x1060)
++#define CKM_JUNIPER_ECB128             (0x1061)
++#define CKM_JUNIPER_CBC128             (0x1062)
++#define CKM_JUNIPER_COUNTER            (0x1063)
++#define CKM_JUNIPER_SHUFFLE            (0x1064)
++#define CKM_JUNIPER_WRAP               (0x1065)
++#define CKM_FASTHASH                   (0x1070)
++#define CKM_AES_KEY_GEN                        (0x1080)
++#define CKM_AES_ECB                    (0x1081)
++#define CKM_AES_CBC                    (0x1082)
++#define CKM_AES_MAC                    (0x1083)
++#define CKM_AES_MAC_GENERAL            (0x1084)
++#define CKM_AES_CBC_PAD                        (0x1085)
++#define CKM_DSA_PARAMETER_GEN          (0x2000)
++#define CKM_DH_PKCS_PARAMETER_GEN      (0x2001)
++#define CKM_X9_42_DH_PARAMETER_GEN     (0x2002)
++#define CKM_VENDOR_DEFINED             ((unsigned long) (1 << 31))
++
++
++struct ck_mechanism
++{
++  ck_mechanism_type_t mechanism;
++  void *parameter;
++  unsigned long parameter_len;
++};
++
++
++struct ck_mechanism_info
++{
++  unsigned long min_key_size;
++  unsigned long max_key_size;
++  ck_flags_t flags;
++};
++
++#define CKF_HW                 (1 << 0)
++#define CKF_ENCRYPT            (1 << 8)
++#define CKF_DECRYPT            (1 << 9)
++#define CKF_DIGEST             (1 << 10)
++#define CKF_SIGN               (1 << 11)
++#define CKF_SIGN_RECOVER       (1 << 12)
++#define CKF_VERIFY             (1 << 13)
++#define CKF_VERIFY_RECOVER     (1 << 14)
++#define CKF_GENERATE           (1 << 15)
++#define CKF_GENERATE_KEY_PAIR  (1 << 16)
++#define CKF_WRAP               (1 << 17)
++#define CKF_UNWRAP             (1 << 18)
++#define CKF_DERIVE             (1 << 19)
++#define CKF_EXTENSION          ((unsigned long) (1 << 31))
++
++
++/* Flags for C_WaitForSlotEvent.  */
++#define CKF_DONT_BLOCK                         (1)
++
++
++typedef unsigned long ck_rv_t;
++
++
++typedef ck_rv_t (*ck_notify_t) (ck_session_handle_t session,
++                               ck_notification_t event, void *application);
++
++/* Forward reference.  */
++struct ck_function_list;
++
++#define _CK_DECLARE_FUNCTION(name, args)       \
++typedef ck_rv_t (*CK_ ## name) args;           \
++ck_rv_t CK_SPEC name args
++
++_CK_DECLARE_FUNCTION (C_Initialize, (void *init_args));
++_CK_DECLARE_FUNCTION (C_Finalize, (void *reserved));
++_CK_DECLARE_FUNCTION (C_GetInfo, (struct ck_info *info));
++_CK_DECLARE_FUNCTION (C_GetFunctionList,
++                     (struct ck_function_list **function_list));
++
++_CK_DECLARE_FUNCTION (C_GetSlotList,
++                     (unsigned char token_present, ck_slot_id_t *slot_list,
++                      unsigned long *count));
++_CK_DECLARE_FUNCTION (C_GetSlotInfo,
++                     (ck_slot_id_t slot_id, struct ck_slot_info *info));
++_CK_DECLARE_FUNCTION (C_GetTokenInfo,
++                     (ck_slot_id_t slot_id, struct ck_token_info *info));
++_CK_DECLARE_FUNCTION (C_WaitForSlotEvent,
++                     (ck_flags_t flags, ck_slot_id_t *slot, void *reserved));
++_CK_DECLARE_FUNCTION (C_GetMechanismList,
++                     (ck_slot_id_t slot_id,
++                      ck_mechanism_type_t *mechanism_list,
++                      unsigned long *count));
++_CK_DECLARE_FUNCTION (C_GetMechanismInfo,
++                     (ck_slot_id_t slot_id, ck_mechanism_type_t type,
++                      struct ck_mechanism_info *info));
++_CK_DECLARE_FUNCTION (C_InitToken,
++                     (ck_slot_id_t slot_id, unsigned char *pin,
++                      unsigned long pin_len, unsigned char *label));
++_CK_DECLARE_FUNCTION (C_InitPIN,
++                     (ck_session_handle_t session, unsigned char *pin,
++                      unsigned long pin_len));
++_CK_DECLARE_FUNCTION (C_SetPIN,
++                     (ck_session_handle_t session, unsigned char *old_pin,
++                      unsigned long old_len, unsigned char *new_pin,
++                      unsigned long new_len));
++
++_CK_DECLARE_FUNCTION (C_OpenSession,
++                     (ck_slot_id_t slot_id, ck_flags_t flags,
++                      void *application, ck_notify_t notify,
++                      ck_session_handle_t *session));
++_CK_DECLARE_FUNCTION (C_CloseSession, (ck_session_handle_t session));
++_CK_DECLARE_FUNCTION (C_CloseAllSessions, (ck_slot_id_t slot_id));
++_CK_DECLARE_FUNCTION (C_GetSessionInfo,
++                     (ck_session_handle_t session,
++                      struct ck_session_info *info));
++_CK_DECLARE_FUNCTION (C_GetOperationState,
++                     (ck_session_handle_t session,
++                      unsigned char *operation_state,
++                      unsigned long *operation_state_len));
++_CK_DECLARE_FUNCTION (C_SetOperationState,
++                     (ck_session_handle_t session,
++                      unsigned char *operation_state,
++                      unsigned long operation_state_len,
++                      ck_object_handle_t encryption_key,
++                      ck_object_handle_t authentiation_key));
++_CK_DECLARE_FUNCTION (C_Login,
++                     (ck_session_handle_t session, ck_user_type_t user_type,
++                      unsigned char *pin, unsigned long pin_len));
++_CK_DECLARE_FUNCTION (C_Logout, (ck_session_handle_t session));
++
++_CK_DECLARE_FUNCTION (C_CreateObject,
++                     (ck_session_handle_t session,
++                      struct ck_attribute *templ,
++                      unsigned long count, ck_object_handle_t *object));
++_CK_DECLARE_FUNCTION (C_CopyObject,
++                     (ck_session_handle_t session, ck_object_handle_t object,
++                      struct ck_attribute *templ, unsigned long count,
++                      ck_object_handle_t *new_object));
++_CK_DECLARE_FUNCTION (C_DestroyObject,
++                     (ck_session_handle_t session,
++                      ck_object_handle_t object));
++_CK_DECLARE_FUNCTION (C_GetObjectSize,
++                     (ck_session_handle_t session,
++                      ck_object_handle_t object,
++                      unsigned long *size));
++_CK_DECLARE_FUNCTION (C_GetAttributeValue,
++                     (ck_session_handle_t session,
++                      ck_object_handle_t object,
++                      struct ck_attribute *templ,
++                      unsigned long count));
++_CK_DECLARE_FUNCTION (C_SetAttributeValue,
++                     (ck_session_handle_t session,
++                      ck_object_handle_t object,
++                      struct ck_attribute *templ,
++                      unsigned long count));
++_CK_DECLARE_FUNCTION (C_FindObjectsInit,
++                     (ck_session_handle_t session,
++                      struct ck_attribute *templ,
++                      unsigned long count));
++_CK_DECLARE_FUNCTION (C_FindObjects,
++                     (ck_session_handle_t session,
++                      ck_object_handle_t *object,
++                      unsigned long max_object_count,
++                      unsigned long *object_count));
++_CK_DECLARE_FUNCTION (C_FindObjectsFinal,
++                     (ck_session_handle_t session));
++
++_CK_DECLARE_FUNCTION (C_EncryptInit,
++                     (ck_session_handle_t session,
++                      struct ck_mechanism *mechanism,
++                      ck_object_handle_t key));
++_CK_DECLARE_FUNCTION (C_Encrypt,
++                     (ck_session_handle_t session,
++                      unsigned char *data, unsigned long data_len,
++                      unsigned char *encrypted_data,
++                      unsigned long *encrypted_data_len));
++_CK_DECLARE_FUNCTION (C_EncryptUpdate,
++                     (ck_session_handle_t session,
++                      unsigned char *part, unsigned long part_len,
++                      unsigned char *encrypted_part,
++                      unsigned long *encrypted_part_len));
++_CK_DECLARE_FUNCTION (C_EncryptFinal,
++                     (ck_session_handle_t session,
++                      unsigned char *last_encrypted_part,
++                      unsigned long *last_encrypted_part_len));
++
++_CK_DECLARE_FUNCTION (C_DecryptInit,
++                     (ck_session_handle_t session,
++                      struct ck_mechanism *mechanism,
++                      ck_object_handle_t key));
++_CK_DECLARE_FUNCTION (C_Decrypt,
++                     (ck_session_handle_t session,
++                      unsigned char *encrypted_data,
++                      unsigned long encrypted_data_len,
++                      unsigned char *data, unsigned long *data_len));
++_CK_DECLARE_FUNCTION (C_DecryptUpdate,
++                     (ck_session_handle_t session,
++                      unsigned char *encrypted_part,
++                      unsigned long encrypted_part_len,
++                      unsigned char *part, unsigned long *part_len));
++_CK_DECLARE_FUNCTION (C_DecryptFinal,
++                     (ck_session_handle_t session,
++                      unsigned char *last_part,
++                      unsigned long *last_part_len));
++
++_CK_DECLARE_FUNCTION (C_DigestInit,
++                     (ck_session_handle_t session,
++                      struct ck_mechanism *mechanism));
++_CK_DECLARE_FUNCTION (C_Digest,
++                     (ck_session_handle_t session,
++                      unsigned char *data, unsigned long data_len,
++                      unsigned char *digest,
++                      unsigned long *digest_len));
++_CK_DECLARE_FUNCTION (C_DigestUpdate,
++                     (ck_session_handle_t session,
++                      unsigned char *part, unsigned long part_len));
++_CK_DECLARE_FUNCTION (C_DigestKey,
++                     (ck_session_handle_t session, ck_object_handle_t key));
++_CK_DECLARE_FUNCTION (C_DigestFinal,
++                     (ck_session_handle_t session,
++                      unsigned char *digest,
++                      unsigned long *digest_len));
++
++_CK_DECLARE_FUNCTION (C_SignInit,
++                     (ck_session_handle_t session,
++                      struct ck_mechanism *mechanism,
++                      ck_object_handle_t key));
++_CK_DECLARE_FUNCTION (C_Sign,
++                     (ck_session_handle_t session,
++                      unsigned char *data, unsigned long data_len,
++                      unsigned char *signature,
++                      unsigned long *signature_len));
++_CK_DECLARE_FUNCTION (C_SignUpdate,
++                     (ck_session_handle_t session,
++                      unsigned char *part, unsigned long part_len));
++_CK_DECLARE_FUNCTION (C_SignFinal,
++                     (ck_session_handle_t session,
++                      unsigned char *signature,
++                      unsigned long *signature_len));
++_CK_DECLARE_FUNCTION (C_SignRecoverInit,
++                     (ck_session_handle_t session,
++                      struct ck_mechanism *mechanism,
++                      ck_object_handle_t key));
++_CK_DECLARE_FUNCTION (C_SignRecover,
++                     (ck_session_handle_t session,
++                      unsigned char *data, unsigned long data_len,
++                      unsigned char *signature,
++                      unsigned long *signature_len));
++
++_CK_DECLARE_FUNCTION (C_VerifyInit,
++                     (ck_session_handle_t session,
++                      struct ck_mechanism *mechanism,
++                      ck_object_handle_t key));
++_CK_DECLARE_FUNCTION (C_Verify,
++                     (ck_session_handle_t session,
++                      unsigned char *data, unsigned long data_len,
++                      unsigned char *signature,
++                      unsigned long signature_len));
++_CK_DECLARE_FUNCTION (C_VerifyUpdate,
++                     (ck_session_handle_t session,
++                      unsigned char *part, unsigned long part_len));
++_CK_DECLARE_FUNCTION (C_VerifyFinal,
++                     (ck_session_handle_t session,
++                      unsigned char *signature,
++                      unsigned long signature_len));
++_CK_DECLARE_FUNCTION (C_VerifyRecoverInit,
++                     (ck_session_handle_t session,
++                      struct ck_mechanism *mechanism,
++                      ck_object_handle_t key));
++_CK_DECLARE_FUNCTION (C_VerifyRecover,
++                     (ck_session_handle_t session,
++                      unsigned char *signature,
++                      unsigned long signature_len,
++                      unsigned char *data,
++                      unsigned long *data_len));
++
++_CK_DECLARE_FUNCTION (C_DigestEncryptUpdate,
++                     (ck_session_handle_t session,
++                      unsigned char *part, unsigned long part_len,
++                      unsigned char *encrypted_part,
++                      unsigned long *encrypted_part_len));
++_CK_DECLARE_FUNCTION (C_DecryptDigestUpdate,
++                     (ck_session_handle_t session,
++                      unsigned char *encrypted_part,
++                      unsigned long encrypted_part_len,
++                      unsigned char *part,
++                      unsigned long *part_len));
++_CK_DECLARE_FUNCTION (C_SignEncryptUpdate,
++                     (ck_session_handle_t session,
++                      unsigned char *part, unsigned long part_len,
++                      unsigned char *encrypted_part,
++                      unsigned long *encrypted_part_len));
++_CK_DECLARE_FUNCTION (C_DecryptVerifyUpdate,
++                     (ck_session_handle_t session,
++                      unsigned char *encrypted_part,
++                      unsigned long encrypted_part_len,
++                      unsigned char *part,
++                      unsigned long *part_len));
++
++_CK_DECLARE_FUNCTION (C_GenerateKey,
++                     (ck_session_handle_t session,
++                      struct ck_mechanism *mechanism,
++                      struct ck_attribute *templ,
++                      unsigned long count,
++                      ck_object_handle_t *key));
++_CK_DECLARE_FUNCTION (C_GenerateKeyPair,
++                     (ck_session_handle_t session,
++                      struct ck_mechanism *mechanism,
++                      struct ck_attribute *public_key_template,
++                      unsigned long public_key_attribute_count,
++                      struct ck_attribute *private_key_template,
++                      unsigned long private_key_attribute_count,
++                      ck_object_handle_t *public_key,
++                      ck_object_handle_t *private_key));
++_CK_DECLARE_FUNCTION (C_WrapKey,
++                     (ck_session_handle_t session,
++                      struct ck_mechanism *mechanism,
++                      ck_object_handle_t wrapping_key,
++                      ck_object_handle_t key,
++                      unsigned char *wrapped_key,
++                      unsigned long *wrapped_key_len));
++_CK_DECLARE_FUNCTION (C_UnwrapKey,
++                     (ck_session_handle_t session,
++                      struct ck_mechanism *mechanism,
++                      ck_object_handle_t unwrapping_key,
++                      unsigned char *wrapped_key,
++                      unsigned long wrapped_key_len,
++                      struct ck_attribute *templ,
++                      unsigned long attribute_count,
++                      ck_object_handle_t *key));
++_CK_DECLARE_FUNCTION (C_DeriveKey,
++                     (ck_session_handle_t session,
++                      struct ck_mechanism *mechanism,
++                      ck_object_handle_t base_key,
++                      struct ck_attribute *templ,
++                      unsigned long attribute_count,
++                      ck_object_handle_t *key));
++
++_CK_DECLARE_FUNCTION (C_SeedRandom,
++                     (ck_session_handle_t session, unsigned char *seed,
++                      unsigned long seed_len));
++_CK_DECLARE_FUNCTION (C_GenerateRandom,
++                     (ck_session_handle_t session,
++                      unsigned char *random_data,
++                      unsigned long random_len));
++
++_CK_DECLARE_FUNCTION (C_GetFunctionStatus, (ck_session_handle_t session));
++_CK_DECLARE_FUNCTION (C_CancelFunction, (ck_session_handle_t session));
++
++
++struct ck_function_list
++{
++  struct ck_version version;
++  CK_C_Initialize C_Initialize;
++  CK_C_Finalize C_Finalize;
++  CK_C_GetInfo C_GetInfo;
++  CK_C_GetFunctionList C_GetFunctionList;
++  CK_C_GetSlotList C_GetSlotList;
++  CK_C_GetSlotInfo C_GetSlotInfo;
++  CK_C_GetTokenInfo C_GetTokenInfo;
++  CK_C_GetMechanismList C_GetMechanismList;
++  CK_C_GetMechanismInfo C_GetMechanismInfo;
++  CK_C_InitToken C_InitToken;
++  CK_C_InitPIN C_InitPIN;
++  CK_C_SetPIN C_SetPIN;
++  CK_C_OpenSession C_OpenSession;
++  CK_C_CloseSession C_CloseSession;
++  CK_C_CloseAllSessions C_CloseAllSessions;
++  CK_C_GetSessionInfo C_GetSessionInfo;
++  CK_C_GetOperationState C_GetOperationState;
++  CK_C_SetOperationState C_SetOperationState;
++  CK_C_Login C_Login;
++  CK_C_Logout C_Logout;
++  CK_C_CreateObject C_CreateObject;
++  CK_C_CopyObject C_CopyObject;
++  CK_C_DestroyObject C_DestroyObject;
++  CK_C_GetObjectSize C_GetObjectSize;
++  CK_C_GetAttributeValue C_GetAttributeValue;
++  CK_C_SetAttributeValue C_SetAttributeValue;
++  CK_C_FindObjectsInit C_FindObjectsInit;
++  CK_C_FindObjects C_FindObjects;
++  CK_C_FindObjectsFinal C_FindObjectsFinal;
++  CK_C_EncryptInit C_EncryptInit;
++  CK_C_Encrypt C_Encrypt;
++  CK_C_EncryptUpdate C_EncryptUpdate;
++  CK_C_EncryptFinal C_EncryptFinal;
++  CK_C_DecryptInit C_DecryptInit;
++  CK_C_Decrypt C_Decrypt;
++  CK_C_DecryptUpdate C_DecryptUpdate;
++  CK_C_DecryptFinal C_DecryptFinal;
++  CK_C_DigestInit C_DigestInit;
++  CK_C_Digest C_Digest;
++  CK_C_DigestUpdate C_DigestUpdate;
++  CK_C_DigestKey C_DigestKey;
++  CK_C_DigestFinal C_DigestFinal;
++  CK_C_SignInit C_SignInit;
++  CK_C_Sign C_Sign;
++  CK_C_SignUpdate C_SignUpdate;
++  CK_C_SignFinal C_SignFinal;
++  CK_C_SignRecoverInit C_SignRecoverInit;
++  CK_C_SignRecover C_SignRecover;
++  CK_C_VerifyInit C_VerifyInit;
++  CK_C_Verify C_Verify;
++  CK_C_VerifyUpdate C_VerifyUpdate;
++  CK_C_VerifyFinal C_VerifyFinal;
++  CK_C_VerifyRecoverInit C_VerifyRecoverInit;
++  CK_C_VerifyRecover C_VerifyRecover;
++  CK_C_DigestEncryptUpdate C_DigestEncryptUpdate;
++  CK_C_DecryptDigestUpdate C_DecryptDigestUpdate;
++  CK_C_SignEncryptUpdate C_SignEncryptUpdate;
++  CK_C_DecryptVerifyUpdate C_DecryptVerifyUpdate;
++  CK_C_GenerateKey C_GenerateKey;
++  CK_C_GenerateKeyPair C_GenerateKeyPair;
++  CK_C_WrapKey C_WrapKey;
++  CK_C_UnwrapKey C_UnwrapKey;
++  CK_C_DeriveKey C_DeriveKey;
++  CK_C_SeedRandom C_SeedRandom;
++  CK_C_GenerateRandom C_GenerateRandom;
++  CK_C_GetFunctionStatus C_GetFunctionStatus;
++  CK_C_CancelFunction C_CancelFunction;
++  CK_C_WaitForSlotEvent C_WaitForSlotEvent;
++};
++
++
++typedef ck_rv_t (*ck_createmutex_t) (void **mutex);
++typedef ck_rv_t (*ck_destroymutex_t) (void *mutex);
++typedef ck_rv_t (*ck_lockmutex_t) (void *mutex);
++typedef ck_rv_t (*ck_unlockmutex_t) (void *mutex);
++
++
++struct ck_c_initialize_args
++{
++  ck_createmutex_t create_mutex;
++  ck_destroymutex_t destroy_mutex;
++  ck_lockmutex_t lock_mutex;
++  ck_unlockmutex_t unlock_mutex;
++  ck_flags_t flags;
++  void *reserved;
++};
++
++
++#define CKF_LIBRARY_CANT_CREATE_OS_THREADS     (1 << 0)
++#define CKF_OS_LOCKING_OK                      (1 << 1)
++
++#define CKR_OK                                 (0)
++#define CKR_CANCEL                             (1)
++#define CKR_HOST_MEMORY                                (2)
++#define CKR_SLOT_ID_INVALID                    (3)
++#define CKR_GENERAL_ERROR                      (5)
++#define CKR_FUNCTION_FAILED                    (6)
++#define CKR_ARGUMENTS_BAD                      (7)
++#define CKR_NO_EVENT                           (8)
++#define CKR_NEED_TO_CREATE_THREADS             (9)
++#define CKR_CANT_LOCK                          (0xa)
++#define CKR_ATTRIBUTE_READ_ONLY                        (0x10)
++#define CKR_ATTRIBUTE_SENSITIVE                        (0x11)
++#define CKR_ATTRIBUTE_TYPE_INVALID             (0x12)
++#define CKR_ATTRIBUTE_VALUE_INVALID            (0x13)
++#define CKR_DATA_INVALID                       (0x20)
++#define CKR_DATA_LEN_RANGE                     (0x21)
++#define CKR_DEVICE_ERROR                       (0x30)
++#define CKR_DEVICE_MEMORY                      (0x31)
++#define CKR_DEVICE_REMOVED                     (0x32)
++#define CKR_ENCRYPTED_DATA_INVALID             (0x40)
++#define CKR_ENCRYPTED_DATA_LEN_RANGE           (0x41)
++#define CKR_FUNCTION_CANCELED                  (0x50)
++#define CKR_FUNCTION_NOT_PARALLEL              (0x51)
++#define CKR_FUNCTION_NOT_SUPPORTED             (0x54)
++#define CKR_KEY_HANDLE_INVALID                 (0x60)
++#define CKR_KEY_SIZE_RANGE                     (0x62)
++#define CKR_KEY_TYPE_INCONSISTENT              (0x63)
++#define CKR_KEY_NOT_NEEDED                     (0x64)
++#define CKR_KEY_CHANGED                                (0x65)
++#define CKR_KEY_NEEDED                         (0x66)
++#define CKR_KEY_INDIGESTIBLE                   (0x67)
++#define CKR_KEY_FUNCTION_NOT_PERMITTED         (0x68)
++#define CKR_KEY_NOT_WRAPPABLE                  (0x69)
++#define CKR_KEY_UNEXTRACTABLE                  (0x6a)
++#define CKR_MECHANISM_INVALID                  (0x70)
++#define CKR_MECHANISM_PARAM_INVALID            (0x71)
++#define CKR_OBJECT_HANDLE_INVALID              (0x82)
++#define CKR_OPERATION_ACTIVE                   (0x90)
++#define CKR_OPERATION_NOT_INITIALIZED          (0x91)
++#define CKR_PIN_INCORRECT                      (0xa0)
++#define CKR_PIN_INVALID                                (0xa1)
++#define CKR_PIN_LEN_RANGE                      (0xa2)
++#define CKR_PIN_EXPIRED                                (0xa3)
++#define CKR_PIN_LOCKED                         (0xa4)
++#define CKR_SESSION_CLOSED                     (0xb0)
++#define CKR_SESSION_COUNT                      (0xb1)
++#define CKR_SESSION_HANDLE_INVALID             (0xb3)
++#define CKR_SESSION_PARALLEL_NOT_SUPPORTED     (0xb4)
++#define CKR_SESSION_READ_ONLY                  (0xb5)
++#define CKR_SESSION_EXISTS                     (0xb6)
++#define CKR_SESSION_READ_ONLY_EXISTS           (0xb7)
++#define CKR_SESSION_READ_WRITE_SO_EXISTS       (0xb8)
++#define CKR_SIGNATURE_INVALID                  (0xc0)
++#define CKR_SIGNATURE_LEN_RANGE                        (0xc1)
++#define CKR_TEMPLATE_INCOMPLETE                        (0xd0)
++#define CKR_TEMPLATE_INCONSISTENT              (0xd1)
++#define CKR_TOKEN_NOT_PRESENT                  (0xe0)
++#define CKR_TOKEN_NOT_RECOGNIZED               (0xe1)
++#define CKR_TOKEN_WRITE_PROTECTED              (0xe2)
++#define        CKR_UNWRAPPING_KEY_HANDLE_INVALID       (0xf0)
++#define CKR_UNWRAPPING_KEY_SIZE_RANGE          (0xf1)
++#define CKR_UNWRAPPING_KEY_TYPE_INCONSISTENT   (0xf2)
++#define CKR_USER_ALREADY_LOGGED_IN             (0x100)
++#define CKR_USER_NOT_LOGGED_IN                 (0x101)
++#define CKR_USER_PIN_NOT_INITIALIZED           (0x102)
++#define CKR_USER_TYPE_INVALID                  (0x103)
++#define CKR_USER_ANOTHER_ALREADY_LOGGED_IN     (0x104)
++#define CKR_USER_TOO_MANY_TYPES                        (0x105)
++#define CKR_WRAPPED_KEY_INVALID                        (0x110)
++#define CKR_WRAPPED_KEY_LEN_RANGE              (0x112)
++#define CKR_WRAPPING_KEY_HANDLE_INVALID                (0x113)
++#define CKR_WRAPPING_KEY_SIZE_RANGE            (0x114)
++#define CKR_WRAPPING_KEY_TYPE_INCONSISTENT     (0x115)
++#define CKR_RANDOM_SEED_NOT_SUPPORTED          (0x120)
++#define CKR_RANDOM_NO_RNG                      (0x121)
++#define CKR_DOMAIN_PARAMS_INVALID              (0x130)
++#define CKR_BUFFER_TOO_SMALL                   (0x150)
++#define CKR_SAVED_STATE_INVALID                        (0x160)
++#define CKR_INFORMATION_SENSITIVE              (0x170)
++#define CKR_STATE_UNSAVEABLE                   (0x180)
++#define CKR_CRYPTOKI_NOT_INITIALIZED           (0x190)
++#define CKR_CRYPTOKI_ALREADY_INITIALIZED       (0x191)
++#define CKR_MUTEX_BAD                          (0x1a0)
++#define CKR_MUTEX_NOT_LOCKED                   (0x1a1)
++#define CKR_FUNCTION_REJECTED                  (0x200)
++#define CKR_VENDOR_DEFINED                     ((unsigned long) (1 << 31))
++
++
++
++/* Compatibility layer.  */
++
++#ifdef CRYPTOKI_COMPAT
++
++#undef CK_DEFINE_FUNCTION
++#define CK_DEFINE_FUNCTION(retval, name) retval CK_SPEC name
++
++/* For NULL.  */
++#include <stddef.h>
++
++typedef unsigned char CK_BYTE;
++typedef unsigned char CK_CHAR;
++typedef unsigned char CK_UTF8CHAR;
++typedef unsigned char CK_BBOOL;
++typedef unsigned long int CK_ULONG;
++typedef long int CK_LONG;
++typedef CK_BYTE *CK_BYTE_PTR;
++typedef CK_CHAR *CK_CHAR_PTR;
++typedef CK_UTF8CHAR *CK_UTF8CHAR_PTR;
++typedef CK_ULONG *CK_ULONG_PTR;
++typedef void *CK_VOID_PTR;
++typedef void **CK_VOID_PTR_PTR;
++#define CK_FALSE 0
++#define CK_TRUE 1
++#ifndef CK_DISABLE_TRUE_FALSE
++#ifndef FALSE
++#define FALSE 0
++#endif
++#ifndef TRUE
++#define TRUE 1
++#endif
++#endif
++
++typedef struct ck_version CK_VERSION;
++typedef struct ck_version *CK_VERSION_PTR;
++
++typedef struct ck_info CK_INFO;
++typedef struct ck_info *CK_INFO_PTR;
++
++typedef ck_slot_id_t *CK_SLOT_ID_PTR;
++
++typedef struct ck_slot_info CK_SLOT_INFO;
++typedef struct ck_slot_info *CK_SLOT_INFO_PTR;
++
++typedef struct ck_token_info CK_TOKEN_INFO;
++typedef struct ck_token_info *CK_TOKEN_INFO_PTR;
++
++typedef ck_session_handle_t *CK_SESSION_HANDLE_PTR;
++
++typedef struct ck_session_info CK_SESSION_INFO;
++typedef struct ck_session_info *CK_SESSION_INFO_PTR;
++
++typedef ck_object_handle_t *CK_OBJECT_HANDLE_PTR;
++
++typedef ck_object_class_t *CK_OBJECT_CLASS_PTR;
++
++typedef struct ck_attribute CK_ATTRIBUTE;
++typedef struct ck_attribute *CK_ATTRIBUTE_PTR;
++
++typedef struct ck_date CK_DATE;
++typedef struct ck_date *CK_DATE_PTR;
++
++typedef ck_mechanism_type_t *CK_MECHANISM_TYPE_PTR;
++
++typedef struct ck_mechanism CK_MECHANISM;
++typedef struct ck_mechanism *CK_MECHANISM_PTR;
++
++typedef struct ck_mechanism_info CK_MECHANISM_INFO;
++typedef struct ck_mechanism_info *CK_MECHANISM_INFO_PTR;
++
++typedef struct ck_function_list CK_FUNCTION_LIST;
++typedef struct ck_function_list *CK_FUNCTION_LIST_PTR;
++typedef struct ck_function_list **CK_FUNCTION_LIST_PTR_PTR;
++
++typedef struct ck_c_initialize_args CK_C_INITIALIZE_ARGS;
++typedef struct ck_c_initialize_args *CK_C_INITIALIZE_ARGS_PTR;
++
++#define NULL_PTR NULL
++
++/* Delete the helper macros defined at the top of the file.  */
++#undef ck_flags_t
++#undef ck_version
++
++#undef ck_info
++#undef cryptoki_version
++#undef manufacturer_id
++#undef library_description
++#undef library_version
++
++#undef ck_notification_t
++#undef ck_slot_id_t
++
++#undef ck_slot_info
++#undef slot_description
++#undef hardware_version
++#undef firmware_version
++
++#undef ck_token_info
++#undef serial_number
++#undef max_session_count
++#undef session_count
++#undef max_rw_session_count
++#undef rw_session_count
++#undef max_pin_len
++#undef min_pin_len
++#undef total_public_memory
++#undef free_public_memory
++#undef total_private_memory
++#undef free_private_memory
++#undef utc_time
++
++#undef ck_session_handle_t
++#undef ck_user_type_t
++#undef ck_state_t
++
++#undef ck_session_info
++#undef slot_id
++#undef device_error
++
++#undef ck_object_handle_t
++#undef ck_object_class_t
++#undef ck_hw_feature_type_t
++#undef ck_key_type_t
++#undef ck_certificate_type_t
++#undef ck_attribute_type_t
++
++#undef ck_attribute
++#undef value
++#undef value_len
++
++#undef ck_date
++
++#undef ck_mechanism_type_t
++
++#undef ck_mechanism
++#undef parameter
++#undef parameter_len
++
++#undef ck_mechanism_info
++#undef min_key_size
++#undef max_key_size
++
++#undef ck_rv_t
++#undef ck_notify_t
++
++#undef ck_function_list
++
++#undef ck_createmutex_t
++#undef ck_destroymutex_t
++#undef ck_lockmutex_t
++#undef ck_unlockmutex_t
++
++#undef ck_c_initialize_args
++#undef create_mutex
++#undef destroy_mutex
++#undef lock_mutex
++#undef unlock_mutex
++#undef reserved
++
++#endif /* CRYPTOKI_COMPAT */
++
++
++/* System dependencies.  */
++#if defined(_WIN32) || defined(CRYPTOKI_FORCE_WIN32)
 +#pragma pack(pop, cryptoki)
 +#endif
++
++#if defined(__cplusplus)
++}
++#endif
++
++#endif /* PKCS11_H */
+diff -urNp putty-0.58.org/ppkcs11.h putty-0.58+smartcard/ppkcs11.h
+--- putty-0.58.org/ppkcs11.h    1970-01-01 02:00:00.000000000 +0200
++++ putty-0.58+smartcard/ppkcs11.h      2008-03-15 20:31:43.000000000 +0200
+@@ -0,0 +1,20 @@
++#ifndef __PPKCS11_H
++#define __PPKCS11_H
++
++#include "pkcs11.h"
++
 +#ifdef __cplusplus
 …
++
 +#endif
 diff -udrNP putty-0.58.orig/putty.h putty-0.58/putty.h
 --- putty-0.58.orig/putty.h     2005-04-05 21:37:51.000000000 +0200
 +++ putty-0.58/putty.h  2005-06-06 11:50:58.479735360 +0200
@@ -431,6 +431,9 @@
+diff -urNp putty-0.58.org/putty.h putty-0.58+smartcard/putty.h
+--- putty-0.58.org/putty.h      2005-04-05 22:37:51.000000000 +0300
++++ putty-0.58+smartcard/putty.h        2005-06-06 12:50:58.000000000 +0300
+@@ -431,6 +431,9 @@ struct config_tag {
      int ssh2_des_cbc;                 /* "des-cbc" unrecommended SSH-2 cipher */
      int try_tis_auth;
 …
      int ssh_subsys2;                  /* fallback to go with remote_cmd2 */
      int ssh_no_shell;                 /* avoid running a shell */
@@ -532,6 +535,9 @@
+@@ -532,6 +535,9 @@ struct config_tag {
      int x11_forward;
      char x11_display[128];
 …
      int lport_acceptall; /* accept conns from hosts other than localhost */
      int rport_acceptall; /* same for remote forwarded ports (SSH-2 only) */
+diff -udrNP putty-0.58.orig/rsaref/pkcs11.h putty-0.58/rsaref/pkcs11.h
+--- putty-0.58.orig/rsaref/pkcs11.h     1970-01-01 01:00:00.000000000 +0100
++++ putty-0.58/rsaref/pkcs11.h  2005-06-06 11:50:58.480735208 +0200
+@@ -0,0 +1,286 @@
++/* pkcs11.h include file for PKCS #11.  2001 June 25 */
++
++#ifndef _PKCS11_H_
++#define _PKCS11_H_ 1
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/* Before including this file (pkcs11.h) (or pkcs11t.h by
++ * itself), 6 platform-specific macros must be defined.  These
++ * macros are described below, and typical definitions for them
++ * are also given.  Be advised that these definitions can depend
++ * on both the platform and the compiler used (and possibly also
++ * on whether a Cryptoki library is linked statically or
++ * dynamically).
++ *
++ * In addition to defining these 6 macros, the packing convention
++ * for Cryptoki structures should be set.  The Cryptoki
++ * convention on packing is that structures should be 1-byte
++ * aligned.
++ *
++ * If you're using Microsoft Developer Studio 5.0 to produce
++ * Win32 stuff, this might be done by using the following
++ * preprocessor directive before including pkcs11.h or pkcs11t.h:
++ *
++ * #pragma pack(push, cryptoki, 1)
++ *
++ * and using the following preprocessor directive after including
++ * pkcs11.h or pkcs11t.h:
++ *
++ * #pragma pack(pop, cryptoki)
++ *
++ * If you're using an earlier version of Microsoft Developer
++ * Studio to produce Win16 stuff, this might be done by using
++ * the following preprocessor directive before including
++ * pkcs11.h or pkcs11t.h:
++ *
++ * #pragma pack(1)
++ *
++ * In a UNIX environment, you're on your own for this.  You might
++ * not need to do (or be able to do!) anything.
++ *
++ *
++ * Now for the macros:
++ *
++ *
++ * 1. CK_PTR: The indirection string for making a pointer to an
++ * object.  It can be used like this:
++ *
++ * typedef CK_BYTE CK_PTR CK_BYTE_PTR;
++ *
++ * If you're using Microsoft Developer Studio 5.0 to produce
++ * Win32 stuff, it might be defined by:
++ *
++ * #define CK_PTR *
++ *
++ * If you're using an earlier version of Microsoft Developer
++ * Studio to produce Win16 stuff, it might be defined by:
++ *
++ * #define CK_PTR far *
++ *
++ * In a typical UNIX environment, it might be defined by:
++ *
++ * #define CK_PTR *
++ *
++ *
++ * 2. CK_DEFINE_FUNCTION(returnType, name): A macro which makes
++ * an exportable Cryptoki library function definition out of a
++ * return type and a function name.  It should be used in the
++ * following fashion to define the exposed Cryptoki functions in
++ * a Cryptoki library:
++ *
++ * CK_DEFINE_FUNCTION(CK_RV, C_Initialize)(
++ *   CK_VOID_PTR pReserved
++ * )
++ * {
++ *   ...
++ * }
++ *
++ * If you're using Microsoft Developer Studio 5.0 to define a
++ * function in a Win32 Cryptoki .dll, it might be defined by:
++ *
++ * #define CK_DEFINE_FUNCTION(returnType, name) \
++ *   returnType __declspec(dllexport) name
++ *
++ * If you're using an earlier version of Microsoft Developer
++ * Studio to define a function in a Win16 Cryptoki .dll, it
++ * might be defined by:
++ *
++ * #define CK_DEFINE_FUNCTION(returnType, name) \
++ *   returnType __export _far _pascal name
++ *
++ * In a UNIX environment, it might be defined by:
++ *
++ * #define CK_DEFINE_FUNCTION(returnType, name) \
++ *   returnType name
++ *
++ *
++ * 3. CK_DECLARE_FUNCTION(returnType, name): A macro which makes
++ * an importable Cryptoki library function declaration out of a
++ * return type and a function name.  It should be used in the
++ * following fashion:
++ *
++ * extern CK_DECLARE_FUNCTION(CK_RV, C_Initialize)(
++ *   CK_VOID_PTR pReserved
++ * );
++ *
++ * If you're using Microsoft Developer Studio 5.0 to declare a
++ * function in a Win32 Cryptoki .dll, it might be defined by:
++ *
++ * #define CK_DECLARE_FUNCTION(returnType, name) \
++ *   returnType __declspec(dllimport) name
++ *
++ * If you're using an earlier version of Microsoft Developer
++ * Studio to declare a function in a Win16 Cryptoki .dll, it
++ * might be defined by:
++ *
++ * #define CK_DECLARE_FUNCTION(returnType, name) \
++ *   returnType __export _far _pascal name
++ *
++ * In a UNIX environment, it might be defined by:
++ *
++ * #define CK_DECLARE_FUNCTION(returnType, name) \
++ *   returnType name
++ *
++ *
++ * 4. CK_DECLARE_FUNCTION_POINTER(returnType, name): A macro
++ * which makes a Cryptoki API function pointer declaration or
++ * function pointer type declaration out of a return type and a
++ * function name.  It should be used in the following fashion:
++ *
++ * // Define funcPtr to be a pointer to a Cryptoki API function
++ * // taking arguments args and returning CK_RV.
++ * CK_DECLARE_FUNCTION_POINTER(CK_RV, funcPtr)(args);
++ *
++ * or
++ *
++ * // Define funcPtrType to be the type of a pointer to a
++ * // Cryptoki API function taking arguments args and returning
++ * // CK_RV, and then define funcPtr to be a variable of type
++ * // funcPtrType.
++ * typedef CK_DECLARE_FUNCTION_POINTER(CK_RV, funcPtrType)(args);
++ * funcPtrType funcPtr;
++ *
++ * If you're using Microsoft Developer Studio 5.0 to access
++ * functions in a Win32 Cryptoki .dll, in might be defined by:
++ *
++ * #define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
++ *   returnType __declspec(dllimport) (* name)
++ *
++ * If you're using an earlier version of Microsoft Developer
++ * Studio to access functions in a Win16 Cryptoki .dll, it might
++ * be defined by:
++ *
++ * #define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
++ *   returnType __export _far _pascal (* name)
++ *
++ * In a UNIX environment, it might be defined by:
++ *
++ * #define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
++ *   returnType (* name)
++ *
++ *
++ * 5. CK_CALLBACK_FUNCTION(returnType, name): A macro which makes
++ * a function pointer type for an application callback out of
++ * a return type for the callback and a name for the callback.
++ * It should be used in the following fashion:
++ *
++ * CK_CALLBACK_FUNCTION(CK_RV, myCallback)(args);
++ *
++ * to declare a function pointer, myCallback, to a callback
++ * which takes arguments args and returns a CK_RV.  It can also
++ * be used like this:
++ *
++ * typedef CK_CALLBACK_FUNCTION(CK_RV, myCallbackType)(args);
++ * myCallbackType myCallback;
++ *
++ * If you're using Microsoft Developer Studio 5.0 to do Win32
++ * Cryptoki development, it might be defined by:
++ *
++ * #define CK_CALLBACK_FUNCTION(returnType, name) \
++ *   returnType (* name)
++ *
++ * If you're using an earlier version of Microsoft Developer
++ * Studio to do Win16 development, it might be defined by:
++ *
++ * #define CK_CALLBACK_FUNCTION(returnType, name) \
++ *   returnType _far _pascal (* name)
++ *
++ * In a UNIX environment, it might be defined by:
++ *
++ * #define CK_CALLBACK_FUNCTION(returnType, name) \
++ *   returnType (* name)
++ *
++ *
++ * 6. NULL_PTR: This macro is the value of a NULL pointer.
++ *
++ * In any ANSI/ISO C environment (and in many others as well),
++ * this should best be defined by
++ *
++ * #ifndef NULL_PTR
++ * #define NULL_PTR 0
++ * #endif
++ */
++
++#if 0
++#include "rsaref/unix.h"
++#endif
++
++/* All the various Cryptoki types and #define'd values are in the
++ * file pkcs11t.h. */
++#include "rsaref/pkcs11t.h"
++
++#define __PASTE(x,y)      x##y
++
++
++/* ==============================================================
++ * Define the "extern" form of all the entry points.
++ * ==============================================================
++ */
++
++#define CK_NEED_ARG_LIST  1
++#define CK_PKCS11_FUNCTION_INFO(name) \
++  extern CK_DECLARE_FUNCTION(CK_RV, name)
++
++/* pkcs11f.h has all the information about the Cryptoki
++ * function prototypes. */
++#include "rsaref/pkcs11f.h"
++
++#undef CK_NEED_ARG_LIST
++#undef CK_PKCS11_FUNCTION_INFO
++
++
++/* ==============================================================
++ * Define the typedef form of all the entry points.  That is, for
++ * each Cryptoki function C_XXX, define a type CK_C_XXX which is
++ * a pointer to that kind of function.
++ * ==============================================================
++ */
++
++#define CK_NEED_ARG_LIST  1
++#define CK_PKCS11_FUNCTION_INFO(name) \
++  typedef CK_DECLARE_FUNCTION_POINTER(CK_RV, __PASTE(CK_,name))
++
++/* pkcs11f.h has all the information about the Cryptoki
++ * function prototypes. */
++#include "rsaref/pkcs11f.h"
++
++#undef CK_NEED_ARG_LIST
++#undef CK_PKCS11_FUNCTION_INFO
++
++
++/* ==============================================================
++ * Define structed vector of entry points.  A CK_FUNCTION_LIST
++ * contains a CK_VERSION indicating a library's Cryptoki version
++ * and then a whole slew of function pointers to the routines in
++ * the library.  This type was declared, but not defined, in
++ * pkcs11t.h.
++ * ==============================================================
++ */
++
++#define CK_PKCS11_FUNCTION_INFO(name) \
++  __PASTE(CK_,name) name;
++
++struct CK_FUNCTION_LIST {
++
++  CK_VERSION    version;  /* Cryptoki version */
++
++/* Pile all the function pointers into the CK_FUNCTION_LIST. */
++/* pkcs11f.h has all the information about the Cryptoki
++ * function prototypes. */
++#include "rsaref/pkcs11f.h"
++
++};
++
++#undef CK_PKCS11_FUNCTION_INFO
++
++
++#undef __PASTE
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
+diff -udrNP putty-0.58.orig/rsaref/pkcs11f.h putty-0.58/rsaref/pkcs11f.h
+--- putty-0.58.orig/rsaref/pkcs11f.h    1970-01-01 01:00:00.000000000 +0100
++++ putty-0.58/rsaref/pkcs11f.h 2005-06-06 11:50:58.483734752 +0200
+@@ -0,0 +1,898 @@
++/* pkcs11f.h include file for PKCS #11.  2001 June 25 */
++
++/* This function contains pretty much everything about all the */
++/* Cryptoki function prototypes.  Because this information is */
++/* used for more than just declaring function prototypes, the */
++/* order of the functions appearing herein is important, and */
++/* should not be altered. */
++
++
++
++/* General-purpose */
++
++/* C_Initialize initializes the Cryptoki library. */
++CK_PKCS11_FUNCTION_INFO(C_Initialize)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_VOID_PTR   pInitArgs  /* if this is not NULL_PTR, it gets
++                            * cast to CK_C_INITIALIZE_ARGS_PTR
++                            * and dereferenced */
++);
++#endif
++
++
++/* C_Finalize indicates that an application is done with the
++ * Cryptoki library. */
++CK_PKCS11_FUNCTION_INFO(C_Finalize)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_VOID_PTR   pReserved  /* reserved.  Should be NULL_PTR */
++);
++#endif
++
++
++/* C_GetInfo returns general information about Cryptoki. */
++CK_PKCS11_FUNCTION_INFO(C_GetInfo)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_INFO_PTR   pInfo  /* location that receives information */
++);
++#endif
++
++
++/* C_GetFunctionList returns the function list. */
++CK_PKCS11_FUNCTION_INFO(C_GetFunctionList)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_FUNCTION_LIST_PTR_PTR ppFunctionList  /* receives pointer to
++                                            * function list */
++);
++#endif
++
++
++
++/* Slot and token management */
++
++/* C_GetSlotList obtains a list of slots in the system. */
++CK_PKCS11_FUNCTION_INFO(C_GetSlotList)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_BBOOL       tokenPresent,  /* only slots with tokens? */
++  CK_SLOT_ID_PTR pSlotList,     /* receives array of slot IDs */
++  CK_ULONG_PTR   pulCount       /* receives number of slots */
++);
++#endif
++
++
++/* C_GetSlotInfo obtains information about a particular slot in
++ * the system. */
++CK_PKCS11_FUNCTION_INFO(C_GetSlotInfo)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SLOT_ID       slotID,  /* the ID of the slot */
++  CK_SLOT_INFO_PTR pInfo    /* receives the slot information */
++);
++#endif
++
++
++/* C_GetTokenInfo obtains information about a particular token
++ * in the system. */
++CK_PKCS11_FUNCTION_INFO(C_GetTokenInfo)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SLOT_ID        slotID,  /* ID of the token's slot */
++  CK_TOKEN_INFO_PTR pInfo    /* receives the token information */
++);
++#endif
++
++
++/* C_GetMechanismList obtains a list of mechanism types
++ * supported by a token. */
++CK_PKCS11_FUNCTION_INFO(C_GetMechanismList)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SLOT_ID            slotID,          /* ID of token's slot */
++  CK_MECHANISM_TYPE_PTR pMechanismList,  /* gets mech. array */
++  CK_ULONG_PTR          pulCount         /* gets # of mechs. */
++);
++#endif
++
++
++/* C_GetMechanismInfo obtains information about a particular
++ * mechanism possibly supported by a token. */
++CK_PKCS11_FUNCTION_INFO(C_GetMechanismInfo)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SLOT_ID            slotID,  /* ID of the token's slot */
++  CK_MECHANISM_TYPE     type,    /* type of mechanism */
++  CK_MECHANISM_INFO_PTR pInfo    /* receives mechanism info */
++);
++#endif
++
++
++/* C_InitToken initializes a token. */
++CK_PKCS11_FUNCTION_INFO(C_InitToken)
++#ifdef CK_NEED_ARG_LIST
++/* pLabel changed from CK_CHAR_PTR to CK_UTF8CHAR_PTR for v2.10 */
++(
++  CK_SLOT_ID      slotID,    /* ID of the token's slot */
++  CK_UTF8CHAR_PTR pPin,      /* the SO's initial PIN */
++  CK_ULONG        ulPinLen,  /* length in bytes of the PIN */
++  CK_UTF8CHAR_PTR pLabel     /* 32-byte token label (blank padded) */
++);
++#endif
++
++
++/* C_InitPIN initializes the normal user's PIN. */
++CK_PKCS11_FUNCTION_INFO(C_InitPIN)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,  /* the session's handle */
++  CK_UTF8CHAR_PTR   pPin,      /* the normal user's PIN */
++  CK_ULONG          ulPinLen   /* length in bytes of the PIN */
++);
++#endif
++
++
++/* C_SetPIN modifies the PIN of the user who is logged in. */
++CK_PKCS11_FUNCTION_INFO(C_SetPIN)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,  /* the session's handle */
++  CK_UTF8CHAR_PTR   pOldPin,   /* the old PIN */
++  CK_ULONG          ulOldLen,  /* length of the old PIN */
++  CK_UTF8CHAR_PTR   pNewPin,   /* the new PIN */
++  CK_ULONG          ulNewLen   /* length of the new PIN */
++);
++#endif
++
++
++
++/* Session management */
++
++/* C_OpenSession opens a session between an application and a
++ * token. */
++CK_PKCS11_FUNCTION_INFO(C_OpenSession)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SLOT_ID            slotID,        /* the slot's ID */
++  CK_FLAGS              flags,         /* from CK_SESSION_INFO */
++  CK_VOID_PTR           pApplication,  /* passed to callback */
++  CK_NOTIFY             Notify,        /* callback function */
++  CK_SESSION_HANDLE_PTR phSession      /* gets session handle */
++);
++#endif
++
++
++/* C_CloseSession closes a session between an application and a
++ * token. */
++CK_PKCS11_FUNCTION_INFO(C_CloseSession)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession  /* the session's handle */
++);
++#endif
++
++
++/* C_CloseAllSessions closes all sessions with a token. */
++CK_PKCS11_FUNCTION_INFO(C_CloseAllSessions)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SLOT_ID     slotID  /* the token's slot */
++);
++#endif
++
++
++/* C_GetSessionInfo obtains information about the session. */
++CK_PKCS11_FUNCTION_INFO(C_GetSessionInfo)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE   hSession,  /* the session's handle */
++  CK_SESSION_INFO_PTR pInfo      /* receives session info */
++);
++#endif
++
++
++/* C_GetOperationState obtains the state of the cryptographic operation
++ * in a session. */
++CK_PKCS11_FUNCTION_INFO(C_GetOperationState)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,             /* session's handle */
++  CK_BYTE_PTR       pOperationState,      /* gets state */
++  CK_ULONG_PTR      pulOperationStateLen  /* gets state length */
++);
++#endif
++
++
++/* C_SetOperationState restores the state of the cryptographic
++ * operation in a session. */
++CK_PKCS11_FUNCTION_INFO(C_SetOperationState)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,            /* session's handle */
++  CK_BYTE_PTR      pOperationState,      /* holds state */
++  CK_ULONG         ulOperationStateLen,  /* holds state length */
++  CK_OBJECT_HANDLE hEncryptionKey,       /* en/decryption key */
++  CK_OBJECT_HANDLE hAuthenticationKey    /* sign/verify key */
++);
++#endif
++
++
++/* C_Login logs a user into a token. */
++CK_PKCS11_FUNCTION_INFO(C_Login)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,  /* the session's handle */
++  CK_USER_TYPE      userType,  /* the user type */
++  CK_UTF8CHAR_PTR   pPin,      /* the user's PIN */
++  CK_ULONG          ulPinLen   /* the length of the PIN */
++);
++#endif
++
++
++/* C_Logout logs a user out from a token. */
++CK_PKCS11_FUNCTION_INFO(C_Logout)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession  /* the session's handle */
++);
++#endif
++
++
++
++/* Object management */
++
++/* C_CreateObject creates a new object. */
++CK_PKCS11_FUNCTION_INFO(C_CreateObject)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,    /* the session's handle */
++  CK_ATTRIBUTE_PTR  pTemplate,   /* the object's template */
++  CK_ULONG          ulCount,     /* attributes in template */
++  CK_OBJECT_HANDLE_PTR phObject  /* gets new object's handle. */
++);
++#endif
++
++
++/* C_CopyObject copies an object, creating a new object for the
++ * copy. */
++CK_PKCS11_FUNCTION_INFO(C_CopyObject)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE    hSession,    /* the session's handle */
++  CK_OBJECT_HANDLE     hObject,     /* the object's handle */
++  CK_ATTRIBUTE_PTR     pTemplate,   /* template for new object */
++  CK_ULONG             ulCount,     /* attributes in template */
++  CK_OBJECT_HANDLE_PTR phNewObject  /* receives handle of copy */
++);
++#endif
++
++
++/* C_DestroyObject destroys an object. */
++CK_PKCS11_FUNCTION_INFO(C_DestroyObject)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,  /* the session's handle */
++  CK_OBJECT_HANDLE  hObject    /* the object's handle */
++);
++#endif
++
++
++/* C_GetObjectSize gets the size of an object in bytes. */
++CK_PKCS11_FUNCTION_INFO(C_GetObjectSize)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,  /* the session's handle */
++  CK_OBJECT_HANDLE  hObject,   /* the object's handle */
++  CK_ULONG_PTR      pulSize    /* receives size of object */
++);
++#endif
++
++
++/* C_GetAttributeValue obtains the value of one or more object
++ * attributes. */
++CK_PKCS11_FUNCTION_INFO(C_GetAttributeValue)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,   /* the session's handle */
++  CK_OBJECT_HANDLE  hObject,    /* the object's handle */
++  CK_ATTRIBUTE_PTR  pTemplate,  /* specifies attrs; gets vals */
++  CK_ULONG          ulCount     /* attributes in template */
++);
++#endif
++
++
++/* C_SetAttributeValue modifies the value of one or more object
++ * attributes */
++CK_PKCS11_FUNCTION_INFO(C_SetAttributeValue)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,   /* the session's handle */
++  CK_OBJECT_HANDLE  hObject,    /* the object's handle */
++  CK_ATTRIBUTE_PTR  pTemplate,  /* specifies attrs and values */
++  CK_ULONG          ulCount     /* attributes in template */
++);
++#endif
++
++
++/* C_FindObjectsInit initializes a search for token and session
++ * objects that match a template. */
++CK_PKCS11_FUNCTION_INFO(C_FindObjectsInit)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,   /* the session's handle */
++  CK_ATTRIBUTE_PTR  pTemplate,  /* attribute values to match */
++  CK_ULONG          ulCount     /* attrs in search template */
++);
++#endif
++
++
++/* C_FindObjects continues a search for token and session
++ * objects that match a template, obtaining additional object
++ * handles. */
++CK_PKCS11_FUNCTION_INFO(C_FindObjects)
++#ifdef CK_NEED_ARG_LIST
++(
++ CK_SESSION_HANDLE    hSession,          /* session's handle */
++ CK_OBJECT_HANDLE_PTR phObject,          /* gets obj. handles */
++ CK_ULONG             ulMaxObjectCount,  /* max handles to get */
++ CK_ULONG_PTR         pulObjectCount     /* actual # returned */
++);
++#endif
++
++
++/* C_FindObjectsFinal finishes a search for token and session
++ * objects. */
++CK_PKCS11_FUNCTION_INFO(C_FindObjectsFinal)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession  /* the session's handle */
++);
++#endif
++
++
++
++/* Encryption and decryption */
++
++/* C_EncryptInit initializes an encryption operation. */
++CK_PKCS11_FUNCTION_INFO(C_EncryptInit)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,    /* the session's handle */
++  CK_MECHANISM_PTR  pMechanism,  /* the encryption mechanism */
++  CK_OBJECT_HANDLE  hKey         /* handle of encryption key */
++);
++#endif
++
++
++/* C_Encrypt encrypts single-part data. */
++CK_PKCS11_FUNCTION_INFO(C_Encrypt)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,            /* session's handle */
++  CK_BYTE_PTR       pData,               /* the plaintext data */
++  CK_ULONG          ulDataLen,           /* bytes of plaintext */
++  CK_BYTE_PTR       pEncryptedData,      /* gets ciphertext */
++  CK_ULONG_PTR      pulEncryptedDataLen  /* gets c-text size */
++);
++#endif
++
++
++/* C_EncryptUpdate continues a multiple-part encryption
++ * operation. */
++CK_PKCS11_FUNCTION_INFO(C_EncryptUpdate)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,           /* session's handle */
++  CK_BYTE_PTR       pPart,              /* the plaintext data */
++  CK_ULONG          ulPartLen,          /* plaintext data len */
++  CK_BYTE_PTR       pEncryptedPart,     /* gets ciphertext */
++  CK_ULONG_PTR      pulEncryptedPartLen /* gets c-text size */
++);
++#endif
++
++
++/* C_EncryptFinal finishes a multiple-part encryption
++ * operation. */
++CK_PKCS11_FUNCTION_INFO(C_EncryptFinal)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,                /* session handle */
++  CK_BYTE_PTR       pLastEncryptedPart,      /* last c-text */
++  CK_ULONG_PTR      pulLastEncryptedPartLen  /* gets last size */
++);
++#endif
++
++
++/* C_DecryptInit initializes a decryption operation. */
++CK_PKCS11_FUNCTION_INFO(C_DecryptInit)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,    /* the session's handle */
++  CK_MECHANISM_PTR  pMechanism,  /* the decryption mechanism */
++  CK_OBJECT_HANDLE  hKey         /* handle of decryption key */
++);
++#endif
++
++
++/* C_Decrypt decrypts encrypted data in a single part. */
++CK_PKCS11_FUNCTION_INFO(C_Decrypt)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,           /* session's handle */
++  CK_BYTE_PTR       pEncryptedData,     /* ciphertext */
++  CK_ULONG          ulEncryptedDataLen, /* ciphertext length */
++  CK_BYTE_PTR       pData,              /* gets plaintext */
++  CK_ULONG_PTR      pulDataLen          /* gets p-text size */
++);
++#endif
++
++
++/* C_DecryptUpdate continues a multiple-part decryption
++ * operation. */
++CK_PKCS11_FUNCTION_INFO(C_DecryptUpdate)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,            /* session's handle */
++  CK_BYTE_PTR       pEncryptedPart,      /* encrypted data */
++  CK_ULONG          ulEncryptedPartLen,  /* input length */
++  CK_BYTE_PTR       pPart,               /* gets plaintext */
++  CK_ULONG_PTR      pulPartLen           /* p-text size */
++);
++#endif
++
++
++/* C_DecryptFinal finishes a multiple-part decryption
++ * operation. */
++CK_PKCS11_FUNCTION_INFO(C_DecryptFinal)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,       /* the session's handle */
++  CK_BYTE_PTR       pLastPart,      /* gets plaintext */
++  CK_ULONG_PTR      pulLastPartLen  /* p-text size */
++);
++#endif
++
++
++
++/* Message digesting */
++
++/* C_DigestInit initializes a message-digesting operation. */
++CK_PKCS11_FUNCTION_INFO(C_DigestInit)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,   /* the session's handle */
++  CK_MECHANISM_PTR  pMechanism  /* the digesting mechanism */
++);
++#endif
++
++
++/* C_Digest digests data in a single part. */
++CK_PKCS11_FUNCTION_INFO(C_Digest)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,     /* the session's handle */
++  CK_BYTE_PTR       pData,        /* data to be digested */
++  CK_ULONG          ulDataLen,    /* bytes of data to digest */
++  CK_BYTE_PTR       pDigest,      /* gets the message digest */
++  CK_ULONG_PTR      pulDigestLen  /* gets digest length */
++);
++#endif
++
++
++/* C_DigestUpdate continues a multiple-part message-digesting
++ * operation. */
++CK_PKCS11_FUNCTION_INFO(C_DigestUpdate)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,  /* the session's handle */
++  CK_BYTE_PTR       pPart,     /* data to be digested */
++  CK_ULONG          ulPartLen  /* bytes of data to be digested */
++);
++#endif
++
++
++/* C_DigestKey continues a multi-part message-digesting
++ * operation, by digesting the value of a secret key as part of
++ * the data already digested. */
++CK_PKCS11_FUNCTION_INFO(C_DigestKey)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,  /* the session's handle */
++  CK_OBJECT_HANDLE  hKey       /* secret key to digest */
++);
++#endif
++
++
++/* C_DigestFinal finishes a multiple-part message-digesting
++ * operation. */
++CK_PKCS11_FUNCTION_INFO(C_DigestFinal)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,     /* the session's handle */
++  CK_BYTE_PTR       pDigest,      /* gets the message digest */
++  CK_ULONG_PTR      pulDigestLen  /* gets byte count of digest */
++);
++#endif
++
++
++
++/* Signing and MACing */
++
++/* C_SignInit initializes a signature (private key encryption)
++ * operation, where the signature is (will be) an appendix to
++ * the data, and plaintext cannot be recovered from the
++ *signature. */
++CK_PKCS11_FUNCTION_INFO(C_SignInit)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,    /* the session's handle */
++  CK_MECHANISM_PTR  pMechanism,  /* the signature mechanism */
++  CK_OBJECT_HANDLE  hKey         /* handle of signature key */
++);
++#endif
++
++
++/* C_Sign signs (encrypts with private key) data in a single
++ * part, where the signature is (will be) an appendix to the
++ * data, and plaintext cannot be recovered from the signature. */
++CK_PKCS11_FUNCTION_INFO(C_Sign)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,        /* the session's handle */
++  CK_BYTE_PTR       pData,           /* the data to sign */
++  CK_ULONG          ulDataLen,       /* count of bytes to sign */
++  CK_BYTE_PTR       pSignature,      /* gets the signature */
++  CK_ULONG_PTR      pulSignatureLen  /* gets signature length */
++);
++#endif
++
++
++/* C_SignUpdate continues a multiple-part signature operation,
++ * where the signature is (will be) an appendix to the data,
++ * and plaintext cannot be recovered from the signature. */
++CK_PKCS11_FUNCTION_INFO(C_SignUpdate)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,  /* the session's handle */
++  CK_BYTE_PTR       pPart,     /* the data to sign */
++  CK_ULONG          ulPartLen  /* count of bytes to sign */
++);
++#endif
++
++
++/* C_SignFinal finishes a multiple-part signature operation,
++ * returning the signature. */
++CK_PKCS11_FUNCTION_INFO(C_SignFinal)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,        /* the session's handle */
++  CK_BYTE_PTR       pSignature,      /* gets the signature */
++  CK_ULONG_PTR      pulSignatureLen  /* gets signature length */
++);
++#endif
++
++
++/* C_SignRecoverInit initializes a signature operation, where
++ * the data can be recovered from the signature. */
++CK_PKCS11_FUNCTION_INFO(C_SignRecoverInit)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,   /* the session's handle */
++  CK_MECHANISM_PTR  pMechanism, /* the signature mechanism */
++  CK_OBJECT_HANDLE  hKey        /* handle of the signature key */
++);
++#endif
++
++
++/* C_SignRecover signs data in a single operation, where the
++ * data can be recovered from the signature. */
++CK_PKCS11_FUNCTION_INFO(C_SignRecover)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,        /* the session's handle */
++  CK_BYTE_PTR       pData,           /* the data to sign */
++  CK_ULONG          ulDataLen,       /* count of bytes to sign */
++  CK_BYTE_PTR       pSignature,      /* gets the signature */
++  CK_ULONG_PTR      pulSignatureLen  /* gets signature length */
++);
++#endif
++
++
++
++/* Verifying signatures and MACs */
++
++/* C_VerifyInit initializes a verification operation, where the
++ * signature is an appendix to the data, and plaintext cannot
++ *  cannot be recovered from the signature (e.g. DSA). */
++CK_PKCS11_FUNCTION_INFO(C_VerifyInit)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,    /* the session's handle */
++  CK_MECHANISM_PTR  pMechanism,  /* the verification mechanism */
++  CK_OBJECT_HANDLE  hKey         /* verification key */
++);
++#endif
++
++
++/* C_Verify verifies a signature in a single-part operation,
++ * where the signature is an appendix to the data, and plaintext
++ * cannot be recovered from the signature. */
++CK_PKCS11_FUNCTION_INFO(C_Verify)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,       /* the session's handle */
++  CK_BYTE_PTR       pData,          /* signed data */
++  CK_ULONG          ulDataLen,      /* length of signed data */
++  CK_BYTE_PTR       pSignature,     /* signature */
++  CK_ULONG          ulSignatureLen  /* signature length*/
++);
++#endif
++
++
++/* C_VerifyUpdate continues a multiple-part verification
++ * operation, where the signature is an appendix to the data,
++ * and plaintext cannot be recovered from the signature. */
++CK_PKCS11_FUNCTION_INFO(C_VerifyUpdate)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,  /* the session's handle */
++  CK_BYTE_PTR       pPart,     /* signed data */
++  CK_ULONG          ulPartLen  /* length of signed data */
++);
++#endif
++
++
++/* C_VerifyFinal finishes a multiple-part verification
++ * operation, checking the signature. */
++CK_PKCS11_FUNCTION_INFO(C_VerifyFinal)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,       /* the session's handle */
++  CK_BYTE_PTR       pSignature,     /* signature to verify */
++  CK_ULONG          ulSignatureLen  /* signature length */
++);
++#endif
++
++
++/* C_VerifyRecoverInit initializes a signature verification
++ * operation, where the data is recovered from the signature. */
++CK_PKCS11_FUNCTION_INFO(C_VerifyRecoverInit)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,    /* the session's handle */
++  CK_MECHANISM_PTR  pMechanism,  /* the verification mechanism */
++  CK_OBJECT_HANDLE  hKey         /* verification key */
++);
++#endif
++
++
++/* C_VerifyRecover verifies a signature in a single-part
++ * operation, where the data is recovered from the signature. */
++CK_PKCS11_FUNCTION_INFO(C_VerifyRecover)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,        /* the session's handle */
++  CK_BYTE_PTR       pSignature,      /* signature to verify */
++  CK_ULONG          ulSignatureLen,  /* signature length */
++  CK_BYTE_PTR       pData,           /* gets signed data */
++  CK_ULONG_PTR      pulDataLen       /* gets signed data len */
++);
++#endif
++
++
++
++/* Dual-function cryptographic operations */
++
++/* C_DigestEncryptUpdate continues a multiple-part digesting
++ * and encryption operation. */
++CK_PKCS11_FUNCTION_INFO(C_DigestEncryptUpdate)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,            /* session's handle */
++  CK_BYTE_PTR       pPart,               /* the plaintext data */
++  CK_ULONG          ulPartLen,           /* plaintext length */
++  CK_BYTE_PTR       pEncryptedPart,      /* gets ciphertext */
++  CK_ULONG_PTR      pulEncryptedPartLen  /* gets c-text length */
++);
++#endif
++
++
++/* C_DecryptDigestUpdate continues a multiple-part decryption and
++ * digesting operation. */
++CK_PKCS11_FUNCTION_INFO(C_DecryptDigestUpdate)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,            /* session's handle */
++  CK_BYTE_PTR       pEncryptedPart,      /* ciphertext */
++  CK_ULONG          ulEncryptedPartLen,  /* ciphertext length */
++  CK_BYTE_PTR       pPart,               /* gets plaintext */
++  CK_ULONG_PTR      pulPartLen           /* gets plaintext len */
++);
++#endif
++
++
++/* C_SignEncryptUpdate continues a multiple-part signing and
++ * encryption operation. */
++CK_PKCS11_FUNCTION_INFO(C_SignEncryptUpdate)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,            /* session's handle */
++  CK_BYTE_PTR       pPart,               /* the plaintext data */
++  CK_ULONG          ulPartLen,           /* plaintext length */
++  CK_BYTE_PTR       pEncryptedPart,      /* gets ciphertext */
++  CK_ULONG_PTR      pulEncryptedPartLen  /* gets c-text length */
++);
++#endif
++
++
++/* C_DecryptVerifyUpdate continues a multiple-part decryption and
++ * verify operation. */
++CK_PKCS11_FUNCTION_INFO(C_DecryptVerifyUpdate)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,            /* session's handle */
++  CK_BYTE_PTR       pEncryptedPart,      /* ciphertext */
++  CK_ULONG          ulEncryptedPartLen,  /* ciphertext length */
++  CK_BYTE_PTR       pPart,               /* gets plaintext */
++  CK_ULONG_PTR      pulPartLen           /* gets p-text length */
++);
++#endif
++
++
++
++/* Key management */
++
++/* C_GenerateKey generates a secret key, creating a new key
++ * object. */
++CK_PKCS11_FUNCTION_INFO(C_GenerateKey)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE    hSession,    /* the session's handle */
++  CK_MECHANISM_PTR     pMechanism,  /* key generation mech. */
++  CK_ATTRIBUTE_PTR     pTemplate,   /* template for new key */
++  CK_ULONG             ulCount,     /* # of attrs in template */
++  CK_OBJECT_HANDLE_PTR phKey        /* gets handle of new key */
++);
++#endif
++
++
++/* C_GenerateKeyPair generates a public-key/private-key pair,
++ * creating new key objects. */
++CK_PKCS11_FUNCTION_INFO(C_GenerateKeyPair)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE    hSession,                    /* session
++                                                     * handle */
++  CK_MECHANISM_PTR     pMechanism,                  /* key-gen
++                                                     * mech. */
++  CK_ATTRIBUTE_PTR     pPublicKeyTemplate,          /* template
++                                                     * for pub.
++                                                     * key */
++  CK_ULONG             ulPublicKeyAttributeCount,   /* # pub.
++                                                     * attrs. */
++  CK_ATTRIBUTE_PTR     pPrivateKeyTemplate,         /* template
++                                                     * for priv.
++                                                     * key */
++  CK_ULONG             ulPrivateKeyAttributeCount,  /* # priv.
++                                                     * attrs. */
++  CK_OBJECT_HANDLE_PTR phPublicKey,                 /* gets pub.
++                                                     * key
++                                                     * handle */
++  CK_OBJECT_HANDLE_PTR phPrivateKey                 /* gets
++                                                     * priv. key
++                                                     * handle */
++);
++#endif
++
++
++/* C_WrapKey wraps (i.e., encrypts) a key. */
++CK_PKCS11_FUNCTION_INFO(C_WrapKey)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,        /* the session's handle */
++  CK_MECHANISM_PTR  pMechanism,      /* the wrapping mechanism */
++  CK_OBJECT_HANDLE  hWrappingKey,    /* wrapping key */
++  CK_OBJECT_HANDLE  hKey,            /* key to be wrapped */
++  CK_BYTE_PTR       pWrappedKey,     /* gets wrapped key */
++  CK_ULONG_PTR      pulWrappedKeyLen /* gets wrapped key size */
++);
++#endif
++
++
++/* C_UnwrapKey unwraps (decrypts) a wrapped key, creating a new
++ * key object. */
++CK_PKCS11_FUNCTION_INFO(C_UnwrapKey)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE    hSession,          /* session's handle */
++  CK_MECHANISM_PTR     pMechanism,        /* unwrapping mech. */
++  CK_OBJECT_HANDLE     hUnwrappingKey,    /* unwrapping key */
++  CK_BYTE_PTR          pWrappedKey,       /* the wrapped key */
++  CK_ULONG             ulWrappedKeyLen,   /* wrapped key len */
++  CK_ATTRIBUTE_PTR     pTemplate,         /* new key template */
++  CK_ULONG             ulAttributeCount,  /* template length */
++  CK_OBJECT_HANDLE_PTR phKey              /* gets new handle */
++);
++#endif
++
++
++/* C_DeriveKey derives a key from a base key, creating a new key
++ * object. */
++CK_PKCS11_FUNCTION_INFO(C_DeriveKey)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE    hSession,          /* session's handle */
++  CK_MECHANISM_PTR     pMechanism,        /* key deriv. mech. */
++  CK_OBJECT_HANDLE     hBaseKey,          /* base key */
++  CK_ATTRIBUTE_PTR     pTemplate,         /* new key template */
++  CK_ULONG             ulAttributeCount,  /* template length */
++  CK_OBJECT_HANDLE_PTR phKey              /* gets new handle */
++);
++#endif
++
++
++
++/* Random number generation */
++
++/* C_SeedRandom mixes additional seed material into the token's
++ * random number generator. */
++CK_PKCS11_FUNCTION_INFO(C_SeedRandom)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,  /* the session's handle */
++  CK_BYTE_PTR       pSeed,     /* the seed material */
++  CK_ULONG          ulSeedLen  /* length of seed material */
++);
++#endif
++
++
++/* C_GenerateRandom generates random data. */
++CK_PKCS11_FUNCTION_INFO(C_GenerateRandom)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession,    /* the session's handle */
++  CK_BYTE_PTR       RandomData,  /* receives the random data */
++  CK_ULONG          ulRandomLen  /* # of bytes to generate */
++);
++#endif
++
++
++
++/* Parallel function management */
++
++/* C_GetFunctionStatus is a legacy function; it obtains an
++ * updated status of a function running in parallel with an
++ * application. */
++CK_PKCS11_FUNCTION_INFO(C_GetFunctionStatus)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession  /* the session's handle */
++);
++#endif
++
++
++/* C_CancelFunction is a legacy function; it cancels a function
++ * running in parallel. */
++CK_PKCS11_FUNCTION_INFO(C_CancelFunction)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_SESSION_HANDLE hSession  /* the session's handle */
++);
++#endif
++
++
++
++/* Functions added in for Cryptoki Version 2.01 or later */
++
++/* C_WaitForSlotEvent waits for a slot event (token insertion,
++ * removal, etc.) to occur. */
++CK_PKCS11_FUNCTION_INFO(C_WaitForSlotEvent)
++#ifdef CK_NEED_ARG_LIST
++(
++  CK_FLAGS flags,        /* blocking/nonblocking flag */
++  CK_SLOT_ID_PTR pSlot,  /* location that receives the slot ID */
++  CK_VOID_PTR pRserved   /* reserved.  Should be NULL_PTR */
++);
++#endif
+diff -udrNP putty-0.58.orig/rsaref/pkcs11t.h putty-0.58/rsaref/pkcs11t.h
+--- putty-0.58.orig/rsaref/pkcs11t.h    1970-01-01 01:00:00.000000000 +0100
++++ putty-0.58/rsaref/pkcs11t.h 2005-06-06 11:50:58.486734296 +0200
+@@ -0,0 +1,1334 @@
++/* pkcs11t.h include file for PKCS #11.  2001 June 25 */
++
++/* See top of pkcs11.h for information about the macros that
++ * must be defined and the structure-packing conventions that
++ * must be set before including this file. */
++
++#ifndef _PKCS11T_H_
++#define _PKCS11T_H_ 1
++
++#ifndef FALSE
++#define FALSE             0
++#endif
++
++#ifndef TRUE
++#define TRUE              (!FALSE)
++#endif
++
++
++/* an unsigned 8-bit value */
++typedef unsigned char     CK_BYTE;
++
++/* an unsigned 8-bit character */
++typedef CK_BYTE           CK_CHAR;
++
++/* an 8-bit UTF-8 character */
++typedef CK_BYTE           CK_UTF8CHAR;
++
++/* a BYTE-sized Boolean flag */
++typedef CK_BYTE           CK_BBOOL;
++
++/* an unsigned value, at least 32 bits long */
++typedef unsigned long int CK_ULONG;
++
++/* a signed value, the same size as a CK_ULONG */
++/* CK_LONG is new for v2.0 */
++typedef long int          CK_LONG;
++
++/* at least 32 bits; each bit is a Boolean flag */
++typedef CK_ULONG          CK_FLAGS;
++
++
++/* some special values for certain CK_ULONG variables */
++#define CK_UNAVAILABLE_INFORMATION (~0UL)
++#define CK_EFFECTIVELY_INFINITE    0
++
++
++typedef CK_BYTE     CK_PTR   CK_BYTE_PTR;
++typedef CK_CHAR     CK_PTR   CK_CHAR_PTR;
++typedef CK_UTF8CHAR CK_PTR   CK_UTF8CHAR_PTR;
++typedef CK_ULONG    CK_PTR   CK_ULONG_PTR;
++typedef void        CK_PTR   CK_VOID_PTR;
++
++/* Pointer to a CK_VOID_PTR-- i.e., pointer to pointer to void */
++typedef CK_VOID_PTR CK_PTR CK_VOID_PTR_PTR;
++
++
++/* The following value is always invalid if used as a session */
++/* handle or object handle */
++#define CK_INVALID_HANDLE 0
++
++
++typedef struct CK_VERSION {
++  CK_BYTE       major;  /* integer portion of version number */
++  CK_BYTE       minor;  /* 1/100ths portion of version number */
++} CK_VERSION;
++
++typedef CK_VERSION CK_PTR CK_VERSION_PTR;
++
++
++typedef struct CK_INFO {
++  /* manufacturerID and libraryDecription have been changed from
++   * CK_CHAR to CK_UTF8CHAR for v2.10 */
++  CK_VERSION    cryptokiVersion;     /* Cryptoki interface ver */
++  CK_UTF8CHAR   manufacturerID[32];  /* blank padded */
++  CK_FLAGS      flags;               /* must be zero */
++
++  /* libraryDescription and libraryVersion are new for v2.0 */
++  CK_UTF8CHAR   libraryDescription[32];  /* blank padded */
++  CK_VERSION    libraryVersion;          /* version of library */
++} CK_INFO;
++
++typedef CK_INFO CK_PTR    CK_INFO_PTR;
++
++
++/* CK_NOTIFICATION enumerates the types of notifications that
++ * Cryptoki provides to an application */
++/* CK_NOTIFICATION has been changed from an enum to a CK_ULONG
++ * for v2.0 */
++typedef CK_ULONG CK_NOTIFICATION;
++#define CKN_SURRENDER       0
++
++
++typedef CK_ULONG          CK_SLOT_ID;
++
++typedef CK_SLOT_ID CK_PTR CK_SLOT_ID_PTR;
++
++
++/* CK_SLOT_INFO provides information about a slot */
++typedef struct CK_SLOT_INFO {
++  /* slotDescription and manufacturerID have been changed from
++   * CK_CHAR to CK_UTF8CHAR for v2.10 */
++  CK_UTF8CHAR   slotDescription[64];  /* blank padded */
++  CK_UTF8CHAR   manufacturerID[32];   /* blank padded */
++  CK_FLAGS      flags;
++
++  /* hardwareVersion and firmwareVersion are new for v2.0 */
++  CK_VERSION    hardwareVersion;  /* version of hardware */
++  CK_VERSION    firmwareVersion;  /* version of firmware */
++} CK_SLOT_INFO;
++
++/* flags: bit flags that provide capabilities of the slot
++ *      Bit Flag              Mask        Meaning
++ */
++#define CKF_TOKEN_PRESENT     0x00000001  /* a token is there */
++#define CKF_REMOVABLE_DEVICE  0x00000002  /* removable devices*/
++#define CKF_HW_SLOT           0x00000004  /* hardware slot */
++
++typedef CK_SLOT_INFO CK_PTR CK_SLOT_INFO_PTR;
++
++
++/* CK_TOKEN_INFO provides information about a token */
++typedef struct CK_TOKEN_INFO {
++  /* label, manufacturerID, and model have been changed from
++   * CK_CHAR to CK_UTF8CHAR for v2.10 */
++  CK_UTF8CHAR   label[32];           /* blank padded */
++  CK_UTF8CHAR   manufacturerID[32];  /* blank padded */
++  CK_UTF8CHAR   model[16];           /* blank padded */
++  CK_CHAR       serialNumber[16];    /* blank padded */
++  CK_FLAGS      flags;               /* see below */
++
++  /* ulMaxSessionCount, ulSessionCount, ulMaxRwSessionCount,
++   * ulRwSessionCount, ulMaxPinLen, and ulMinPinLen have all been
++   * changed from CK_USHORT to CK_ULONG for v2.0 */
++  CK_ULONG      ulMaxSessionCount;     /* max open sessions */
++  CK_ULONG      ulSessionCount;        /* sess. now open */
++  CK_ULONG      ulMaxRwSessionCount;   /* max R/W sessions */
++  CK_ULONG      ulRwSessionCount;      /* R/W sess. now open */
++  CK_ULONG      ulMaxPinLen;           /* in bytes */
++  CK_ULONG      ulMinPinLen;           /* in bytes */
++  CK_ULONG      ulTotalPublicMemory;   /* in bytes */
++  CK_ULONG      ulFreePublicMemory;    /* in bytes */
++  CK_ULONG      ulTotalPrivateMemory;  /* in bytes */
++  CK_ULONG      ulFreePrivateMemory;   /* in bytes */
++
++  /* hardwareVersion, firmwareVersion, and time are new for
++   * v2.0 */
++  CK_VERSION    hardwareVersion;       /* version of hardware */
++  CK_VERSION    firmwareVersion;       /* version of firmware */
++  CK_CHAR       utcTime[16];           /* time */
++} CK_TOKEN_INFO;
++
++/* The flags parameter is defined as follows:
++ *      Bit Flag                    Mask        Meaning
++ */
++#define CKF_RNG                     0x00000001  /* has random #
++                                                 * generator */
++#define CKF_WRITE_PROTECTED         0x00000002  /* token is
++                                                 * write-
++                                                 * protected */
++#define CKF_LOGIN_REQUIRED          0x00000004  /* user must
++                                                 * login */
++#define CKF_USER_PIN_INITIALIZED    0x00000008  /* normal user's
++                                                 * PIN is set */
++
++/* CKF_RESTORE_KEY_NOT_NEEDED is new for v2.0.  If it is set,
++ * that means that *every* time the state of cryptographic
++ * operations of a session is successfully saved, all keys
++ * needed to continue those operations are stored in the state */
++#define CKF_RESTORE_KEY_NOT_NEEDED  0x00000020
++
++/* CKF_CLOCK_ON_TOKEN is new for v2.0.  If it is set, that means
++ * that the token has some sort of clock.  The time on that
++ * clock is returned in the token info structure */
++#define CKF_CLOCK_ON_TOKEN          0x00000040
++
++/* CKF_PROTECTED_AUTHENTICATION_PATH is new for v2.0.  If it is
++ * set, that means that there is some way for the user to login
++ * without sending a PIN through the Cryptoki library itself */
++#define CKF_PROTECTED_AUTHENTICATION_PATH 0x00000100
++
++/* CKF_DUAL_CRYPTO_OPERATIONS is new for v2.0.  If it is true,
++ * that means that a single session with the token can perform
++ * dual simultaneous cryptographic operations (digest and
++ * encrypt; decrypt and digest; sign and encrypt; and decrypt
++ * and sign) */
++#define CKF_DUAL_CRYPTO_OPERATIONS  0x00000200
++
++/* CKF_TOKEN_INITIALIZED if new for v2.10. If it is true, the
++ * token has been initialized using C_InitializeToken or an
++ * equivalent mechanism outside the scope of PKCS #11.
++ * Calling C_InitializeToken when this flag is set will cause
++ * the token to be reinitialized. */
++#define CKF_TOKEN_INITIALIZED       0x00000400
++
++/* CKF_SECONDARY_AUTHENTICATION if new for v2.10. If it is
++ * true, the token supports secondary authentication for
++ * private key objects. */
++#define CKF_SECONDARY_AUTHENTICATION  0x00000800
++
++/* CKF_USER_PIN_COUNT_LOW if new for v2.10. If it is true, an
++ * incorrect user login PIN has been entered at least once
++ * since the last successful authentication. */
++#define CKF_USER_PIN_COUNT_LOW       0x00010000
++
++/* CKF_USER_PIN_FINAL_TRY if new for v2.10. If it is true,
++ * supplying an incorrect user PIN will it to become locked. */
++#define CKF_USER_PIN_FINAL_TRY       0x00020000
++
++/* CKF_USER_PIN_LOCKED if new for v2.10. If it is true, the
++ * user PIN has been locked. User login to the token is not
++ * possible. */
++#define CKF_USER_PIN_LOCKED          0x00040000
++
++/* CKF_USER_PIN_TO_BE_CHANGED if new for v2.10. If it is true,
++ * the user PIN value is the default value set by token
++ * initialization or manufacturing, or the PIN has been
++ * expired by the card. */
++#define CKF_USER_PIN_TO_BE_CHANGED   0x00080000
++
++/* CKF_SO_PIN_COUNT_LOW if new for v2.10. If it is true, an
++ * incorrect SO login PIN has been entered at least once since
++ * the last successful authentication. */
++#define CKF_SO_PIN_COUNT_LOW         0x00100000
++
++/* CKF_SO_PIN_FINAL_TRY if new for v2.10. If it is true,
++ * supplying an incorrect SO PIN will it to become locked. */
++#define CKF_SO_PIN_FINAL_TRY         0x00200000
++
++/* CKF_SO_PIN_LOCKED if new for v2.10. If it is true, the SO
++ * PIN has been locked. SO login to the token is not possible.
++ */
++#define CKF_SO_PIN_LOCKED            0x00400000
++
++/* CKF_SO_PIN_TO_BE_CHANGED if new for v2.10. If it is true,
++ * the SO PIN value is the default value set by token
++ * initialization or manufacturing, or the PIN has been
++ * expired by the card. */
++#define CKF_SO_PIN_TO_BE_CHANGED     0x00800000
++
++typedef CK_TOKEN_INFO CK_PTR CK_TOKEN_INFO_PTR;
++
++
++/* CK_SESSION_HANDLE is a Cryptoki-assigned value that
++ * identifies a session */
++typedef CK_ULONG          CK_SESSION_HANDLE;
++
++typedef CK_SESSION_HANDLE CK_PTR CK_SESSION_HANDLE_PTR;
++
++
++/* CK_USER_TYPE enumerates the types of Cryptoki users */
++/* CK_USER_TYPE has been changed from an enum to a CK_ULONG for
++ * v2.0 */
++typedef CK_ULONG          CK_USER_TYPE;
++/* Security Officer */
++#define CKU_SO    0
++/* Normal user */
++#define CKU_USER  1
++
++
++/* CK_STATE enumerates the session states */
++/* CK_STATE has been changed from an enum to a CK_ULONG for
++ * v2.0 */
++typedef CK_ULONG          CK_STATE;
++#define CKS_RO_PUBLIC_SESSION  0
++#define CKS_RO_USER_FUNCTIONS  1
++#define CKS_RW_PUBLIC_SESSION  2
++#define CKS_RW_USER_FUNCTIONS  3
++#define CKS_RW_SO_FUNCTIONS    4
++
++
++/* CK_SESSION_INFO provides information about a session */
++typedef struct CK_SESSION_INFO {
++  CK_SLOT_ID    slotID;
++  CK_STATE      state;
++  CK_FLAGS      flags;          /* see below */
++
++  /* ulDeviceError was changed from CK_USHORT to CK_ULONG for
++   * v2.0 */
++  CK_ULONG      ulDeviceError;  /* device-dependent error code */
++} CK_SESSION_INFO;
++
++/* The flags are defined in the following table:
++ *      Bit Flag                Mask        Meaning
++ */
++#define CKF_RW_SESSION          0x00000002  /* session is r/w */
++#define CKF_SERIAL_SESSION      0x00000004  /* no parallel */
++
++typedef CK_SESSION_INFO CK_PTR CK_SESSION_INFO_PTR;
++
++
++/* CK_OBJECT_HANDLE is a token-specific identifier for an
++ * object  */
++typedef CK_ULONG          CK_OBJECT_HANDLE;
++
++typedef CK_OBJECT_HANDLE CK_PTR CK_OBJECT_HANDLE_PTR;
++
++
++/* CK_OBJECT_CLASS is a value that identifies the classes (or
++ * types) of objects that Cryptoki recognizes.  It is defined
++ * as follows: */
++/* CK_OBJECT_CLASS was changed from CK_USHORT to CK_ULONG for
++ * v2.0 */
++typedef CK_ULONG          CK_OBJECT_CLASS;
++
++/* The following classes of objects are defined: */
++/* CKO_HW_FEATURE is new for v2.10 */
++/* CKO_DOMAIN_PARAMETERS is new for v2.11 */
++#define CKO_DATA              0x00000000
++#define CKO_CERTIFICATE       0x00000001
++#define CKO_PUBLIC_KEY        0x00000002
++#define CKO_PRIVATE_KEY       0x00000003
++#define CKO_SECRET_KEY        0x00000004
++#define CKO_HW_FEATURE        0x00000005
++#define CKO_DOMAIN_PARAMETERS 0x00000006
++#define CKO_VENDOR_DEFINED    0x80000000
++
++typedef CK_OBJECT_CLASS CK_PTR CK_OBJECT_CLASS_PTR;
++
++/* CK_HW_FEATURE_TYPE is new for v2.10. CK_HW_FEATURE_TYPE is a
++ * value that identifies the hardware feature type of an object
++ * with CK_OBJECT_CLASS equal to CKO_HW_FEATURE. */
++typedef CK_ULONG          CK_HW_FEATURE_TYPE;
++
++/* The following hardware feature types are defined */
++#define CKH_MONOTONIC_COUNTER  0x00000001
++#define CKH_CLOCK           0x00000002
++#define CKH_VENDOR_DEFINED  0x80000000
++
++/* CK_KEY_TYPE is a value that identifies a key type */
++/* CK_KEY_TYPE was changed from CK_USHORT to CK_ULONG for v2.0 */
++typedef CK_ULONG          CK_KEY_TYPE;
++
++/* the following key types are defined: */
++#define CKK_RSA             0x00000000
++#define CKK_DSA             0x00000001
++#define CKK_DH              0x00000002
++
++/* CKK_ECDSA and CKK_KEA are new for v2.0 */
++/* CKK_ECDSA is deprecated in v2.11, CKK_EC is preferred. */
++#define CKK_ECDSA           0x00000003
++#define CKK_EC              0x00000003
++#define CKK_X9_42_DH        0x00000004
++#define CKK_KEA             0x00000005
++
++#define CKK_GENERIC_SECRET  0x00000010
++#define CKK_RC2             0x00000011
++#define CKK_RC4             0x00000012
++#define CKK_DES             0x00000013
++#define CKK_DES2            0x00000014
++#define CKK_DES3            0x00000015
++
++/* all these key types are new for v2.0 */
++#define CKK_CAST            0x00000016
++#define CKK_CAST3           0x00000017
++/* CKK_CAST5 is deprecated in v2.11, CKK_CAST128 is preferred. */
++#define CKK_CAST5           0x00000018
++#define CKK_CAST128         0x00000018
++#define CKK_RC5             0x00000019
++#define CKK_IDEA            0x0000001A
++#define CKK_SKIPJACK        0x0000001B
++#define CKK_BATON           0x0000001C
++#define CKK_JUNIPER         0x0000001D
++#define CKK_CDMF            0x0000001E
++#define CKK_AES             0x0000001F
++
++#define CKK_VENDOR_DEFINED  0x80000000
++
++
++/* CK_CERTIFICATE_TYPE is a value that identifies a certificate
++ * type */
++/* CK_CERTIFICATE_TYPE was changed from CK_USHORT to CK_ULONG
++ * for v2.0 */
++typedef CK_ULONG          CK_CERTIFICATE_TYPE;
++
++/* The following certificate types are defined: */
++/* CKC_X_509_ATTR_CERT is new for v2.10 */
++#define CKC_X_509           0x00000000
++#define CKC_X_509_ATTR_CERT 0x00000001
++#define CKC_VENDOR_DEFINED  0x80000000
++
++
++/* CK_ATTRIBUTE_TYPE is a value that identifies an attribute
++ * type */
++/* CK_ATTRIBUTE_TYPE was changed from CK_USHORT to CK_ULONG for
++ * v2.0 */
++typedef CK_ULONG          CK_ATTRIBUTE_TYPE;
++
++/* The following attribute types are defined: */
++#define CKA_CLASS              0x00000000
++#define CKA_TOKEN              0x00000001
++#define CKA_PRIVATE            0x00000002
++#define CKA_LABEL              0x00000003
++#define CKA_APPLICATION        0x00000010
++#define CKA_VALUE              0x00000011
++
++/* CKA_OBJECT_ID is new for v2.10 */
++#define CKA_OBJECT_ID          0x00000012
++
++#define CKA_CERTIFICATE_TYPE   0x00000080
++#define CKA_ISSUER             0x00000081
++#define CKA_SERIAL_NUMBER      0x00000082
++
++/* CKA_AC_ISSUER, CKA_OWNER, and CKA_ATTR_TYPES are new
++ * for v2.10 */
++#define CKA_AC_ISSUER          0x00000083
++#define CKA_OWNER              0x00000084
++#define CKA_ATTR_TYPES         0x00000085
++
++/* CKA_TRUSTED is new for v2.11 */
++#define CKA_TRUSTED            0x00000086
++
++#define CKA_KEY_TYPE           0x00000100
++#define CKA_SUBJECT            0x00000101
++#define CKA_ID                 0x00000102
++#define CKA_SENSITIVE          0x00000103
++#define CKA_ENCRYPT            0x00000104
++#define CKA_DECRYPT            0x00000105
++#define CKA_WRAP               0x00000106
++#define CKA_UNWRAP             0x00000107
++#define CKA_SIGN               0x00000108
++#define CKA_SIGN_RECOVER       0x00000109
++#define CKA_VERIFY             0x0000010A
++#define CKA_VERIFY_RECOVER     0x0000010B
++#define CKA_DERIVE             0x0000010C
++#define CKA_START_DATE         0x00000110
++#define CKA_END_DATE           0x00000111
++#define CKA_MODULUS            0x00000120
++#define CKA_MODULUS_BITS       0x00000121
++#define CKA_PUBLIC_EXPONENT    0x00000122
++#define CKA_PRIVATE_EXPONENT   0x00000123
++#define CKA_PRIME_1            0x00000124
++#define CKA_PRIME_2            0x00000125
++#define CKA_EXPONENT_1         0x00000126
++#define CKA_EXPONENT_2         0x00000127
++#define CKA_COEFFICIENT        0x00000128
++#define CKA_PRIME              0x00000130
++#define CKA_SUBPRIME           0x00000131
++#define CKA_BASE               0x00000132
++
++/* CKA_PRIME_BITS and CKA_SUB_PRIME_BITS are new for v2.11 */
++#define CKA_PRIME_BITS         0x00000133
++#define CKA_SUB_PRIME_BITS     0x00000134
++
++#define CKA_VALUE_BITS         0x00000160
++#define CKA_VALUE_LEN          0x00000161
++
++/* CKA_EXTRACTABLE, CKA_LOCAL, CKA_NEVER_EXTRACTABLE,
++ * CKA_ALWAYS_SENSITIVE, CKA_MODIFIABLE, CKA_ECDSA_PARAMS,
++ * and CKA_EC_POINT are new for v2.0 */
++#define CKA_EXTRACTABLE        0x00000162
++#define CKA_LOCAL              0x00000163
++#define CKA_NEVER_EXTRACTABLE  0x00000164
++#define CKA_ALWAYS_SENSITIVE   0x00000165
++
++/* CKA_KEY_GEN_MECHANISM is new for v2.11 */
++#define CKA_KEY_GEN_MECHANISM  0x00000166
++
++#define CKA_MODIFIABLE         0x00000170
++
++/* CKA_ECDSA_PARAMS is deprecated in v2.11,
++ * CKA_EC_PARAMS is preferred. */
++#define CKA_ECDSA_PARAMS       0x00000180
++#define CKA_EC_PARAMS          0x00000180
++
++#define CKA_EC_POINT           0x00000181
++
++/* CKA_SECONDARY_AUTH, CKA_AUTH_PIN_FLAGS,
++ * CKA_HW_FEATURE_TYPE, CKA_RESET_ON_INIT, and CKA_HAS_RESET
++ * are new for v2.10 */
++#define CKA_SECONDARY_AUTH     0x00000200
++#define CKA_AUTH_PIN_FLAGS     0x00000201
++#define CKA_HW_FEATURE_TYPE    0x00000300
++#define CKA_RESET_ON_INIT      0x00000301
++#define CKA_HAS_RESET          0x00000302
++
++#define CKA_VENDOR_DEFINED     0x80000000
++
++
++/* CK_ATTRIBUTE is a structure that includes the type, length
++ * and value of an attribute */
++typedef struct CK_ATTRIBUTE {
++  CK_ATTRIBUTE_TYPE type;
++  CK_VOID_PTR       pValue;
++
++  /* ulValueLen went from CK_USHORT to CK_ULONG for v2.0 */
++  CK_ULONG          ulValueLen;  /* in bytes */
++} CK_ATTRIBUTE;
++
++typedef CK_ATTRIBUTE CK_PTR CK_ATTRIBUTE_PTR;
++
++
++/* CK_DATE is a structure that defines a date */
++typedef struct CK_DATE{
++  CK_CHAR       year[4];   /* the year ("1900" - "9999") */
++  CK_CHAR       month[2];  /* the month ("01" - "12") */
++  CK_CHAR       day[2];    /* the day   ("01" - "31") */
++} CK_DATE;
++
++
++/* CK_MECHANISM_TYPE is a value that identifies a mechanism
++ * type */
++/* CK_MECHANISM_TYPE was changed from CK_USHORT to CK_ULONG for
++ * v2.0 */
++typedef CK_ULONG          CK_MECHANISM_TYPE;
++
++/* the following mechanism types are defined: */
++#define CKM_RSA_PKCS_KEY_PAIR_GEN      0x00000000
++#define CKM_RSA_PKCS                   0x00000001
++#define CKM_RSA_9796                   0x00000002
++#define CKM_RSA_X_509                  0x00000003
++
++/* CKM_MD2_RSA_PKCS, CKM_MD5_RSA_PKCS, and CKM_SHA1_RSA_PKCS
++ * are new for v2.0.  They are mechanisms which hash and sign */
++#define CKM_MD2_RSA_PKCS               0x00000004
++#define CKM_MD5_RSA_PKCS               0x00000005
++#define CKM_SHA1_RSA_PKCS              0x00000006
++
++/* CKM_RIPEMD128_RSA_PKCS, CKM_RIPEMD160_RSA_PKCS, and
++ * CKM_RSA_PKCS_OAEP are new for v2.10 */
++#define CKM_RIPEMD128_RSA_PKCS         0x00000007
++#define CKM_RIPEMD160_RSA_PKCS         0x00000008
++#define CKM_RSA_PKCS_OAEP              0x00000009
++
++/* CKM_RSA_X9_31_KEY_PAIR_GEN, CKM_RSA_X9_31, CKM_SHA1_RSA_X9_31,
++ * CKM_RSA_PKCS_PSS, and CKM_SHA1_RSA_PKCS_PSS are new for v2.11 */
++#define CKM_RSA_X9_31_KEY_PAIR_GEN     0x0000000A
++#define CKM_RSA_X9_31                  0x0000000B
++#define CKM_SHA1_RSA_X9_31             0x0000000C
++#define CKM_RSA_PKCS_PSS               0x0000000D
++#define CKM_SHA1_RSA_PKCS_PSS          0x0000000E
++
++#define CKM_DSA_KEY_PAIR_GEN           0x00000010
++#define CKM_DSA                        0x00000011
++#define CKM_DSA_SHA1                   0x00000012
++#define CKM_DH_PKCS_KEY_PAIR_GEN       0x00000020
++#define CKM_DH_PKCS_DERIVE             0x00000021
++
++/* CKM_X9_42_DH_KEY_PAIR_GEN, CKM_X9_42_DH_DERIVE,
++ * CKM_X9_42_DH_HYBRID_DERIVE, and CKM_X9_42_MQV_DERIVE are new for
++ * v2.11 */
++#define CKM_X9_42_DH_KEY_PAIR_GEN      0x00000030
++#define CKM_X9_42_DH_DERIVE            0x00000031
++#define CKM_X9_42_DH_HYBRID_DERIVE     0x00000032
++#define CKM_X9_42_MQV_DERIVE           0x00000033
++
++#define CKM_RC2_KEY_GEN                0x00000100
++#define CKM_RC2_ECB                    0x00000101
++#define CKM_RC2_CBC                    0x00000102
++#define CKM_RC2_MAC                    0x00000103
++
++/* CKM_RC2_MAC_GENERAL and CKM_RC2_CBC_PAD are new for v2.0 */
++#define CKM_RC2_MAC_GENERAL            0x00000104
++#define CKM_RC2_CBC_PAD                0x00000105
++
++#define CKM_RC4_KEY_GEN                0x00000110
++#define CKM_RC4                        0x00000111
++#define CKM_DES_KEY_GEN                0x00000120
++#define CKM_DES_ECB                    0x00000121
++#define CKM_DES_CBC                    0x00000122
++#define CKM_DES_MAC                    0x00000123
++
++/* CKM_DES_MAC_GENERAL and CKM_DES_CBC_PAD are new for v2.0 */
++#define CKM_DES_MAC_GENERAL            0x00000124
++#define CKM_DES_CBC_PAD                0x00000125
++
++#define CKM_DES2_KEY_GEN               0x00000130
++#define CKM_DES3_KEY_GEN               0x00000131
++#define CKM_DES3_ECB                   0x00000132
++#define CKM_DES3_CBC                   0x00000133
++#define CKM_DES3_MAC                   0x00000134
++
++/* CKM_DES3_MAC_GENERAL, CKM_DES3_CBC_PAD, CKM_CDMF_KEY_GEN,
++ * CKM_CDMF_ECB, CKM_CDMF_CBC, CKM_CDMF_MAC,
++ * CKM_CDMF_MAC_GENERAL, and CKM_CDMF_CBC_PAD are new for v2.0 */
++#define CKM_DES3_MAC_GENERAL           0x00000135
++#define CKM_DES3_CBC_PAD               0x00000136
++#define CKM_CDMF_KEY_GEN               0x00000140
++#define CKM_CDMF_ECB                   0x00000141
++#define CKM_CDMF_CBC                   0x00000142
++#define CKM_CDMF_MAC                   0x00000143
++#define CKM_CDMF_MAC_GENERAL           0x00000144
++#define CKM_CDMF_CBC_PAD               0x00000145
++
++#define CKM_MD2                        0x00000200
++
++/* CKM_MD2_HMAC and CKM_MD2_HMAC_GENERAL are new for v2.0 */
++#define CKM_MD2_HMAC                   0x00000201
++#define CKM_MD2_HMAC_GENERAL           0x00000202
++
++#define CKM_MD5                        0x00000210
++
++/* CKM_MD5_HMAC and CKM_MD5_HMAC_GENERAL are new for v2.0 */
++#define CKM_MD5_HMAC                   0x00000211
++#define CKM_MD5_HMAC_GENERAL           0x00000212
++
++#define CKM_SHA_1                      0x00000220
++
++/* CKM_SHA_1_HMAC and CKM_SHA_1_HMAC_GENERAL are new for v2.0 */
++#define CKM_SHA_1_HMAC                 0x00000221
++#define CKM_SHA_1_HMAC_GENERAL         0x00000222
++
++/* CKM_RIPEMD128, CKM_RIPEMD128_HMAC,
++ * CKM_RIPEMD128_HMAC_GENERAL, CKM_RIPEMD160, CKM_RIPEMD160_HMAC,
++ * and CKM_RIPEMD160_HMAC_GENERAL are new for v2.10 */
++#define CKM_RIPEMD128                  0x00000230
++#define CKM_RIPEMD128_HMAC             0x00000231
++#define CKM_RIPEMD128_HMAC_GENERAL     0x00000232
++#define CKM_RIPEMD160                  0x00000240
++#define CKM_RIPEMD160_HMAC             0x00000241
++#define CKM_RIPEMD160_HMAC_GENERAL     0x00000242
++
++/* All of the following mechanisms are new for v2.0 */
++/* Note that CAST128 and CAST5 are the same algorithm */
++#define CKM_CAST_KEY_GEN               0x00000300
++#define CKM_CAST_ECB                   0x00000301
++#define CKM_CAST_CBC                   0x00000302
++#define CKM_CAST_MAC                   0x00000303
++#define CKM_CAST_MAC_GENERAL           0x00000304
++#define CKM_CAST_CBC_PAD               0x00000305
++#define CKM_CAST3_KEY_GEN              0x00000310
++#define CKM_CAST3_ECB                  0x00000311
++#define CKM_CAST3_CBC                  0x00000312
++#define CKM_CAST3_MAC                  0x00000313
++#define CKM_CAST3_MAC_GENERAL          0x00000314
++#define CKM_CAST3_CBC_PAD              0x00000315
++#define CKM_CAST5_KEY_GEN              0x00000320
++#define CKM_CAST128_KEY_GEN            0x00000320
++#define CKM_CAST5_ECB                  0x00000321
++#define CKM_CAST128_ECB                0x00000321
++#define CKM_CAST5_CBC                  0x00000322
++#define CKM_CAST128_CBC                0x00000322
++#define CKM_CAST5_MAC                  0x00000323
++#define CKM_CAST128_MAC                0x00000323
++#define CKM_CAST5_MAC_GENERAL          0x00000324
++#define CKM_CAST128_MAC_GENERAL        0x00000324
++#define CKM_CAST5_CBC_PAD              0x00000325
++#define CKM_CAST128_CBC_PAD            0x00000325
++#define CKM_RC5_KEY_GEN                0x00000330
++#define CKM_RC5_ECB                    0x00000331
++#define CKM_RC5_CBC                    0x00000332
++#define CKM_RC5_MAC                    0x00000333
++#define CKM_RC5_MAC_GENERAL            0x00000334
++#define CKM_RC5_CBC_PAD                0x00000335
++#define CKM_IDEA_KEY_GEN               0x00000340
++#define CKM_IDEA_ECB                   0x00000341
++#define CKM_IDEA_CBC                   0x00000342
++#define CKM_IDEA_MAC                   0x00000343
++#define CKM_IDEA_MAC_GENERAL           0x00000344
++#define CKM_IDEA_CBC_PAD               0x00000345
++#define CKM_GENERIC_SECRET_KEY_GEN     0x00000350
++#define CKM_CONCATENATE_BASE_AND_KEY   0x00000360
++#define CKM_CONCATENATE_BASE_AND_DATA  0x00000362
++#define CKM_CONCATENATE_DATA_AND_BASE  0x00000363
++#define CKM_XOR_BASE_AND_DATA          0x00000364
++#define CKM_EXTRACT_KEY_FROM_KEY       0x00000365
++#define CKM_SSL3_PRE_MASTER_KEY_GEN    0x00000370
++#define CKM_SSL3_MASTER_KEY_DERIVE     0x00000371
++#define CKM_SSL3_KEY_AND_MAC_DERIVE    0x00000372
++
++/* CKM_SSL3_MASTER_KEY_DERIVE_DH, CKM_TLS_PRE_MASTER_KEY_GEN,
++ * CKM_TLS_MASTER_KEY_DERIVE, CKM_TLS_KEY_AND_MAC_DERIVE, and
++ * CKM_TLS_MASTER_KEY_DERIVE_DH are new for v2.11 */
++#define CKM_SSL3_MASTER_KEY_DERIVE_DH  0x00000373
++#define CKM_TLS_PRE_MASTER_KEY_GEN     0x00000374
++#define CKM_TLS_MASTER_KEY_DERIVE      0x00000375
++#define CKM_TLS_KEY_AND_MAC_DERIVE     0x00000376
++#define CKM_TLS_MASTER_KEY_DERIVE_DH   0x00000377
++
++#define CKM_SSL3_MD5_MAC               0x00000380
++#define CKM_SSL3_SHA1_MAC              0x00000381
++#define CKM_MD5_KEY_DERIVATION         0x00000390
++#define CKM_MD2_KEY_DERIVATION         0x00000391
++#define CKM_SHA1_KEY_DERIVATION        0x00000392
++#define CKM_PBE_MD2_DES_CBC            0x000003A0
++#define CKM_PBE_MD5_DES_CBC            0x000003A1
++#define CKM_PBE_MD5_CAST_CBC           0x000003A2
++#define CKM_PBE_MD5_CAST3_CBC          0x000003A3
++#define CKM_PBE_MD5_CAST5_CBC          0x000003A4
++#define CKM_PBE_MD5_CAST128_CBC        0x000003A4
++#define CKM_PBE_SHA1_CAST5_CBC         0x000003A5
++#define CKM_PBE_SHA1_CAST128_CBC       0x000003A5
++#define CKM_PBE_SHA1_RC4_128           0x000003A6
++#define CKM_PBE_SHA1_RC4_40            0x000003A7
++#define CKM_PBE_SHA1_DES3_EDE_CBC      0x000003A8
++#define CKM_PBE_SHA1_DES2_EDE_CBC      0x000003A9
++#define CKM_PBE_SHA1_RC2_128_CBC       0x000003AA
++#define CKM_PBE_SHA1_RC2_40_CBC        0x000003AB
++
++/* CKM_PKCS5_PBKD2 is new for v2.10 */
++#define CKM_PKCS5_PBKD2                0x000003B0
++
++#define CKM_PBA_SHA1_WITH_SHA1_HMAC    0x000003C0
++#define CKM_KEY_WRAP_LYNKS             0x00000400
++#define CKM_KEY_WRAP_SET_OAEP          0x00000401
++
++/* Fortezza mechanisms */
++#define CKM_SKIPJACK_KEY_GEN           0x00001000
++#define CKM_SKIPJACK_ECB64             0x00001001
++#define CKM_SKIPJACK_CBC64             0x00001002
++#define CKM_SKIPJACK_OFB64             0x00001003
++#define CKM_SKIPJACK_CFB64             0x00001004
++#define CKM_SKIPJACK_CFB32             0x00001005
++#define CKM_SKIPJACK_CFB16             0x00001006
++#define CKM_SKIPJACK_CFB8              0x00001007
++#define CKM_SKIPJACK_WRAP              0x00001008
++#define CKM_SKIPJACK_PRIVATE_WRAP      0x00001009
++#define CKM_SKIPJACK_RELAYX            0x0000100a
++#define CKM_KEA_KEY_PAIR_GEN           0x00001010
++#define CKM_KEA_KEY_DERIVE             0x00001011
++#define CKM_FORTEZZA_TIMESTAMP         0x00001020
++#define CKM_BATON_KEY_GEN              0x00001030
++#define CKM_BATON_ECB128               0x00001031
++#define CKM_BATON_ECB96                0x00001032
++#define CKM_BATON_CBC128               0x00001033
++#define CKM_BATON_COUNTER              0x00001034
++#define CKM_BATON_SHUFFLE              0x00001035
++#define CKM_BATON_WRAP                 0x00001036
++
++/* CKM_ECDSA_KEY_PAIR_GEN is deprecated in v2.11,
++ * CKM_EC_KEY_PAIR_GEN is preferred */
++#define CKM_ECDSA_KEY_PAIR_GEN         0x00001040
++#define CKM_EC_KEY_PAIR_GEN            0x00001040
++
++#define CKM_ECDSA                      0x00001041
++#define CKM_ECDSA_SHA1                 0x00001042
++
++/* CKM_ECDH1_DERIVE, CKM_ECDH1_COFACTOR_DERIVE, and CKM_ECMQV_DERIVE
++ * are new for v2.11 */
++#define CKM_ECDH1_DERIVE               0x00001050
++#define CKM_ECDH1_COFACTOR_DERIVE      0x00001051
++#define CKM_ECMQV_DERIVE               0x00001052
++
++#define CKM_JUNIPER_KEY_GEN            0x00001060
++#define CKM_JUNIPER_ECB128             0x00001061
++#define CKM_JUNIPER_CBC128             0x00001062
++#define CKM_JUNIPER_COUNTER            0x00001063
++#define CKM_JUNIPER_SHUFFLE            0x00001064
++#define CKM_JUNIPER_WRAP               0x00001065
++#define CKM_FASTHASH                   0x00001070
++
++/* CKM_AES_KEY_GEN, CKM_AES_ECB, CKM_AES_CBC, CKM_AES_MAC,
++ * CKM_AES_MAC_GENERAL, CKM_AES_CBC_PAD, CKM_DSA_PARAMETER_GEN,
++ * CKM_DH_PKCS_PARAMETER_GEN, and CKM_X9_42_DH_PARAMETER_GEN are
++ * new for v2.11 */
++#define CKM_AES_KEY_GEN                0x00001080
++#define CKM_AES_ECB                    0x00001081
++#define CKM_AES_CBC                    0x00001082
++#define CKM_AES_MAC                    0x00001083
++#define CKM_AES_MAC_GENERAL            0x00001084
++#define CKM_AES_CBC_PAD                0x00001085
++#define CKM_DSA_PARAMETER_GEN          0x00002000
++#define CKM_DH_PKCS_PARAMETER_GEN      0x00002001
++#define CKM_X9_42_DH_PARAMETER_GEN     0x00002002
++
++#define CKM_VENDOR_DEFINED             0x80000000
++
++typedef CK_MECHANISM_TYPE CK_PTR CK_MECHANISM_TYPE_PTR;
++
++
++/* CK_MECHANISM is a structure that specifies a particular
++ * mechanism  */
++typedef struct CK_MECHANISM {
++  CK_MECHANISM_TYPE mechanism;
++  CK_VOID_PTR       pParameter;
++
++  /* ulParameterLen was changed from CK_USHORT to CK_ULONG for
++   * v2.0 */
++  CK_ULONG          ulParameterLen;  /* in bytes */
++} CK_MECHANISM;
++
++typedef CK_MECHANISM CK_PTR CK_MECHANISM_PTR;
++
++
++/* CK_MECHANISM_INFO provides information about a particular
++ * mechanism */
++typedef struct CK_MECHANISM_INFO {
++    CK_ULONG    ulMinKeySize;
++    CK_ULONG    ulMaxKeySize;
++    CK_FLAGS    flags;
++} CK_MECHANISM_INFO;
++
++/* The flags are defined as follows:
++ *      Bit Flag               Mask        Meaning */
++#define CKF_HW                 0x00000001  /* performed by HW */
++
++/* The flags CKF_ENCRYPT, CKF_DECRYPT, CKF_DIGEST, CKF_SIGN,
++ * CKG_SIGN_RECOVER, CKF_VERIFY, CKF_VERIFY_RECOVER,
++ * CKF_GENERATE, CKF_GENERATE_KEY_PAIR, CKF_WRAP, CKF_UNWRAP,
++ * and CKF_DERIVE are new for v2.0.  They specify whether or not
++ * a mechanism can be used for a particular task */
++#define CKF_ENCRYPT            0x00000100
++#define CKF_DECRYPT            0x00000200
++#define CKF_DIGEST             0x00000400
++#define CKF_SIGN               0x00000800
++#define CKF_SIGN_RECOVER       0x00001000
++#define CKF_VERIFY             0x00002000
++#define CKF_VERIFY_RECOVER     0x00004000
++#define CKF_GENERATE           0x00008000
++#define CKF_GENERATE_KEY_PAIR  0x00010000
++#define CKF_WRAP               0x00020000
++#define CKF_UNWRAP             0x00040000
++#define CKF_DERIVE             0x00080000
++
++/* CKF_EC_F_P, CKF_EC_F_2M, CKF_EC_ECPARAMETERS, CKF_EC_NAMEDCURVE,
++ * CKF_EC_UNCOMPRESS, and CKF_EC_COMPRESS are new for v2.11. They
++ * describe a token's EC capabilities not available in mechanism
++ * information. */
++#define CKF_EC_F_P                0x00100000
++#define CKF_EC_F_2M               0x00200000
++#define CKF_EC_ECPARAMETERS       0x00400000
++#define CKF_EC_NAMEDCURVE         0x00800000
++#define CKF_EC_UNCOMPRESS         0x01000000
++#define CKF_EC_COMPRESS               0x02000000
++
++#define CKF_EXTENSION          0x80000000  /* FALSE for 2.01 */
++
++typedef CK_MECHANISM_INFO CK_PTR CK_MECHANISM_INFO_PTR;
++
++
++/* CK_RV is a value that identifies the return value of a
++ * Cryptoki function */
++/* CK_RV was changed from CK_USHORT to CK_ULONG for v2.0 */
++typedef CK_ULONG          CK_RV;
++
++#define CKR_OK                                0x00000000
++#define CKR_CANCEL                            0x00000001
++#define CKR_HOST_MEMORY                       0x00000002
++#define CKR_SLOT_ID_INVALID                   0x00000003
++
++/* CKR_FLAGS_INVALID was removed for v2.0 */
++
++/* CKR_GENERAL_ERROR and CKR_FUNCTION_FAILED are new for v2.0 */
++#define CKR_GENERAL_ERROR                     0x00000005
++#define CKR_FUNCTION_FAILED                   0x00000006
++
++/* CKR_ARGUMENTS_BAD, CKR_NO_EVENT, CKR_NEED_TO_CREATE_THREADS,
++ * and CKR_CANT_LOCK are new for v2.01 */
++#define CKR_ARGUMENTS_BAD                     0x00000007
++#define CKR_NO_EVENT                          0x00000008
++#define CKR_NEED_TO_CREATE_THREADS            0x00000009
++#define CKR_CANT_LOCK                         0x0000000A
++
++#define CKR_ATTRIBUTE_READ_ONLY               0x00000010
++#define CKR_ATTRIBUTE_SENSITIVE               0x00000011
++#define CKR_ATTRIBUTE_TYPE_INVALID            0x00000012
++#define CKR_ATTRIBUTE_VALUE_INVALID           0x00000013
++#define CKR_DATA_INVALID                      0x00000020
++#define CKR_DATA_LEN_RANGE                    0x00000021
++#define CKR_DEVICE_ERROR                      0x00000030
++#define CKR_DEVICE_MEMORY                     0x00000031
++#define CKR_DEVICE_REMOVED                    0x00000032
++#define CKR_ENCRYPTED_DATA_INVALID            0x00000040
++#define CKR_ENCRYPTED_DATA_LEN_RANGE          0x00000041
++#define CKR_FUNCTION_CANCELED                 0x00000050
++#define CKR_FUNCTION_NOT_PARALLEL             0x00000051
++
++/* CKR_FUNCTION_NOT_SUPPORTED is new for v2.0 */
++#define CKR_FUNCTION_NOT_SUPPORTED            0x00000054
++
++#define CKR_KEY_HANDLE_INVALID                0x00000060
++
++/* CKR_KEY_SENSITIVE was removed for v2.0 */
++
++#define CKR_KEY_SIZE_RANGE                    0x00000062
++#define CKR_KEY_TYPE_INCONSISTENT             0x00000063
++
++/* CKR_KEY_NOT_NEEDED, CKR_KEY_CHANGED, CKR_KEY_NEEDED,
++ * CKR_KEY_INDIGESTIBLE, CKR_KEY_FUNCTION_NOT_PERMITTED,
++ * CKR_KEY_NOT_WRAPPABLE, and CKR_KEY_UNEXTRACTABLE are new for
++ * v2.0 */
++#define CKR_KEY_NOT_NEEDED                    0x00000064
++#define CKR_KEY_CHANGED                       0x00000065
++#define CKR_KEY_NEEDED                        0x00000066
++#define CKR_KEY_INDIGESTIBLE                  0x00000067
++#define CKR_KEY_FUNCTION_NOT_PERMITTED        0x00000068
++#define CKR_KEY_NOT_WRAPPABLE                 0x00000069
++#define CKR_KEY_UNEXTRACTABLE                 0x0000006A
++
++#define CKR_MECHANISM_INVALID                 0x00000070
++#define CKR_MECHANISM_PARAM_INVALID           0x00000071
++
++/* CKR_OBJECT_CLASS_INCONSISTENT and CKR_OBJECT_CLASS_INVALID
++ * were removed for v2.0 */
++#define CKR_OBJECT_HANDLE_INVALID             0x00000082
++#define CKR_OPERATION_ACTIVE                  0x00000090
++#define CKR_OPERATION_NOT_INITIALIZED         0x00000091
++#define CKR_PIN_INCORRECT                     0x000000A0
++#define CKR_PIN_INVALID                       0x000000A1
++#define CKR_PIN_LEN_RANGE                     0x000000A2
++
++/* CKR_PIN_EXPIRED and CKR_PIN_LOCKED are new for v2.0 */
++#define CKR_PIN_EXPIRED                       0x000000A3
++#define CKR_PIN_LOCKED                        0x000000A4
++
++#define CKR_SESSION_CLOSED                    0x000000B0
++#define CKR_SESSION_COUNT                     0x000000B1
++#define CKR_SESSION_HANDLE_INVALID            0x000000B3
++#define CKR_SESSION_PARALLEL_NOT_SUPPORTED    0x000000B4
++#define CKR_SESSION_READ_ONLY                 0x000000B5
++#define CKR_SESSION_EXISTS                    0x000000B6
++
++/* CKR_SESSION_READ_ONLY_EXISTS and
++ * CKR_SESSION_READ_WRITE_SO_EXISTS are new for v2.0 */
++#define CKR_SESSION_READ_ONLY_EXISTS          0x000000B7
++#define CKR_SESSION_READ_WRITE_SO_EXISTS      0x000000B8
++
++#define CKR_SIGNATURE_INVALID                 0x000000C0
++#define CKR_SIGNATURE_LEN_RANGE               0x000000C1
++#define CKR_TEMPLATE_INCOMPLETE               0x000000D0
++#define CKR_TEMPLATE_INCONSISTENT             0x000000D1
++#define CKR_TOKEN_NOT_PRESENT                 0x000000E0
++#define CKR_TOKEN_NOT_RECOGNIZED              0x000000E1
++#define CKR_TOKEN_WRITE_PROTECTED             0x000000E2
++#define CKR_UNWRAPPING_KEY_HANDLE_INVALID     0x000000F0
++#define CKR_UNWRAPPING_KEY_SIZE_RANGE         0x000000F1
++#define CKR_UNWRAPPING_KEY_TYPE_INCONSISTENT  0x000000F2
++#define CKR_USER_ALREADY_LOGGED_IN            0x00000100
++#define CKR_USER_NOT_LOGGED_IN                0x00000101
++#define CKR_USER_PIN_NOT_INITIALIZED          0x00000102
++#define CKR_USER_TYPE_INVALID                 0x00000103
++
++/* CKR_USER_ANOTHER_ALREADY_LOGGED_IN and CKR_USER_TOO_MANY_TYPES
++ * are new to v2.01 */
++#define CKR_USER_ANOTHER_ALREADY_LOGGED_IN    0x00000104
++#define CKR_USER_TOO_MANY_TYPES               0x00000105
++
++#define CKR_WRAPPED_KEY_INVALID               0x00000110
++#define CKR_WRAPPED_KEY_LEN_RANGE             0x00000112
++#define CKR_WRAPPING_KEY_HANDLE_INVALID       0x00000113
++#define CKR_WRAPPING_KEY_SIZE_RANGE           0x00000114
++#define CKR_WRAPPING_KEY_TYPE_INCONSISTENT    0x00000115
++#define CKR_RANDOM_SEED_NOT_SUPPORTED         0x00000120
++
++/* These are new to v2.0 */
++#define CKR_RANDOM_NO_RNG                     0x00000121
++
++/* These are new to v2.11 */
++#define CKR_DOMAIN_PARAMS_INVALID             0x00000130
++
++/* These are new to v2.0 */
++#define CKR_BUFFER_TOO_SMALL                  0x00000150
++#define CKR_SAVED_STATE_INVALID               0x00000160
++#define CKR_INFORMATION_SENSITIVE             0x00000170
++#define CKR_STATE_UNSAVEABLE                  0x00000180
++
++/* These are new to v2.01 */
++#define CKR_CRYPTOKI_NOT_INITIALIZED          0x00000190
++#define CKR_CRYPTOKI_ALREADY_INITIALIZED      0x00000191
++#define CKR_MUTEX_BAD                         0x000001A0
++#define CKR_MUTEX_NOT_LOCKED                  0x000001A1
++
++#define CKR_VENDOR_DEFINED                    0x80000000
++
++
++/* CK_NOTIFY is an application callback that processes events */
++typedef CK_CALLBACK_FUNCTION(CK_RV, CK_NOTIFY)(
++  CK_SESSION_HANDLE hSession,     /* the session's handle */
++                                              CK_NOTIFICATION   event,
++  CK_VOID_PTR       pApplication  /* passed to C_OpenSession */
++);
++
++
++/* CK_FUNCTION_LIST is a structure holding a Cryptoki spec
++ * version and pointers of appropriate types to all the
++ * Cryptoki functions */
++/* CK_FUNCTION_LIST is new for v2.0 */
++typedef struct CK_FUNCTION_LIST CK_FUNCTION_LIST;
++
++typedef CK_FUNCTION_LIST CK_PTR CK_FUNCTION_LIST_PTR;
++
++typedef CK_FUNCTION_LIST_PTR CK_PTR CK_FUNCTION_LIST_PTR_PTR;
++
++
++/* CK_CREATEMUTEX is an application callback for creating a
++ * mutex object */
++typedef CK_CALLBACK_FUNCTION(CK_RV, CK_CREATEMUTEX)(
++  CK_VOID_PTR_PTR ppMutex  /* location to receive ptr to mutex */
++);
++
++
++/* CK_DESTROYMUTEX is an application callback for destroying a
++ * mutex object */
++typedef CK_CALLBACK_FUNCTION(CK_RV, CK_DESTROYMUTEX)(
++  CK_VOID_PTR pMutex  /* pointer to mutex */
++);
++
++
++/* CK_LOCKMUTEX is an application callback for locking a mutex */
++typedef CK_CALLBACK_FUNCTION(CK_RV, CK_LOCKMUTEX)(
++  CK_VOID_PTR pMutex  /* pointer to mutex */
++);
++
++
++/* CK_UNLOCKMUTEX is an application callback for unlocking a
++ * mutex */
++typedef CK_CALLBACK_FUNCTION(CK_RV, CK_UNLOCKMUTEX)(
++  CK_VOID_PTR pMutex  /* pointer to mutex */
++);
++
++
++/* CK_C_INITIALIZE_ARGS provides the optional arguments to
++ * C_Initialize */
++typedef struct CK_C_INITIALIZE_ARGS {
++  CK_CREATEMUTEX CreateMutex;
++  CK_DESTROYMUTEX DestroyMutex;
++  CK_LOCKMUTEX LockMutex;
++  CK_UNLOCKMUTEX UnlockMutex;
++  CK_FLAGS flags;
++  CK_VOID_PTR pReserved;
++} CK_C_INITIALIZE_ARGS;
++
++/* flags: bit flags that provide capabilities of the slot
++ *      Bit Flag                           Mask       Meaning
++ */
++#define CKF_LIBRARY_CANT_CREATE_OS_THREADS 0x00000001
++#define CKF_OS_LOCKING_OK                  0x00000002
++
++typedef CK_C_INITIALIZE_ARGS CK_PTR CK_C_INITIALIZE_ARGS_PTR;
++
++
++/* additional flags for parameters to functions */
++
++/* CKF_DONT_BLOCK is for the function C_WaitForSlotEvent */
++#define CKF_DONT_BLOCK     1
++
++/* CK_RSA_PKCS_OAEP_MGF_TYPE is new for v2.10.
++ * CK_RSA_PKCS_OAEP_MGF_TYPE  is used to indicate the Message
++ * Generation Function (MGF) applied to a message block when
++ * formatting a message block for the PKCS #1 OAEP encryption
++ * scheme. */
++typedef CK_ULONG CK_RSA_PKCS_MGF_TYPE;
++
++typedef CK_RSA_PKCS_MGF_TYPE CK_PTR CK_RSA_PKCS_MGF_TYPE_PTR;
++
++/* The following MGFs are defined */
++#define CKG_MGF1_SHA1         0x00000001
++
++/* CK_RSA_PKCS_OAEP_SOURCE_TYPE is new for v2.10.
++ * CK_RSA_PKCS_OAEP_SOURCE_TYPE  is used to indicate the source
++ * of the encoding parameter when formatting a message block
++ * for the PKCS #1 OAEP encryption scheme. */
++typedef CK_ULONG CK_RSA_PKCS_OAEP_SOURCE_TYPE;
++
++typedef CK_RSA_PKCS_OAEP_SOURCE_TYPE CK_PTR CK_RSA_PKCS_OAEP_SOURCE_TYPE_PTR;
++
++/* The following encoding parameter sources are defined */
++#define CKZ_DATA_SPECIFIED    0x00000001
++
++/* CK_RSA_PKCS_OAEP_PARAMS is new for v2.10.
++ * CK_RSA_PKCS_OAEP_PARAMS provides the parameters to the
++ * CKM_RSA_PKCS_OAEP mechanism. */
++typedef struct CK_RSA_PKCS_OAEP_PARAMS {
++       CK_MECHANISM_TYPE hashAlg;
++       CK_RSA_PKCS_MGF_TYPE mgf;
++       CK_RSA_PKCS_OAEP_SOURCE_TYPE source;
++       CK_VOID_PTR pSourceData;
++       CK_ULONG ulSourceDataLen;
++} CK_RSA_PKCS_OAEP_PARAMS;
++
++typedef CK_RSA_PKCS_OAEP_PARAMS CK_PTR CK_RSA_PKCS_OAEP_PARAMS_PTR;
++
++/* CK_RSA_PKCS_PSS_PARAMS is new for v2.11.
++ * CK_RSA_PKCS_PSS_PARAMS provides the parameters to the
++ * CKM_RSA_PKCS_PSS mechanism(s). */
++typedef struct CK_RSA_PKCS_PSS_PARAMS {
++       CK_MECHANISM_TYPE    hashAlg;
++       CK_RSA_PKCS_MGF_TYPE mgf;
++       CK_ULONG             sLen;
++} CK_RSA_PKCS_PSS_PARAMS;
++
++/* CK_KEA_DERIVE_PARAMS provides the parameters to the
++ * CKM_KEA_DERIVE mechanism */
++/* CK_KEA_DERIVE_PARAMS is new for v2.0 */
++typedef struct CK_KEA_DERIVE_PARAMS {
++  CK_BBOOL      isSender;
++  CK_ULONG      ulRandomLen;
++  CK_BYTE_PTR   pRandomA;
++  CK_BYTE_PTR   pRandomB;
++  CK_ULONG      ulPublicDataLen;
++  CK_BYTE_PTR   pPublicData;
++} CK_KEA_DERIVE_PARAMS;
++
++typedef CK_KEA_DERIVE_PARAMS CK_PTR CK_KEA_DERIVE_PARAMS_PTR;
++
++
++/* CK_RC2_PARAMS provides the parameters to the CKM_RC2_ECB and
++ * CKM_RC2_MAC mechanisms.  An instance of CK_RC2_PARAMS just
++ * holds the effective keysize */
++typedef CK_ULONG          CK_RC2_PARAMS;
++
++typedef CK_RC2_PARAMS CK_PTR CK_RC2_PARAMS_PTR;
++
++
++/* CK_RC2_CBC_PARAMS provides the parameters to the CKM_RC2_CBC
++ * mechanism */
++typedef struct CK_RC2_CBC_PARAMS {
++  /* ulEffectiveBits was changed from CK_USHORT to CK_ULONG for
++   * v2.0 */
++  CK_ULONG      ulEffectiveBits;  /* effective bits (1-1024) */
++
++  CK_BYTE       iv[8];            /* IV for CBC mode */
++} CK_RC2_CBC_PARAMS;
++
++typedef CK_RC2_CBC_PARAMS CK_PTR CK_RC2_CBC_PARAMS_PTR;
++
++
++/* CK_RC2_MAC_GENERAL_PARAMS provides the parameters for the
++ * CKM_RC2_MAC_GENERAL mechanism */
++/* CK_RC2_MAC_GENERAL_PARAMS is new for v2.0 */
++typedef struct CK_RC2_MAC_GENERAL_PARAMS {
++  CK_ULONG      ulEffectiveBits;  /* effective bits (1-1024) */
++  CK_ULONG      ulMacLength;      /* Length of MAC in bytes */
++} CK_RC2_MAC_GENERAL_PARAMS;
++
++typedef CK_RC2_MAC_GENERAL_PARAMS CK_PTR \
++  CK_RC2_MAC_GENERAL_PARAMS_PTR;
++
++
++/* CK_RC5_PARAMS provides the parameters to the CKM_RC5_ECB and
++ * CKM_RC5_MAC mechanisms */
++/* CK_RC5_PARAMS is new for v2.0 */
++typedef struct CK_RC5_PARAMS {
++  CK_ULONG      ulWordsize;  /* wordsize in bits */
++  CK_ULONG      ulRounds;    /* number of rounds */
++} CK_RC5_PARAMS;
++
++typedef CK_RC5_PARAMS CK_PTR CK_RC5_PARAMS_PTR;
++
++
++/* CK_RC5_CBC_PARAMS provides the parameters to the CKM_RC5_CBC
++ * mechanism */
++/* CK_RC5_CBC_PARAMS is new for v2.0 */
++typedef struct CK_RC5_CBC_PARAMS {
++  CK_ULONG      ulWordsize;  /* wordsize in bits */
++  CK_ULONG      ulRounds;    /* number of rounds */
++  CK_BYTE_PTR   pIv;         /* pointer to IV */
++  CK_ULONG      ulIvLen;     /* length of IV in bytes */
++} CK_RC5_CBC_PARAMS;
++
++typedef CK_RC5_CBC_PARAMS CK_PTR CK_RC5_CBC_PARAMS_PTR;
++
++
++/* CK_RC5_MAC_GENERAL_PARAMS provides the parameters for the
++ * CKM_RC5_MAC_GENERAL mechanism */
++/* CK_RC5_MAC_GENERAL_PARAMS is new for v2.0 */
++typedef struct CK_RC5_MAC_GENERAL_PARAMS {
++  CK_ULONG      ulWordsize;   /* wordsize in bits */
++  CK_ULONG      ulRounds;     /* number of rounds */
++  CK_ULONG      ulMacLength;  /* Length of MAC in bytes */
++} CK_RC5_MAC_GENERAL_PARAMS;
++
++typedef CK_RC5_MAC_GENERAL_PARAMS CK_PTR \
++  CK_RC5_MAC_GENERAL_PARAMS_PTR;
++
++
++/* CK_MAC_GENERAL_PARAMS provides the parameters to most block
++ * ciphers' MAC_GENERAL mechanisms.  Its value is the length of
++ * the MAC */
++/* CK_MAC_GENERAL_PARAMS is new for v2.0 */
++typedef CK_ULONG          CK_MAC_GENERAL_PARAMS;
++
++typedef CK_MAC_GENERAL_PARAMS CK_PTR CK_MAC_GENERAL_PARAMS_PTR;
++
++
++/* CK_SKIPJACK_PRIVATE_WRAP_PARAMS provides the parameters to the
++ * CKM_SKIPJACK_PRIVATE_WRAP mechanism */
++/* CK_SKIPJACK_PRIVATE_WRAP_PARAMS is new for v2.0 */
++typedef struct CK_SKIPJACK_PRIVATE_WRAP_PARAMS {
++  CK_ULONG      ulPasswordLen;
++  CK_BYTE_PTR   pPassword;
++  CK_ULONG      ulPublicDataLen;
++  CK_BYTE_PTR   pPublicData;
++  CK_ULONG      ulPAndGLen;
++  CK_ULONG      ulQLen;
++  CK_ULONG      ulRandomLen;
++  CK_BYTE_PTR   pRandomA;
++  CK_BYTE_PTR   pPrimeP;
++  CK_BYTE_PTR   pBaseG;
++  CK_BYTE_PTR   pSubprimeQ;
++} CK_SKIPJACK_PRIVATE_WRAP_PARAMS;
++
++typedef CK_SKIPJACK_PRIVATE_WRAP_PARAMS CK_PTR \
++  CK_SKIPJACK_PRIVATE_WRAP_PTR;
++
++
++/* CK_SKIPJACK_RELAYX_PARAMS provides the parameters to the
++ * CKM_SKIPJACK_RELAYX mechanism */
++/* CK_SKIPJACK_RELAYX_PARAMS is new for v2.0 */
++typedef struct CK_SKIPJACK_RELAYX_PARAMS {
++  CK_ULONG      ulOldWrappedXLen;
++  CK_BYTE_PTR   pOldWrappedX;
++  CK_ULONG      ulOldPasswordLen;
++  CK_BYTE_PTR   pOldPassword;
++  CK_ULONG      ulOldPublicDataLen;
++  CK_BYTE_PTR   pOldPublicData;
++  CK_ULONG      ulOldRandomLen;
++  CK_BYTE_PTR   pOldRandomA;
++  CK_ULONG      ulNewPasswordLen;
++  CK_BYTE_PTR   pNewPassword;
++  CK_ULONG      ulNewPublicDataLen;
++  CK_BYTE_PTR   pNewPublicData;
++  CK_ULONG      ulNewRandomLen;
++  CK_BYTE_PTR   pNewRandomA;
++} CK_SKIPJACK_RELAYX_PARAMS;
++
++typedef CK_SKIPJACK_RELAYX_PARAMS CK_PTR \
++  CK_SKIPJACK_RELAYX_PARAMS_PTR;
++
++
++typedef struct CK_PBE_PARAMS {
++  CK_BYTE_PTR      pInitVector;
++  CK_UTF8CHAR_PTR  pPassword;
++  CK_ULONG         ulPasswordLen;
++  CK_BYTE_PTR      pSalt;
++  CK_ULONG         ulSaltLen;
++  CK_ULONG         ulIteration;
++} CK_PBE_PARAMS;
++
++typedef CK_PBE_PARAMS CK_PTR CK_PBE_PARAMS_PTR;
++
++
++/* CK_KEY_WRAP_SET_OAEP_PARAMS provides the parameters to the
++ * CKM_KEY_WRAP_SET_OAEP mechanism */
++/* CK_KEY_WRAP_SET_OAEP_PARAMS is new for v2.0 */
++typedef struct CK_KEY_WRAP_SET_OAEP_PARAMS {
++  CK_BYTE       bBC;     /* block contents byte */
++  CK_BYTE_PTR   pX;      /* extra data */
++  CK_ULONG      ulXLen;  /* length of extra data in bytes */
++} CK_KEY_WRAP_SET_OAEP_PARAMS;
++
++typedef CK_KEY_WRAP_SET_OAEP_PARAMS CK_PTR \
++  CK_KEY_WRAP_SET_OAEP_PARAMS_PTR;
++
++
++typedef struct CK_SSL3_RANDOM_DATA {
++  CK_BYTE_PTR  pClientRandom;
++  CK_ULONG     ulClientRandomLen;
++  CK_BYTE_PTR  pServerRandom;
++  CK_ULONG     ulServerRandomLen;
++} CK_SSL3_RANDOM_DATA;
++
++
++typedef struct CK_SSL3_MASTER_KEY_DERIVE_PARAMS {
++  CK_SSL3_RANDOM_DATA RandomInfo;
++  CK_VERSION_PTR pVersion;
++} CK_SSL3_MASTER_KEY_DERIVE_PARAMS;
++
++typedef struct CK_SSL3_MASTER_KEY_DERIVE_PARAMS CK_PTR \
++  CK_SSL3_MASTER_KEY_DERIVE_PARAMS_PTR;
++
++
++typedef struct CK_SSL3_KEY_MAT_OUT {
++  CK_OBJECT_HANDLE hClientMacSecret;
++  CK_OBJECT_HANDLE hServerMacSecret;
++  CK_OBJECT_HANDLE hClientKey;
++  CK_OBJECT_HANDLE hServerKey;
++  CK_BYTE_PTR      pIVClient;
++  CK_BYTE_PTR      pIVServer;
++} CK_SSL3_KEY_MAT_OUT;
++
++typedef CK_SSL3_KEY_MAT_OUT CK_PTR CK_SSL3_KEY_MAT_OUT_PTR;
++
++
++typedef struct CK_SSL3_KEY_MAT_PARAMS {
++  CK_ULONG                ulMacSizeInBits;
++  CK_ULONG                ulKeySizeInBits;
++  CK_ULONG                ulIVSizeInBits;
++  CK_BBOOL                bIsExport;
++  CK_SSL3_RANDOM_DATA     RandomInfo;
++  CK_SSL3_KEY_MAT_OUT_PTR pReturnedKeyMaterial;
++} CK_SSL3_KEY_MAT_PARAMS;
++
++typedef CK_SSL3_KEY_MAT_PARAMS CK_PTR CK_SSL3_KEY_MAT_PARAMS_PTR;
++
++
++typedef struct CK_KEY_DERIVATION_STRING_DATA {
++  CK_BYTE_PTR pData;
++  CK_ULONG    ulLen;
++} CK_KEY_DERIVATION_STRING_DATA;
++
++typedef CK_KEY_DERIVATION_STRING_DATA CK_PTR \
++  CK_KEY_DERIVATION_STRING_DATA_PTR;
++
++
++/* The CK_EXTRACT_PARAMS is used for the
++ * CKM_EXTRACT_KEY_FROM_KEY mechanism.  It specifies which bit
++ * of the base key should be used as the first bit of the
++ * derived key */
++/* CK_EXTRACT_PARAMS is new for v2.0 */
++typedef CK_ULONG CK_EXTRACT_PARAMS;
++
++typedef CK_EXTRACT_PARAMS CK_PTR CK_EXTRACT_PARAMS_PTR;
++
++/* CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE is new for v2.10.
++ * CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE is used to
++ * indicate the Pseudo-Random Function (PRF) used to generate
++ * key bits using PKCS #5 PBKDF2. */
++typedef CK_ULONG CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE;
++
++typedef CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE CK_PTR CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE_PTR;
++
++/* The following PRFs are defined in PKCS #5 v2.0. */
++#define CKP_PKCS5_PBKD2_HMAC_SHA1 0x00000001
++
++
++/* CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE is new for v2.10.
++ * CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE is used to indicate the
++ * source of the salt value when deriving a key using PKCS #5
++ * PBKDF2. */
++typedef CK_ULONG CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE;
++
++typedef CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE CK_PTR CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE_PTR;
++
++/* The following salt value sources are defined in PKCS #5 v2.0. */
++#define CKZ_SALT_SPECIFIED        0x00000001
++
++/* CK_PKCS5_PBKD2_PARAMS is new for v2.10.
++ * CK_PKCS5_PBKD2_PARAMS is a structure that provides the
++ * parameters to the CKM_PKCS5_PBKD2 mechanism. */
++typedef struct CK_PKCS5_PBKD2_PARAMS {
++       CK_PKCS5_PBKDF2_SALT_SOURCE_TYPE           saltSource;
++       CK_VOID_PTR                                pSaltSourceData;
++       CK_ULONG                                   ulSaltSourceDataLen;
++       CK_ULONG                                   iterations;
++       CK_PKCS5_PBKD2_PSEUDO_RANDOM_FUNCTION_TYPE prf;
++       CK_VOID_PTR                                pPrfData;
++       CK_ULONG                                   ulPrfDataLen;
++       CK_UTF8CHAR_PTR                            pPassword;
++       CK_ULONG_PTR                               ulPasswordLen;
++} CK_PKCS5_PBKD2_PARAMS;
++
++typedef CK_PKCS5_PBKD2_PARAMS CK_PTR CK_PKCS5_PBKD2_PARAMS_PTR;
++
++#endif
+diff -udrNP putty-0.58.orig/rsaref/unix.h putty-0.58/rsaref/unix.h
+--- putty-0.58.orig/rsaref/unix.h       1970-01-01 01:00:00.000000000 +0100
++++ putty-0.58/rsaref/unix.h    2005-06-06 11:50:58.487734144 +0200
+@@ -0,0 +1,24 @@
++
++
++#ifndef UNIX_H
++#define UNIX_H
++
++#define CK_PTR *
++
++#define CK_DEFINE_FUNCTION(returnType, name) \
++   returnType name
++
++#define CK_DECLARE_FUNCTION(returnType, name) \
++   returnType name
++
++#define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
++   returnType (* name)
++
++#define CK_CALLBACK_FUNCTION(returnType, name) \
++   returnType (* name)
++
++#ifndef NULL_PTR
++#define NULL_PTR 0
++#endif
++
++#endif
+diff -udrNP putty-0.58.orig/rsaref/win32.h putty-0.58/rsaref/win32.h
+--- putty-0.58.orig/rsaref/win32.h      1970-01-01 01:00:00.000000000 +0100
++++ putty-0.58/rsaref/win32.h   2005-06-06 11:50:58.487734144 +0200
+@@ -0,0 +1,24 @@
++
++
++#ifndef WIN32_H
++#define WIN32_H
++
++#define CK_PTR *
++
++#define CK_DEFINE_FUNCTION(returnType, name) \
++   returnType __declspec(dllexport) name
++
++#define CK_DECLARE_FUNCTION(returnType, name) \
++   returnType __declspec(dllexport) name
++
++#define CK_DECLARE_FUNCTION_POINTER(returnType, name) \
++   returnType __declspec(dllimport) (* name)
++
++#define CK_CALLBACK_FUNCTION(returnType, name) \
++   returnType (* name)
++
++#ifndef NULL_PTR
++#define NULL_PTR 0
++#endif
++
++#endif
+diff -udrNP putty-0.58.orig/settings.c putty-0.58/settings.c
+--- putty-0.58.orig/settings.c  2005-04-05 21:37:51.000000000 +0200
++++ putty-0.58/settings.c       2005-06-06 11:50:58.488733992 +0200
+@@ -243,11 +243,16 @@
+diff -urNp putty-0.58.org/Recipe putty-0.58+smartcard/Recipe
+--- putty-0.58.org/Recipe       2005-04-05 22:37:51.000000000 +0300
++++ putty-0.58+smartcard/Recipe 2005-06-06 13:14:36.000000000 +0300
+@@ -205,7 +205,7 @@ NONSSH   = telnet raw rlogin ldisc pinge
+ # SSH back end (putty, plink, pscp, psftp).
+ SSH      = ssh sshcrc sshdes sshmd5 sshrsa sshrand sshsha sshblowf
+          + sshdh sshcrcda sshpubk sshzlib sshdss x11fwd portfwd
+-         + sshaes sshsh512 sshbn wildcard pinger
++         + sshaes sshsh512 sshbn wildcard pinger libpkcs11 sshscard local_cmd
+ WINSSH   = SSH winnoise winpgntc
+ UXSSH    = SSH uxnoise uxagentc
+ MACSSH   = SSH macnoise
+@@ -252,7 +252,7 @@ psftp    : [C] psftp winsftp wincons WIN
+ pageant  : [G] winpgnt sshrsa sshpubk sshdes sshbn sshmd5 version tree234
+          + misc sshaes sshsha winpgntc sshdss sshsh512 winutils winmisc
+-         + pageant.res LIBS
++         + pageant.res libpkcs11 sshscard LIBS
+ puttygen : [G] winpgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
+          + sshrand winnoise sshsha winstore misc winctrls sshrsa sshdss winmisc
+diff -urNp putty-0.58.org/settings.c putty-0.58+smartcard/settings.c
+--- putty-0.58.org/settings.c   2005-04-05 22:37:51.000000000 +0300
++++ putty-0.58+smartcard/settings.c     2005-06-06 12:50:58.000000000 +0300
+@@ -243,11 +243,16 @@ void save_open_settings(void *sesskey, i
      write_setting_s(sesskey, "RekeyBytes", cfg->ssh_rekey_data);
      write_setting_i(sesskey, "AuthTIS", cfg->try_tis_auth);
 …
      write_setting_i(sesskey, "PassiveTelnet", cfg->passive_telnet);
      write_setting_i(sesskey, "BackspaceIsDelete", cfg->bksp_is_delete);
@@ -538,10 +543,17 @@
+@@ -538,10 +543,17 @@ void load_open_settings(void *sesskey, i
      gppi(sesskey, "SSH2DES", 0, &cfg->ssh2_des_cbc);
      gppi(sesskey, "AuthTIS", 0, &cfg->try_tis_auth);
 …
      gppi(sesskey, "PassiveTelnet", 0, &cfg->passive_telnet);
      gppi(sesskey, "BackspaceIsDelete", 1, &cfg->bksp_is_delete);
 diff -udrNP putty-0.58.orig/smartcard.ppk putty-0.58/smartcard.ppk
 --- putty-0.58.orig/smartcard.ppk       1970-01-01 01:00:00.000000000 +0100
 +++ putty-0.58/smartcard.ppk    2005-06-06 21:39:23.388670184 +0200
+diff -urNp putty-0.58.org/smartcard.ppk putty-0.58+smartcard/smartcard.ppk
+--- putty-0.58.org/smartcard.ppk        1970-01-01 02:00:00.000000000 +0200
++++ putty-0.58+smartcard/smartcard.ppk  2005-06-06 22:39:23.000000000 +0300
@@ -0,0 +1,2 @@
 +PuTTY-User-Smartcard-Key-File-
 +Testing
 diff -udrNP putty-0.58.orig/ssh.c putty-0.58/ssh.c
 --- putty-0.58.orig/ssh.c       2005-04-05 21:37:51.000000000 +0200
 +++ putty-0.58/ssh.c    2005-06-06 11:50:58.493733232 +0200
+diff -urNp putty-0.58.org/ssh.c putty-0.58+smartcard/ssh.c
+--- putty-0.58.org/ssh.c        2005-04-05 22:37:51.000000000 +0300
++++ putty-0.58+smartcard/ssh.c  2008-03-15 20:37:28.000000000 +0200
@@ -6,6 +6,11 @@
  #include "putty.h"
  #include "tree234.h"
  #include "ssh.h"
 +#include "pkcs11.h"
++#include "ppkcs11.h"
 +#include "sshscard.h"
++
 …
  #ifndef FALSE
  #define FALSE 0
+@@ -772,7 +777,20 @@
+@@ -316,7 +321,6 @@ enum {
+ #define crWaitUntil(c) do { crReturn(0); } while (!(c))
+ #define crWaitUntilV(c)        do { crReturnV; } while (!(c))
+-typedef struct ssh_tag *Ssh;
+ struct Packet;
+ static struct Packet *ssh2_pkt_init(int pkt_type);
+@@ -565,8 +569,8 @@ static void ssh2_add_channel_data(struct
+ static void ssh_throttle_all(Ssh ssh, int enable, int bufsize);
+ static void ssh2_set_window(struct ssh_channel *c, unsigned newwin);
+ static int ssh_sendbuffer(void *handle);
+-static int ssh_do_close(Ssh ssh, int notify_exit);
+-static unsigned long ssh_pkt_getuint32(struct Packet *pkt);
++int ssh_do_close(Ssh ssh, int notify_exit);
++unsigned long ssh_pkt_getuint32(struct Packet *pkt);
+ static int ssh2_pkt_getbool(struct Packet *pkt);
+ static void ssh_pkt_getstring(struct Packet *pkt, char **p, int *length);
+ static void ssh2_timer(void *ctx, long now);
+@@ -772,7 +776,20 @@ struct ssh_tag {
      char *deferred_rekey_reason;    /* points to STATIC string; don't free */
  };
 …
  /* logevent, only printf-formatted. */
  static void logeventf(Ssh ssh, const char *fmt, ...)
+@@ -2438,6 +2456,12 @@
+@@ -1903,7 +1920,7 @@ static void sha_mpint(SHA_State * s, Big
+ /*
+  * Packet decode functions for both SSH-1 and SSH-2.
+  */
+-static unsigned long ssh_pkt_getuint32(struct Packet *pkt)
++unsigned long ssh_pkt_getuint32(struct Packet *pkt)
+ {
+     unsigned long value;
+     if (pkt->length - pkt->savedpos < 4)
+@@ -2438,7 +2455,13 @@ static void ssh_gotdata(Ssh ssh, unsigne
      crFinishV;
+ }
+-static int ssh_do_close(Ssh ssh, int notify_exit)
 +void do_close(void * ssh) {
 + //    logevent("closing");
 …
++
++
  static int ssh_do_close(Ssh ssh, int notify_exit)
++int ssh_do_close(Ssh ssh, int notify_exit)
+ {
      int ret = 0;
+@@ -6274,7 +6298,7 @@
+     struct ssh_channel *c;
+@@ -6274,7 +6297,7 @@ static void do_ssh2_authconn(Ssh ssh, un
+ {
      struct do_ssh2_authconn_state {
 …
                 AUTH_KEYBOARD_INTERACTIVE
         } method;
@@ -6287,8 +6311,9 @@
+@@ -6287,8 +6310,9 @@ static void do_ssh2_authconn(Ssh ssh, un
                 AUTH_TYPE_KEYBOARD_INTERACTIVE,
                 AUTH_TYPE_KEYBOARD_INTERACTIVE_QUIET
 …
         int we_are_in;
         int num_prompts, curr_prompt, echo;
@@ -6421,6 +6446,7 @@
+@@ -6421,6 +6445,7 @@ static void do_ssh2_authconn(Ssh ssh, un
         s->tried_agent = FALSE;
         s->kbd_inter_running = FALSE;
 …
         if (!filename_is_null(ssh->cfg.keyfile)) {
             int keytype;
@@ -6444,9 +6470,21 @@
+@@ -6444,9 +6469,21 @@ static void do_ssh2_authconn(Ssh ssh, un
                 s->publickey_blob = NULL;
+            }
 …
              * Wait for the result of the last authentication request.
              */
@@ -6559,6 +6597,7 @@
+@@ -6559,6 +6596,7 @@ static void do_ssh2_authconn(Ssh ssh, un
                 s->can_pubkey =
 …
                     in_commasep_string("password", methods, methlen);
                 s->can_keyb_inter = ssh->cfg.try_ki_auth &&
@@ -6743,13 +6782,13 @@
+@@ -6743,13 +6781,13 @@ static void do_ssh2_authconn(Ssh ssh, un
                 sfree(s->response);
+            }
 …
                 ssh->pkt_ctx &= ~SSH2_PKTCTX_AUTH_MASK;
                 ssh->pkt_ctx |= SSH2_PKTCTX_PUBLICKEY;
@@ -6760,12 +6799,27 @@
+@@ -6760,12 +6798,27 @@ static void do_ssh2_authconn(Ssh ssh, un
                  * First, offer the public blob to see if the server is
                  * willing to accept it.
 …
                     ssh2_pkt_addstring(s->pktout, s->username);
                     ssh2_pkt_addstring(s->pktout, "ssh-connection");    /* service requested */
@@ -6790,20 +6844,30 @@
+@@ -6790,20 +6843,30 @@ static void do_ssh2_authconn(Ssh ssh, un
                      * Actually attempt a serious authentication using
                      * the key.
 …
+            }
@@ -6947,24 +7011,38 @@
+@@ -6947,24 +7010,38 @@ static void do_ssh2_authconn(Ssh ssh, un
+                }
+            }
 …
                     /* Send a spurious AUTH_NONE to return to the top. */
                     s->pktout = ssh2_pkt_init(SSH2_MSG_USERAUTH_REQUEST);
@@ -7015,14 +7093,26 @@
+@@ -7015,14 +7092,26 @@ static void do_ssh2_authconn(Ssh ssh, un
                            s->pktout->length - 5);
                      p += s->pktout->length - 5;
 …
                     s->type = AUTH_TYPE_PUBLICKEY;
                     key->alg->freekey(key->data);
@@ -7233,6 +7323,14 @@
+@@ -7233,6 +7322,14 @@ static void do_ssh2_authconn(Ssh ssh, un
+     }
 …
       */
      if (ssh->mainchan && !ssh->cfg.nopty) {
 diff -udrNP putty-0.58.orig/ssh.h putty-0.58/ssh.h
 --- putty-0.58.orig/ssh.h       2005-04-05 21:37:51.000000000 +0200
 +++ putty-0.58/ssh.h    2005-06-06 12:06:34.718405448 +0200
@@ -11,6 +11,10 @@
+diff -urNp putty-0.58.org/ssh.h putty-0.58+smartcard/ssh.h
+--- putty-0.58.org/ssh.h        2005-04-05 22:37:51.000000000 +0300
++++ putty-0.58+smartcard/ssh.h  2005-06-06 13:06:34.000000000 +0300
+@@ -11,6 +11,10 @@ struct ssh_channel;
  extern void sshfwd_close(struct ssh_channel *c);
  extern int sshfwd_write(struct ssh_channel *c, char *, int);
 …
  /*
   * Useful thing.
@@ -378,7 +382,8 @@
+@@ -378,7 +382,8 @@ enum {
      SSH_KEYTYPE_UNOPENABLE,
      SSH_KEYTYPE_UNKNOWN,
 …
  int key_type(const Filename *filename);
  char *key_type_to_str(int type);
 diff -udrNP putty-0.58.orig/sshpubk.c putty-0.58/sshpubk.c
 --- putty-0.58.orig/sshpubk.c   2005-04-05 21:37:51.000000000 +0200
 +++ putty-0.58/sshpubk.c        2005-06-06 11:51:02.166174936 +0200
@@ -1182,6 +1182,7 @@
+diff -urNp putty-0.58.org/sshpubk.c putty-0.58+smartcard/sshpubk.c
+--- putty-0.58.org/sshpubk.c    2005-04-05 22:37:51.000000000 +0300
++++ putty-0.58+smartcard/sshpubk.c      2005-06-06 12:51:02.000000000 +0300
+@@ -1182,6 +1182,7 @@ int key_type(const Filename *filename)
      const char putty2_sig[] = "PuTTY-User-Key-File-";
      const char sshcom_sig[] = "---- BEGIN SSH2 ENCRYPTED PRIVAT";
 …
      fp = f_open(*filename, "r");
@@ -1199,6 +1200,8 @@
+@@ -1199,6 +1200,8 @@ int key_type(const Filename *filename)
         return SSH_KEYTYPE_SSH2;
      if (!memcmp(buf, openssh_sig, sizeof(openssh_sig)-1))
 …
         return SSH_KEYTYPE_SSHCOM;
      return SSH_KEYTYPE_UNKNOWN;               /* unrecognised or EOF */
 diff -udrNP putty-0.58.orig/sshrsa.h putty-0.58/sshrsa.h
 --- putty-0.58.orig/sshrsa.h    1970-01-01 01:00:00.000000000 +0100
 +++ putty-0.58/sshrsa.h 2005-06-06 11:50:58.496732776 +0200
+diff -urNp putty-0.58.org/sshrsa.h putty-0.58+smartcard/sshrsa.h
+--- putty-0.58.org/sshrsa.h     1970-01-01 02:00:00.000000000 +0200
++++ putty-0.58+smartcard/sshrsa.h       2005-06-06 12:50:58.000000000 +0300
@@ -0,0 +1,14 @@
++
 …
++
++
 diff -udrNP putty-0.58.orig/sshscard.c putty-0.58/sshscard.c
 --- putty-0.58.orig/sshscard.c  1970-01-01 01:00:00.000000000 +0100
 +++ putty-0.58/sshscard.c       2005-06-06 12:12:44.681162560 +0200
+diff -urNp putty-0.58.org/sshscard.c putty-0.58+smartcard/sshscard.c
+--- putty-0.58.org/sshscard.c   1970-01-01 02:00:00.000000000 +0200
++++ putty-0.58+smartcard/sshscard.c     2008-03-15 20:33:48.000000000 +0200
@@ -0,0 +1,387 @@
 +#include "ssh.h"
 +#include "sshrsa.h"
 +#include "pkcs11.h"
++#include "ppkcs11.h"
 +#include "sshscard.h"
 +#include "putty.h"
 …
 +    char * keylabel=NULL;
 +    /* again, need to get keylabel from file */
 +    return ssh2_load_pkcs11key(keylabel,passphrase, errorstr);
++    return ssh2_load_pkcs11key(keylabel,passphrase);
 +}
++
 …
 +    /* session is currently static - only one smartcard key can be loaded */
++
 +    return ssh2_userkey_loadpkcs11pub( keylabel, algorithm, pub_blob_len, errorstr);
++    return ssh2_userkey_loadpkcs11pub( keylabel, algorithm, pub_blob_len);
 +}
++
 …
 +}
++
 diff -udrNP putty-0.58.orig/sshscard.h putty-0.58/sshscard.h
 --- putty-0.58.orig/sshscard.h  1970-01-01 01:00:00.000000000 +0100
 +++ putty-0.58/sshscard.h       2005-06-06 11:50:58.524728520 +0200
+diff -urNp putty-0.58.org/sshscard.h putty-0.58+smartcard/sshscard.h
+--- putty-0.58.org/sshscard.h   1970-01-01 02:00:00.000000000 +0200
++++ putty-0.58+smartcard/sshscard.h     2005-06-06 12:50:58.000000000 +0300
@@ -0,0 +1,15 @@
++
 …
 +#endif
++
 diff -udrNP putty-0.58.orig/unix/Makefile.gtk putty-0.58/unix/Makefile.gtk
 --- putty-0.58.orig/unix/Makefile.gtk   2005-06-06 11:51:12.652580760 +0200
 +++ putty-0.58/unix/Makefile.gtk        2005-06-06 12:14:39.412720712 +0200
@@ -101,54 +101,57 @@
+diff -urNp putty-0.58.org/unix/Makefile.gtk putty-0.58+smartcard/unix/Makefile.gtk
+--- putty-0.58.org/unix/Makefile.gtk    2005-04-05 22:40:17.000000000 +0300
++++ putty-0.58+smartcard/unix/Makefile.gtk      2008-03-15 20:49:45.000000000 +0200
+@@ -101,54 +101,57 @@ man1dir=$(mandir)/man1
  all: plink pscp psftp pterm putty puttygen puttytel
 …
  pterm: be_none.o cmdline.o config.o dialog.o fromucs.o gtkcfg.o gtkcols.o \
                 gtkdlg.o gtkpanel.o gtkwin.o ldisc.o ldiscucs.o localenc.o \
@@ -168,28 +171,29 @@
+@@ -168,28 +171,29 @@ pterm: be_none.o cmdline.o config.o dial
  putty: be_all.o cmdline.o config.o cproxy.o dialog.o fromucs.o gtkcfg.o \
 …
  puttygen: cmdgen.o import.o misc.o notiming.o sshaes.o sshbn.o sshdes.o \
                 sshdss.o sshdssg.o sshmd5.o sshprime.o sshpubk.o sshrand.o \
@@ -300,6 +304,11 @@
+@@ -300,6 +304,10 @@ ldiscucs.o: ../ldiscucs.c ../putty.h ../
                 ../mac/macstuff.h ../macosx/osx.h ../unix/unix.h \
                 ../puttymem.h ../windows/winhelp.h ../charset/charset.h
         $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) -c ../ldiscucs.c
++libpkcs11.o: ../libpkcs11.c ../pkcs11.h ../rsaref/win32.h ../rsaref/pkcs11.h \
++               ../rsaref/unix.h ../rsaref/pkcs11t.h ../rsaref/pkcs11f.h
++libpkcs11.o: ../libpkcs11.c ../pkcs11.h ../ppkcs11.h
 +       $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) -c ../libpkcs11.c
 +local_cmd.o: ../local_cmd.c
 …
         $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) -c ../charset/localenc.c
  logging.o: ../logging.c ../putty.h ../puttyps.h ../network.h ../misc.h \
@@ -507,9 +516,11 @@
+@@ -507,8 +515,9 @@ sizetip.o: ../windows/sizetip.c ../putty
  slookup.o: ../charset/slookup.c ../charset/charset.h ../charset/internal.h \
                 ../charset/enum.c ../charset/sbcsdat.c ../charset/utf8.c
 …
 -ssh.o: ../ssh.c ../putty.h ../tree234.h ../ssh.h ../puttyps.h ../network.h \
 -               ../misc.h ../puttymem.h ../int64.h ../windows/winstuff.h \
 +ssh.o: ../ssh.c ../putty.h ../tree234.h ../ssh.h ../pkcs11.h ../sshscard.h \
++ssh.o: ../ssh.c ../putty.h ../tree234.h ../ssh.h ../pkcs11.h ../ppkcs11.h ../sshscard.h \
 +               ../puttyps.h ../network.h ../misc.h ../puttymem.h ../int64.h \
 +               ../rsaref/win32.h ../rsaref/pkcs11.h ../windows/winstuff.h \
++               ../windows/winstuff.h \
                 ../mac/macstuff.h ../macosx/osx.h ../unix/unix.h \
-+               ../rsaref/unix.h ../rsaref/pkcs11t.h ../rsaref/pkcs11f.h \
                 ../windows/winhelp.h ../charset/charset.h
         $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) -c ../ssh.c
+ sshaes.o: ../sshaes.c ../ssh.h ../puttymem.h ../network.h ../int64.h \
+@@ -559,6 +570,14 @@
+@@ -559,6 +568,13 @@ sshrsa.o: ../sshrsa.c ../ssh.h ../misc.h
  sshrsag.o: ../sshrsag.c ../ssh.h ../puttymem.h ../network.h ../int64.h \
                 ../misc.h
         $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) -c ../sshrsag.c
 +sshscard.o: ../sshscard.c ../ssh.h ../sshrsa.h ../pkcs11.h ../sshscard.h \
++sshscard.o: ../sshscard.c ../ssh.h ../sshrsa.h ../pkcs11.h ../ppkcs11.h ../sshscard.h \
 +               ../putty.h ../puttymem.h ../network.h ../int64.h ../misc.h \
++               ../rsaref/win32.h ../rsaref/pkcs11.h ../puttyps.h \
++               ../rsaref/unix.h ../rsaref/pkcs11t.h ../rsaref/pkcs11f.h \
++               ../puttyps.h \
 +               ../windows/winstuff.h ../mac/macstuff.h ../macosx/osx.h \
 +               ../unix/unix.h ../tree234.h ../windows/winhelp.h \
 …
                 ../misc.h
         $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) -c ../sshsh512.c
@@ -770,9 +789,10 @@
+@@ -770,9 +786,10 @@ winpgen.o: ../windows/winpgen.c ../putty
                 ../charset/charset.h
         $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) -c ../windows/winpgen.c
 …
  winpgntc.o: ../windows/winpgntc.c ../putty.h ../puttyps.h ../network.h \
                 ../misc.h ../windows/winstuff.h ../mac/macstuff.h \
+diff -udrNP putty-0.58.orig/windows/MSVC/pageant/pageant.dsp putty-0.58/windows/MSVC/pageant/pageant.dsp
+--- putty-0.58.orig/windows/MSVC/pageant/pageant.dsp    2005-06-06 11:51:12.620585624 +0200
++++ putty-0.58/windows/MSVC/pageant/pageant.dsp 2005-06-06 12:14:39.378725880 +0200
+@@ -94,6 +94,10 @@
+ # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ # Begin Source File
++SOURCE=..\..\..\libpkcs11.c
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\misc.c
+ # End Source File
+ # Begin Source File
+@@ -126,6 +130,10 @@
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\sshscard.c
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\sshsh512.c
+ # End Source File
+ # Begin Source File
+@@ -186,6 +194,10 @@
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\pkcs11.h
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\putty.h
+ # End Source File
+ # Begin Source File
+@@ -198,10 +210,38 @@
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\rsaref\pkcs11.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\rsaref\pkcs11f.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\rsaref\pkcs11t.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\rsaref\unix.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\rsaref\win32.h
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\ssh.h
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\sshrsa.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\sshscard.h
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\tree234.h
+ # End Source File
+ # Begin Source File
+diff -udrNP putty-0.58.orig/windows/MSVC/plink/plink.dsp putty-0.58/windows/MSVC/plink/plink.dsp
+--- putty-0.58.orig/windows/MSVC/plink/plink.dsp        2005-06-06 11:51:12.622585320 +0200
++++ putty-0.58/windows/MSVC/plink/plink.dsp     2005-06-06 12:14:39.379725728 +0200
+@@ -110,6 +110,14 @@
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\libpkcs11.c
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\local_cmd.c
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\logging.c
+ # End Source File
+ # Begin Source File
+@@ -207,6 +215,10 @@
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\sshscard.c
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\sshsh512.c
+ # End Source File
+ # Begin Source File
+@@ -311,6 +323,10 @@
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\pkcs11.h
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\proxy.h
+ # End Source File
+ # Begin Source File
+@@ -327,10 +343,38 @@
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\rsaref\pkcs11.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\rsaref\pkcs11f.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\rsaref\pkcs11t.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\rsaref\unix.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\rsaref\win32.h
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\ssh.h
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\sshrsa.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\sshscard.h
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\storage.h
+ # End Source File
+ # Begin Source File
+diff -udrNP putty-0.58.orig/windows/MSVC/pscp/pscp.dsp putty-0.58/windows/MSVC/pscp/pscp.dsp
+--- putty-0.58.orig/windows/MSVC/pscp/pscp.dsp  2005-06-06 11:51:12.624585016 +0200
++++ putty-0.58/windows/MSVC/pscp/pscp.dsp       2005-06-06 12:14:39.382725272 +0200
+@@ -110,6 +110,14 @@
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\libpkcs11.c
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\local_cmd.c
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\logging.c
+ # End Source File
+ # Begin Source File
+@@ -207,6 +215,10 @@
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\sshscard.c
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\sshsh512.c
+ # End Source File
+ # Begin Source File
+@@ -303,6 +315,10 @@
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\pkcs11.h
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\proxy.h
+ # End Source File
+ # Begin Source File
+@@ -323,6 +339,26 @@
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\rsaref\pkcs11.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\rsaref\pkcs11f.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\rsaref\pkcs11t.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\rsaref\unix.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\rsaref\win32.h
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\sftp.h
+ # End Source File
+ # Begin Source File
+@@ -331,6 +367,14 @@
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\sshrsa.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\sshscard.h
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\storage.h
+ # End Source File
+ # Begin Source File
+diff -udrNP putty-0.58.orig/windows/MSVC/psftp/psftp.dsp putty-0.58/windows/MSVC/psftp/psftp.dsp
+--- putty-0.58.orig/windows/MSVC/psftp/psftp.dsp        2005-06-06 11:51:12.625584864 +0200
++++ putty-0.58/windows/MSVC/psftp/psftp.dsp     2005-06-06 12:14:39.384724968 +0200
+@@ -110,6 +110,14 @@
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\libpkcs11.c
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\local_cmd.c
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\logging.c
+ # End Source File
+ # Begin Source File
+@@ -207,6 +215,10 @@
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\sshscard.c
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\sshsh512.c
+ # End Source File
+ # Begin Source File
+@@ -303,6 +315,10 @@
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\pkcs11.h
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\proxy.h
+ # End Source File
+ # Begin Source File
+@@ -323,6 +339,26 @@
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\rsaref\pkcs11.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\rsaref\pkcs11f.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\rsaref\pkcs11t.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\rsaref\unix.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\rsaref\win32.h
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\sftp.h
+ # End Source File
+ # Begin Source File
+@@ -331,6 +367,14 @@
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\sshrsa.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\sshscard.h
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\storage.h
+ # End Source File
+ # Begin Source File
+diff -udrNP putty-0.58.orig/windows/MSVC/putty/putty.dsp putty-0.58/windows/MSVC/putty/putty.dsp
+--- putty-0.58.orig/windows/MSVC/putty/putty.dsp        2005-06-06 11:51:12.627584560 +0200
++++ putty-0.58/windows/MSVC/putty/putty.dsp     2005-06-06 12:14:39.386724664 +0200
+@@ -122,6 +122,14 @@
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\libpkcs11.c
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\local_cmd.c
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\logging.c
+ # End Source File
+ # Begin Source File
+@@ -223,6 +231,10 @@
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\sshscard.c
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\sshsh512.c
+ # End Source File
+ # Begin Source File
+@@ -363,6 +375,10 @@
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\pkcs11.h
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\proxy.h
+ # End Source File
+ # Begin Source File
+@@ -379,10 +395,38 @@
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\rsaref\pkcs11.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\rsaref\pkcs11f.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\rsaref\pkcs11t.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\rsaref\unix.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\rsaref\win32.h
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\ssh.h
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\sshrsa.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\sshscard.h
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\storage.h
+ # End Source File
+ # Begin Source File
+diff -udrNP putty-0.58.orig/windows/Makefile.bor putty-0.58/windows/Makefile.bor
+--- putty-0.58.orig/windows/Makefile.bor        2005-06-06 11:51:12.584591096 +0200
++++ putty-0.58/windows/Makefile.bor     2005-06-06 12:14:39.340731656 +0200
+@@ -102,55 +102,60 @@
+diff -urNp putty-0.58.org/windows/Makefile.bor putty-0.58+smartcard/windows/Makefile.bor
+--- putty-0.58.org/windows/Makefile.bor 2005-04-05 22:40:17.000000000 +0300
++++ putty-0.58+smartcard/windows/Makefile.bor   2008-03-15 20:47:07.000000000 +0200
+@@ -102,55 +102,60 @@ BCB = $(MAKEDIR)\..
  all: pageant.exe plink.exe pscp.exe psftp.exe putty.exe puttygen.exe \
                 puttytel.exe
 …
                 winutils.obj x11fwd.obj putty.rsp
         ilink32 -aa -Gn -L$(BCB)\lib @putty.rsp
@@ -175,10 +180,11 @@
+@@ -175,10 +180,11 @@ puttytel.exe: be_nossh.obj cmdline.obj c
  pageant.rsp: $(MAKEFILE)
 …
         echo nul,cw32 import32, >> pageant.rsp
         echo pageant.res >> pageant.rsp
@@ -186,16 +192,17 @@
+@@ -186,16 +192,17 @@ pageant.rsp: $(MAKEFILE)
  plink.rsp: $(MAKEFILE)
         echo c0x32 + > plink.rsp
 …
         echo nul,cw32 import32, >> plink.rsp
         echo plink.res >> plink.rsp
@@ -203,16 +210,17 @@
+@@ -203,16 +210,17 @@ plink.rsp: $(MAKEFILE)
  pscp.rsp: $(MAKEFILE)
         echo c0x32 + > pscp.rsp
 …
         echo nul,cw32 import32, >> pscp.rsp
         echo pscp.res >> pscp.rsp
@@ -220,15 +228,16 @@
+@@ -220,15 +228,16 @@ pscp.rsp: $(MAKEFILE)
  psftp.rsp: $(MAKEFILE)
         echo c0x32 + > psftp.rsp
 …
         echo psftp.exe >> psftp.rsp
         echo nul,cw32 import32, >> psftp.rsp
@@ -237,20 +246,20 @@
+@@ -237,20 +246,20 @@ psftp.rsp: $(MAKEFILE)
  putty.rsp: $(MAKEFILE)
         echo c0w32 + > putty.rsp
 …
         echo nul,cw32 import32, >> putty.rsp
         echo win_res.res >> putty.rsp
@@ -347,6 +356,10 @@
+@@ -347,6 +356,8 @@ ldiscucs.obj: ..\ldiscucs.c ..\putty.h .
                 ..\network.h ..\misc.h ..\tree234.h ..\windows\winstuff.h \
                 ..\mac\macstuff.h ..\macosx\osx.h ..\unix\unix.h \
                 ..\puttymem.h ..\windows\winhelp.h ..\charset\charset.h
++libpkcs11.obj: ..\libpkcs11.c ..\pkcs11.h ..\rsaref\win32.h \
++               ..\rsaref\pkcs11.h ..\rsaref\unix.h ..\rsaref\pkcs11t.h \
++               ..\rsaref\pkcs11f.h
++libpkcs11.obj: ..\libpkcs11.c ..\pkcs11.h ..\ppkcs11.h
 +local_cmd.obj: ..\local_cmd.c
  localenc.obj: ..\charset\localenc.c ..\charset\charset.h \
                 ..\charset\internal.h
  logging.obj: ..\logging.c ..\putty.h ..\puttyps.h ..\network.h ..\misc.h \
@@ -524,9 +537,11 @@
+@@ -524,8 +535,9 @@ sizetip.obj: ..\windows\sizetip.c ..\put
                 ..\windows\winhelp.h ..\charset\charset.h
  slookup.obj: ..\charset\slookup.c ..\charset\charset.h ..\charset\internal.h \
 …
 -ssh.obj: ..\ssh.c ..\putty.h ..\tree234.h ..\ssh.h ..\puttyps.h ..\network.h \
 -               ..\misc.h ..\puttymem.h ..\int64.h ..\windows\winstuff.h \
 +ssh.obj: ..\ssh.c ..\putty.h ..\tree234.h ..\ssh.h ..\pkcs11.h ..\sshscard.h \
++ssh.obj: ..\ssh.c ..\putty.h ..\tree234.h ..\ssh.h ..\pkcs11.h ..\ppkcs11.h ..\sshscard.h \
 +               ..\puttyps.h ..\network.h ..\misc.h ..\puttymem.h ..\int64.h \
 +               ..\rsaref\win32.h ..\rsaref\pkcs11.h ..\windows\winstuff.h \
++               ..\windows\winstuff.h \
                 ..\mac\macstuff.h ..\macosx\osx.h ..\unix\unix.h \
-+               ..\rsaref\unix.h ..\rsaref\pkcs11t.h ..\rsaref\pkcs11f.h \
                 ..\windows\winhelp.h ..\charset\charset.h
  sshaes.obj: ..\sshaes.c ..\ssh.h ..\puttymem.h ..\network.h ..\int64.h \
+                ..\misc.h
+@@ -562,6 +577,13 @@
+@@ -562,6 +574,12 @@ sshrsa.obj: ..\sshrsa.c ..\ssh.h ..\misc
                 ..\int64.h
  sshrsag.obj: ..\sshrsag.c ..\ssh.h ..\puttymem.h ..\network.h ..\int64.h \
                 ..\misc.h
 +sshscard.obj: ..\sshscard.c ..\ssh.h ..\sshrsa.h ..\pkcs11.h ..\sshscard.h \
++sshscard.obj: ..\sshscard.c ..\ssh.h ..\sshrsa.h ..\pkcs11.h ..\ppkcs11.h ..\sshscard.h \
 +               ..\putty.h ..\puttymem.h ..\network.h ..\int64.h ..\misc.h \
++               ..\rsaref\win32.h ..\rsaref\pkcs11.h ..\puttyps.h \
++               ..\rsaref\unix.h ..\rsaref\pkcs11t.h ..\rsaref\pkcs11f.h \
++               ..\puttyps.h \
 +               ..\windows\winstuff.h ..\mac\macstuff.h ..\macosx\osx.h \
 +               ..\unix\unix.h ..\tree234.h ..\windows\winhelp.h \
 …
                 ..\misc.h
  sshsha.obj: ..\sshsha.c ..\ssh.h ..\puttymem.h ..\network.h ..\int64.h \
@@ -732,9 +754,10 @@
+@@ -732,9 +750,10 @@ winpgen.obj: ..\windows\winpgen.c ..\put
                 ..\unix\unix.h ..\tree234.h ..\windows\winhelp.h \
                 ..\charset\charset.h
 …
                 ..\misc.h ..\windows\winstuff.h ..\mac\macstuff.h \
                 ..\macosx\osx.h ..\unix\unix.h ..\puttymem.h ..\tree234.h \
+diff -udrNP putty-0.58.orig/windows/Makefile.cyg putty-0.58/windows/Makefile.cyg
+--- putty-0.58.orig/windows/Makefile.cyg        2005-06-06 11:51:12.559594896 +0200
++++ putty-0.58/windows/Makefile.cyg     2005-06-06 12:14:39.314735608 +0200
+@@ -101,96 +101,100 @@
+diff -urNp putty-0.58.org/windows/Makefile.cyg putty-0.58+smartcard/windows/Makefile.cyg
+--- putty-0.58.org/windows/Makefile.cyg 2005-04-05 22:40:17.000000000 +0300
++++ putty-0.58+smartcard/windows/Makefile.cyg   2008-03-15 21:15:25.000000000 +0200
+@@ -91,6 +91,7 @@ RC = $(TOOLPATH)windres
+ CFLAGS = -mno-cygwin -Wall -O2 -D_WINDOWS -DDEBUG -DWIN32S_COMPAT \
+                -D_NO_OLDNAMES -DNO_MULTIMON -I.././ -I../charset/ \
++               -DCRYPTOKI_FORCE_WIN32 \
+                -I../windows/ -I../unix/ -I../mac/ -I../macosx/
+ LDFLAGS = -mno-cygwin -s
+ RCFLAGS = $(RCINC) --define WIN32=1 --define _WIN32=1 --define WINVER=0x0400
+@@ -101,96 +102,100 @@ RCFLAGS = $(RCINC) --define WIN32=1 --de
  all: pageant.exe plink.exe pscp.exe psftp.exe putty.exe puttygen.exe \
                 puttytel.exe
 …
  puttygen.exe: import.o misc.o notiming.o puttygen.res.o sshaes.o sshbn.o \
                 sshdes.o sshdss.o sshdssg.o sshmd5.o sshprime.o sshpubk.o \
@@ -322,6 +326,13 @@
+@@ -322,6 +327,12 @@ ldiscucs.o: ../ldiscucs.c ../putty.h ../
                 ../puttymem.h ../windows/winhelp.h ../charset/charset.h
         $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) -c ../ldiscucs.c
++libpkcs11.o: ../libpkcs11.c ../pkcs11.h ../rsaref/win32.h ../rsaref/pkcs11.h \
++               ../rsaref/unix.h ../rsaref/pkcs11t.h ../rsaref/pkcs11f.h
++libpkcs11.o: ../libpkcs11.c ../pkcs11.h ../ppkcs11.h
 +       $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) -c ../libpkcs11.c
++
 …
         $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) -c ../charset/localenc.c
@@ -592,9 +603,11 @@
+@@ -592,8 +603,9 @@ slookup.o: ../charset/slookup.c ../chars
                 ../charset/enum.c ../charset/sbcsdat.c ../charset/utf8.c
         $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) -c ../charset/slookup.c
 …
 -ssh.o: ../ssh.c ../putty.h ../tree234.h ../ssh.h ../puttyps.h ../network.h \
 -               ../misc.h ../puttymem.h ../int64.h ../windows/winstuff.h \
 +ssh.o: ../ssh.c ../putty.h ../tree234.h ../ssh.h ../pkcs11.h ../sshscard.h \
++ssh.o: ../ssh.c ../putty.h ../tree234.h ../ssh.h ../pkcs11.h ../ppkcs11.h ../sshscard.h \
 +               ../puttyps.h ../network.h ../misc.h ../puttymem.h ../int64.h \
 +               ../rsaref/win32.h ../rsaref/pkcs11.h ../windows/winstuff.h \
++               ../windows/winstuff.h \
                 ../mac/macstuff.h ../macosx/osx.h ../unix/unix.h \
-+               ../rsaref/unix.h ../rsaref/pkcs11t.h ../rsaref/pkcs11f.h \
                 ../windows/winhelp.h ../charset/charset.h
         $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) -c ../ssh.c
+@@ -660,6 +673,15 @@
+@@ -660,6 +672,14 @@ sshrsag.o: ../sshrsag.c ../ssh.h ../putt
                 ../misc.h
         $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) -c ../sshrsag.c
 +sshscard.o: ../sshscard.c ../ssh.h ../sshrsa.h ../pkcs11.h ../sshscard.h \
++sshscard.o: ../sshscard.c ../ssh.h ../sshrsa.h ../pkcs11.h ../ppkcs11.h ../sshscard.h \
 +               ../putty.h ../puttymem.h ../network.h ../int64.h ../misc.h \
++               ../rsaref/win32.h ../rsaref/pkcs11.h ../puttyps.h \
++               ../rsaref/unix.h ../rsaref/pkcs11t.h ../rsaref/pkcs11f.h \
++               ../puttyps.h \
 +               ../windows/winstuff.h ../mac/macstuff.h ../macosx/osx.h \
 +               ../unix/unix.h ../tree234.h ../windows/winhelp.h \
 …
                 ../misc.h
         $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) -c ../sshsh512.c
@@ -920,9 +942,10 @@
+@@ -920,9 +940,10 @@ winpgen.o: ../windows/winpgen.c ../putty
         $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) -c ../windows/winpgen.c
 …
  winpgntc.o: ../windows/winpgntc.c ../putty.h ../puttyps.h ../network.h \
 diff -udrNP putty-0.58.orig/windows/Makefile.lcc putty-0.58/windows/Makefile.lcc
 --- putty-0.58.orig/windows/Makefile.lcc        2005-06-06 11:51:12.757564800 +0200
 +++ putty-0.58/windows/Makefile.lcc     2005-06-06 12:14:39.520704296 +0200
@@ -91,104 +91,110 @@
+diff -urNp putty-0.58.org/windows/Makefile.lcc putty-0.58+smartcard/windows/Makefile.lcc
+--- putty-0.58.org/windows/Makefile.lcc 2005-04-05 22:40:17.000000000 +0300
++++ putty-0.58+smartcard/windows/Makefile.lcc   2008-03-15 20:48:20.000000000 +0200
+@@ -91,104 +91,110 @@ CFLAGS = -D_WINDOWS -I..\./ -I..\charset
  all: pageant.exe plink.exe pscp.exe psftp.exe putty.exe puttygen.exe \
                 puttytel.exe
 …
  puttygen.exe: import.obj misc.obj notiming.obj puttygen.res sshaes.obj \
                 sshbn.obj sshdes.obj sshdss.obj sshdssg.obj sshmd5.obj \
@@ -305,6 +311,12 @@
+@@ -305,6 +311,10 @@ ldiscucs.obj: ..\ldiscucs.c ..\putty.h .
                 ..\mac\macstuff.h ..\macosx\osx.h ..\unix\unix.h \
                 ..\puttymem.h ..\windows\winhelp.h ..\charset\charset.h
         lcc -O -p6 $(COMPAT) $(XFLAGS) $(CFLAGS) ..\ldiscucs.c
++libpkcs11.obj: ..\libpkcs11.c ..\pkcs11.h ..\rsaref\win32.h \
++               ..\rsaref\pkcs11.h ..\rsaref\unix.h ..\rsaref\pkcs11t.h \
++               ..\rsaref\pkcs11f.h
++libpkcs11.obj: ..\libpkcs11.c ..\pkcs11.h ..\ppkcs11.h
 +       lcc -O -p6 $(COMPAT) $(XFLAGS) $(CFLAGS) ..\libpkcs11.c
 +local_cmd.obj: ..\local_cmd.c
 …
                 ..\charset\internal.h
         lcc -O -p6 $(COMPAT) $(XFLAGS) $(CFLAGS) ..\charset\localenc.c
@@ -530,9 +542,11 @@
+@@ -530,8 +540,9 @@ sizetip.obj: ..\windows\sizetip.c ..\put
  slookup.obj: ..\charset\slookup.c ..\charset\charset.h ..\charset\internal.h \
                 ..\charset\enum.c ..\charset\sbcsdat.c ..\charset\utf8.c
 …
 -ssh.obj: ..\ssh.c ..\putty.h ..\tree234.h ..\ssh.h ..\puttyps.h ..\network.h \
 -               ..\misc.h ..\puttymem.h ..\int64.h ..\windows\winstuff.h \
 +ssh.obj: ..\ssh.c ..\putty.h ..\tree234.h ..\ssh.h ..\pkcs11.h ..\sshscard.h \
++ssh.obj: ..\ssh.c ..\putty.h ..\tree234.h ..\ssh.h ..\pkcs11.h ..\ppkcs11.h ..\sshscard.h \
 +               ..\puttyps.h ..\network.h ..\misc.h ..\puttymem.h ..\int64.h \
 +               ..\rsaref\win32.h ..\rsaref\pkcs11.h ..\windows\winstuff.h \
++               ..\windows\winstuff.h \
                 ..\mac\macstuff.h ..\macosx\osx.h ..\unix\unix.h \
-+               ..\rsaref\unix.h ..\rsaref\pkcs11t.h ..\rsaref\pkcs11f.h \
                 ..\windows\winhelp.h ..\charset\charset.h
         lcc -O -p6 $(COMPAT) $(XFLAGS) $(CFLAGS) ..\ssh.c
+ sshaes.obj: ..\sshaes.c ..\ssh.h ..\puttymem.h ..\network.h ..\int64.h \
+@@ -584,6 +598,14 @@
+@@ -584,6 +595,13 @@ sshrsa.obj: ..\sshrsa.c ..\ssh.h ..\misc
  sshrsag.obj: ..\sshrsag.c ..\ssh.h ..\puttymem.h ..\network.h ..\int64.h \
                 ..\misc.h
         lcc -O -p6 $(COMPAT) $(XFLAGS) $(CFLAGS) ..\sshrsag.c
 +sshscard.obj: ..\sshscard.c ..\ssh.h ..\sshrsa.h ..\pkcs11.h ..\sshscard.h \
++sshscard.obj: ..\sshscard.c ..\ssh.h ..\sshrsa.h ..\pkcs11.h ..\ppkcs11.h ..\sshscard.h \
 +               ..\putty.h ..\puttymem.h ..\network.h ..\int64.h ..\misc.h \
++               ..\rsaref\win32.h ..\rsaref\pkcs11.h ..\puttyps.h \
++               ..\rsaref\unix.h ..\rsaref\pkcs11t.h ..\rsaref\pkcs11f.h \
++               ..\puttyps.h \
 +               ..\windows\winstuff.h ..\mac\macstuff.h ..\macosx\osx.h \
 +               ..\unix\unix.h ..\tree234.h ..\windows\winhelp.h \
 …
                 ..\misc.h
         lcc -O -p6 $(COMPAT) $(XFLAGS) $(CFLAGS) ..\sshsh512.c
@@ -799,9 +821,10 @@
+@@ -799,9 +817,10 @@ winpgen.obj: ..\windows\winpgen.c ..\put
                 ..\charset\charset.h
         lcc -O -p6 $(COMPAT) $(XFLAGS) $(CFLAGS) ..\windows\winpgen.c
 …
  winpgntc.obj: ..\windows\winpgntc.c ..\putty.h ..\puttyps.h ..\network.h \
                 ..\misc.h ..\windows\winstuff.h ..\mac\macstuff.h \
 diff -udrNP putty-0.58.orig/windows/Makefile.vc putty-0.58/windows/Makefile.vc
 --- putty-0.58.orig/windows/Makefile.vc 2005-06-06 11:51:12.606587752 +0200
 +++ putty-0.58/windows/Makefile.vc      2005-06-06 12:14:39.363728160 +0200
@@ -91,55 +91,60 @@
+diff -urNp putty-0.58.org/windows/Makefile.vc putty-0.58+smartcard/windows/Makefile.vc
+--- putty-0.58.org/windows/Makefile.vc  2005-04-05 22:40:17.000000000 +0300
++++ putty-0.58+smartcard/windows/Makefile.vc    2008-03-15 20:45:38.000000000 +0200
+@@ -91,55 +91,60 @@ LFLAGS = /incremental:no /fixed
  all: pageant.exe plink.exe pscp.exe psftp.exe putty.exe puttygen.exe \
                 puttytel.exe
 …
                 winutils.obj x11fwd.obj putty.rsp
         link $(LFLAGS) -out:putty.exe -map:putty.map @putty.rsp
@@ -165,76 +170,79 @@
+@@ -165,76 +170,79 @@ puttytel.exe: be_nossh.obj cmdline.obj c
  pageant.rsp: $(MAKEFILE)
         echo /nologo /subsystem:windows > pageant.rsp
 …
         echo user32.lib version.obj wcwidth.obj wildcard.obj >> putty.rsp
         echo win_res.res wincfg.obj winctrls.obj windefs.obj >> putty.rsp
@@ -370,6 +378,14 @@
+@@ -370,6 +378,12 @@ ldiscucs.obj: ..\ldiscucs.c ..\putty.h .
                 ..\puttymem.h ..\windows\winhelp.h ..\charset\charset.h
         cl $(COMPAT) $(XFLAGS) $(CFLAGS) /c ..\ldiscucs.c
++libpkcs11.obj: ..\libpkcs11.c ..\pkcs11.h ..\rsaref\win32.h \
++               ..\rsaref\pkcs11.h ..\rsaref\unix.h ..\rsaref\pkcs11t.h \
++               ..\rsaref\pkcs11f.h
++libpkcs11.obj: ..\libpkcs11.c ..\pkcs11.h ..\ppkcs11.h
 +       cl $(COMPAT) $(XFLAGS) $(CFLAGS) /c ..\libpkcs11.c
++
 …
                 ..\charset\internal.h
         cl $(COMPAT) $(XFLAGS) $(CFLAGS) /c ..\charset\localenc.c
@@ -643,9 +659,11 @@
+@@ -643,8 +657,9 @@ slookup.obj: ..\charset\slookup.c ..\cha
                 ..\charset\enum.c ..\charset\sbcsdat.c ..\charset\utf8.c
         cl $(COMPAT) $(XFLAGS) $(CFLAGS) /c ..\charset\slookup.c
 …
 -ssh.obj: ..\ssh.c ..\putty.h ..\tree234.h ..\ssh.h ..\puttyps.h ..\network.h \
 -               ..\misc.h ..\puttymem.h ..\int64.h ..\windows\winstuff.h \
 +ssh.obj: ..\ssh.c ..\putty.h ..\tree234.h ..\ssh.h ..\pkcs11.h ..\sshscard.h \
++ssh.obj: ..\ssh.c ..\putty.h ..\tree234.h ..\ssh.h ..\pkcs11.h ..\ppkcs11.h \
 +               ..\puttyps.h ..\network.h ..\misc.h ..\puttymem.h ..\int64.h \
 +               ..\rsaref\win32.h ..\rsaref\pkcs11.h ..\windows\winstuff.h \
++               ..\windows\winstuff.h \
                 ..\mac\macstuff.h ..\macosx\osx.h ..\unix\unix.h \
-+               ..\rsaref\unix.h ..\rsaref\pkcs11t.h ..\rsaref\pkcs11f.h \
                 ..\windows\winhelp.h ..\charset\charset.h
         cl $(COMPAT) $(XFLAGS) $(CFLAGS) /c ..\ssh.c
+@@ -713,6 +731,15 @@
+@@ -713,6 +728,14 @@ sshrsag.obj: ..\sshrsag.c ..\ssh.h ..\pu
                 ..\misc.h
         cl $(COMPAT) $(XFLAGS) $(CFLAGS) /c ..\sshrsag.c
 +sshscard.obj: ..\sshscard.c ..\ssh.h ..\sshrsa.h ..\pkcs11.h ..\sshscard.h \
++sshscard.obj: ..\sshscard.c ..\ssh.h ..\sshrsa.h ..\pkcs11.h ..\ppkcs11.h ..\sshscard.h \
 +               ..\putty.h ..\puttymem.h ..\network.h ..\int64.h ..\misc.h \
++               ..\rsaref\win32.h ..\rsaref\pkcs11.h ..\puttyps.h \
++               ..\rsaref\unix.h ..\rsaref\pkcs11t.h ..\rsaref\pkcs11f.h \
++               ..\puttyps.h \
 +               ..\windows\winstuff.h ..\mac\macstuff.h ..\macosx\osx.h \
 +               ..\unix\unix.h ..\tree234.h ..\windows\winhelp.h \
 …
                 ..\misc.h
         cl $(COMPAT) $(XFLAGS) $(CFLAGS) /c ..\sshsh512.c
@@ -973,9 +1000,10 @@
+@@ -973,9 +996,10 @@ winpgen.obj: ..\windows\winpgen.c ..\put
         cl $(COMPAT) $(XFLAGS) $(CFLAGS) /c ..\windows\winpgen.c
 …
  winpgntc.obj: ..\windows\winpgntc.c ..\putty.h ..\puttyps.h ..\network.h \
+diff -udrNP putty-0.58.orig/windows/winhelp.h putty-0.58/windows/winhelp.h
+--- putty-0.58.orig/windows/winhelp.h   2005-04-05 21:37:38.000000000 +0200
++++ putty-0.58/windows/winhelp.h        2005-06-06 11:50:58.579720160 +0200
+diff -urNp putty-0.58.org/windows/MSVC/pageant/pageant.dsp putty-0.58+smartcard/windows/MSVC/pageant/pageant.dsp
+--- putty-0.58.org/windows/MSVC/pageant/pageant.dsp     2005-04-05 22:40:17.000000000 +0300
++++ putty-0.58+smartcard/windows/MSVC/pageant/pageant.dsp       2008-03-15 21:11:47.000000000 +0200
+@@ -94,6 +94,10 @@ LINK32=link.exe
+ # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+ # Begin Source File
++SOURCE=..\..\..\libpkcs11.c
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\misc.c
+ # End Source File
+ # Begin Source File
+@@ -126,6 +130,10 @@ SOURCE=..\..\..\sshrsa.c
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\sshscard.c
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\sshsh512.c
+ # End Source File
+ # Begin Source File
+@@ -186,6 +194,14 @@ SOURCE=..\..\..\network.h
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\pkcs11.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\ppkcs11.h
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\putty.h
+ # End Source File
+ # Begin Source File
+@@ -202,6 +218,14 @@ SOURCE=..\..\..\ssh.h
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\sshrsa.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\sshscard.h
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\tree234.h
+ # End Source File
+ # Begin Source File
+diff -urNp putty-0.58.org/windows/MSVC/plink/plink.dsp putty-0.58+smartcard/windows/MSVC/plink/plink.dsp
+--- putty-0.58.org/windows/MSVC/plink/plink.dsp 2005-04-05 22:40:17.000000000 +0300
++++ putty-0.58+smartcard/windows/MSVC/plink/plink.dsp   2008-03-15 21:12:13.000000000 +0200
+@@ -110,6 +110,14 @@ SOURCE=..\..\..\ldisc.c
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\libpkcs11.c
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\local_cmd.c
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\logging.c
+ # End Source File
+ # Begin Source File
+@@ -207,6 +215,10 @@ SOURCE=..\..\..\sshrsa.c
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\sshscard.c
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\sshsh512.c
+ # End Source File
+ # Begin Source File
+@@ -311,6 +323,14 @@ SOURCE=..\..\..\network.h
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\pkcs11.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\ppkcs11.h
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\proxy.h
+ # End Source File
+ # Begin Source File
+@@ -331,6 +351,14 @@ SOURCE=..\..\..\ssh.h
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\sshrsa.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\sshscard.h
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\storage.h
+ # End Source File
+ # Begin Source File
+diff -urNp putty-0.58.org/windows/MSVC/pscp/pscp.dsp putty-0.58+smartcard/windows/MSVC/pscp/pscp.dsp
+--- putty-0.58.org/windows/MSVC/pscp/pscp.dsp   2005-04-05 22:40:17.000000000 +0300
++++ putty-0.58+smartcard/windows/MSVC/pscp/pscp.dsp     2008-03-15 21:12:37.000000000 +0200
+@@ -110,6 +110,14 @@ SOURCE=..\..\..\int64.c
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\libpkcs11.c
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\local_cmd.c
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\logging.c
+ # End Source File
+ # Begin Source File
+@@ -207,6 +215,10 @@ SOURCE=..\..\..\sshrsa.c
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\sshscard.c
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\sshsh512.c
+ # End Source File
+ # Begin Source File
+@@ -303,6 +315,14 @@ SOURCE=..\..\..\network.h
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\pkcs11.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\ppkcs11.h
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\proxy.h
+ # End Source File
+ # Begin Source File
+@@ -331,6 +351,14 @@ SOURCE=..\..\..\ssh.h
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\sshrsa.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\sshscard.h
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\storage.h
+ # End Source File
+ # Begin Source File
+diff -urNp putty-0.58.org/windows/MSVC/psftp/psftp.dsp putty-0.58+smartcard/windows/MSVC/psftp/psftp.dsp
+--- putty-0.58.org/windows/MSVC/psftp/psftp.dsp 2005-04-05 22:40:17.000000000 +0300
++++ putty-0.58+smartcard/windows/MSVC/psftp/psftp.dsp   2008-03-15 21:13:10.000000000 +0200
+@@ -110,6 +110,14 @@ SOURCE=..\..\..\int64.c
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\libpkcs11.c
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\local_cmd.c
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\logging.c
+ # End Source File
+ # Begin Source File
+@@ -207,6 +215,10 @@ SOURCE=..\..\..\sshrsa.c
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\sshscard.c
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\sshsh512.c
+ # End Source File
+ # Begin Source File
+@@ -303,6 +315,14 @@ SOURCE=..\..\..\network.h
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\pkcs11.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\ppkcs11.h
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\proxy.h
+ # End Source File
+ # Begin Source File
+@@ -331,6 +351,14 @@ SOURCE=..\..\..\ssh.h
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\sshrsa.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\sshscard.h
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\storage.h
+ # End Source File
+ # Begin Source File
+diff -urNp putty-0.58.org/windows/MSVC/putty/putty.dsp putty-0.58+smartcard/windows/MSVC/putty/putty.dsp
+--- putty-0.58.org/windows/MSVC/putty/putty.dsp 2005-04-05 22:40:17.000000000 +0300
++++ putty-0.58+smartcard/windows/MSVC/putty/putty.dsp   2008-03-15 21:13:29.000000000 +0200
+@@ -122,6 +122,14 @@ SOURCE=..\..\..\ldiscucs.c
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\libpkcs11.c
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\local_cmd.c
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\logging.c
+ # End Source File
+ # Begin Source File
+@@ -223,6 +231,10 @@ SOURCE=..\..\..\sshrsa.c
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\sshscard.c
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\sshsh512.c
+ # End Source File
+ # Begin Source File
+@@ -363,6 +375,14 @@ SOURCE=..\..\..\network.h
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\pkcs11.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\ppkcs11.h
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\proxy.h
+ # End Source File
+ # Begin Source File
+@@ -383,6 +403,14 @@ SOURCE=..\..\..\ssh.h
+ # End Source File
+ # Begin Source File
++SOURCE=..\..\..\sshrsa.h
++# End Source File
++# Begin Source File
++
++SOURCE=..\..\..\sshscard.h
++# End Source File
++# Begin Source File
++
+ SOURCE=..\..\..\storage.h
+ # End Source File
+ # Begin Source File
+diff -urNp putty-0.58.org/windows/winhelp.h putty-0.58+smartcard/windows/winhelp.h
+--- putty-0.58.org/windows/winhelp.h    2005-04-05 22:37:38.000000000 +0300
++++ putty-0.58+smartcard/windows/winhelp.h      2005-06-06 12:50:58.000000000 +0300
@@ -99,6 +99,9 @@
  #define WINHELP_CTX_ssh_auth_changeuser "ssh.auth.changeuser"
 …
  #define WINHELP_CTX_ssh_tunnels_x11auth "ssh.tunnels.x11auth"
  #define WINHELP_CTX_ssh_tunnels_portfwd "ssh.tunnels.portfwd"
 diff -udrNP putty-0.58.orig/windows/winpgnt.c putty-0.58/windows/winpgnt.c
 --- putty-0.58.orig/windows/winpgnt.c   2005-04-05 21:37:38.000000000 +0200
 +++ putty-0.58/windows/winpgnt.c        2005-06-06 11:51:02.168174632 +0200
+diff -urNp putty-0.58.org/windows/winpgnt.c putty-0.58+smartcard/windows/winpgnt.c
+--- putty-0.58.org/windows/winpgnt.c    2005-04-05 22:37:38.000000000 +0300
++++ putty-0.58+smartcard/windows/winpgnt.c      2005-06-06 12:51:02.000000000 +0300
@@ -15,6 +15,8 @@
  #include "misc.h"
 …
  #ifndef NO_SECURITY
@@ -67,9 +69,16 @@
+@@ -67,9 +69,16 @@ static filereq *keypath = NULL;
  #define PUTTY_DEFAULT     "Default%20Settings"
  static int initial_menuitems_count;
 …
+ {
      va_list ap;
@@ -409,7 +418,7 @@
+@@ -409,7 +418,7 @@ static void add_keyfile(Filename filenam
      int original_pass;
 …
                               key_type_to_str(type));
         message_box(msg, APPNAME, MB_OK | MB_ICONERROR,
@@ -438,7 +447,12 @@
+@@ -438,7 +447,12 @@ static void add_keyfile(Filename filenam
             keylist = get_keylist1(&keylistlen);
         } else {
 …
                 char *msg = dupprintf("Couldn't load private key (%s)", error);
                 message_box(msg, APPNAME, MB_OK | MB_ICONERROR,
@@ -526,7 +540,11 @@
+@@ -526,7 +540,11 @@ static void add_keyfile(Filename filenam
      error = NULL;
      if (type == SSH_KEYTYPE_SSH1)
 …
      attempts = 0;
      if (type == SSH_KEYTYPE_SSH1)
@@ -535,10 +553,10 @@
+@@ -535,10 +553,10 @@ static void add_keyfile(Filename filenam
      pps.comment = comment;
      original_pass = 0;
 …
             } else {
                 int dlgret;
@@ -559,7 +577,10 @@
+@@ -559,7 +577,10 @@ static void add_keyfile(Filename filenam
         if (type == SSH_KEYTYPE_SSH1)
             ret = loadrsakey(&filename, rkey, passphrase, &error);
 …
                 ret = -1;
             else if (!skey)
@@ -638,12 +659,19 @@
+@@ -638,12 +659,19 @@ static void add_keyfile(Filename filenam
         } else {
             if (add234(rsakeys, rkey) != rkey)
 …
             clen = strlen(skey->comment);
@@ -686,6 +714,7 @@
+@@ -686,6 +714,7 @@ static void add_keyfile(Filename filenam
             if (add234(ssh2keys, skey) != skey) {
                 skey->alg->freekey(skey->data);
 …
+        }
+     }
@@ -1009,9 +1038,14 @@
+@@ -1009,9 +1038,14 @@ static void answer_msg(void *msg)
             if (msgend < p+datalen)
                 goto failure;
 …
             len = 5 + 4 + siglen;
             PUT_32BIT(ret, len - 4);
@@ -1285,6 +1319,7 @@
+@@ -1285,6 +1319,7 @@ static void answer_msg(void *msg)
         /*
          * Unrecognised message. Return SSH_AGENT_FAILURE.
 …
         ret[4] = SSH_AGENT_FAILURE;
         break;
@@ -2095,6 +2130,7 @@
+@@ -2095,6 +2130,7 @@ int WINAPI WinMain(HINSTANCE inst, HINST
                 command = "";
             break;

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 100

Legend:

trunk/putty-0.58-smartcard.diff

Download in other formats: