diff options
-rw-r--r-- | lib/libsectok/atr.c | 65 | ||||
-rw-r--r-- | lib/libsectok/cmdtab.c | 66 | ||||
-rw-r--r-- | lib/libsectok/ifdhandler.c | 65 | ||||
-rw-r--r-- | lib/libsectok/ifdhandler.h | 66 | ||||
-rw-r--r-- | lib/libsectok/input.c | 65 | ||||
-rw-r--r-- | lib/libsectok/r1r2.c | 65 | ||||
-rw-r--r-- | lib/libsectok/readers.c | 65 | ||||
-rw-r--r-- | lib/libsectok/sc7816.c | 75 | ||||
-rw-r--r-- | lib/libsectok/scT1.c | 63 | ||||
-rw-r--r-- | lib/libsectok/scio.c | 65 | ||||
-rw-r--r-- | lib/libsectok/scrw.c | 65 | ||||
-rw-r--r-- | lib/libsectok/sectok.h | 66 | ||||
-rw-r--r-- | lib/libsectok/todos_atr.c | 65 | ||||
-rw-r--r-- | lib/libsectok/todos_scrw.h | 46 |
14 files changed, 433 insertions, 469 deletions
diff --git a/lib/libsectok/atr.c b/lib/libsectok/atr.c index 2549f70293a..bff4f498cb9 100644 --- a/lib/libsectok/atr.c +++ b/lib/libsectok/atr.c @@ -1,11 +1,40 @@ +/* $Id: atr.c,v 1.3 2001/06/08 15:04:02 rees Exp $ */ + +/* +copyright 1997, 1999, 2000, 2001 +the regents of the university of michigan +all rights reserved + +permission is granted to use, copy, create derivative works +and redistribute this software and such derivative works +for any purpose, so long as the name of the university of +michigan is not used in any advertising or publicity +pertaining to the use or distribution of this software +without specific, written prior authorization. if the +above copyright notice or any other identification of the +university of michigan is included in any copy of any +portion of this software, then the disclaimer below must +also be included. + +this software is provided as is, without representation +from the university of michigan as to its fitness for any +purpose, and without warranty by the university of +michigan of any kind, either express or implied, including +without limitation the implied warranties of +merchantability and fitness for a particular purpose. the +regents of the university of michigan shall not be liable +for any damages, including special, indirect, incidental, or +consequential damages, with respect to any claim arising +out of or in connection with the use of the software, even +if it has been or is hereafter advised of the possibility of +such damages. +*/ + /* * Parse smart card atr, return proto params * - * See copyright notice at end of file - * * Jim Rees, University of Michigan CITI */ -static char *rcsid = "$Id: atr.c,v 1.2 2001/06/07 16:09:59 rees Exp $"; #ifdef __palmos__ #include <Common.h> @@ -287,33 +316,3 @@ parse_atr(int ttyn, int flags, unsigned char *atr, int len, struct scparam *para return len; } - -/* -copyright 1997, 1999, 2000, 2001 -the regents of the university of michigan -all rights reserved - -permission is granted to use, copy, create derivative works -and redistribute this software and such derivative works -for any purpose, so long as the name of the university of -michigan is not used in any advertising or publicity -pertaining to the use or distribution of this software -without specific, written prior authorization. if the -above copyright notice or any other identification of the -university of michigan is included in any copy of any -portion of this software, then the disclaimer below must -also be included. - -this software is provided as is, without representation -from the university of michigan as to its fitness for any -purpose, and without warranty by the university of -michigan of any kind, either express or implied, including -without limitation the implied warranties of -merchantability and fitness for a particular purpose. the -regents of the university of michigan shall not be liable -for any damages, including special, indirect, incidental, or -consequential damages, with respect to any claim arising -out of or in connection with the use of the software, even -if it has been or is hereafter advised of the possibility of -such damages. -*/ diff --git a/lib/libsectok/cmdtab.c b/lib/libsectok/cmdtab.c index 62b626c6e66..ca89dd40c67 100644 --- a/lib/libsectok/cmdtab.c +++ b/lib/libsectok/cmdtab.c @@ -1,8 +1,38 @@ +/* $Id: cmdtab.c,v 1.3 2001/06/08 15:04:02 rees Exp $ */ + /* - * See copyright notice at end of file - */ +copyright 1999 +the regents of the university of michigan +all rights reserved + +permission is granted to use, copy, create derivative works +and redistribute this software and such derivative works +for any purpose, so long as the name of the university of +michigan is not used in any advertising or publicity +pertaining to the use or distribution of this software +without specific, written prior authorization. if the +above copyright notice or any other identification of the +university of michigan is included in any copy of any +portion of this software, then the disclaimer below must +also be included. -static char *rcsid = "$Id: cmdtab.c,v 1.2 2001/06/07 16:09:59 rees Exp $"; +this software is provided as is, without representation +from the university of michigan as to its fitness for any +purpose, and without warranty by the university of +michigan of any kind, either express or implied, including +without limitation the implied warranties of +merchantability and fitness for a particular purpose. the +regents of the university of michigan shall not be liable +for any damages, including special, indirect, incidental, or +consequential damages, with respect to any claim arising +out of or in connection with the use of the software, even +if it has been or is hereafter advised of the possibility of +such damages. +*/ + +/* + * Translate from apdu P1 to apdu name + */ #ifdef __palmos__ #include <Common.h> @@ -112,33 +142,3 @@ lookup_cmdname(int ins) { return lookup_cmd(ins)->name; } - -/* -copyright 1999 -the regents of the university of michigan -all rights reserved - -permission is granted to use, copy, create derivative works -and redistribute this software and such derivative works -for any purpose, so long as the name of the university of -michigan is not used in any advertising or publicity -pertaining to the use or distribution of this software -without specific, written prior authorization. if the -above copyright notice or any other identification of the -university of michigan is included in any copy of any -portion of this software, then the disclaimer below must -also be included. - -this software is provided as is, without representation -from the university of michigan as to its fitness for any -purpose, and without warranty by the university of -michigan of any kind, either express or implied, including -without limitation the implied warranties of -merchantability and fitness for a particular purpose. the -regents of the university of michigan shall not be liable -for any damages, including special, indirect, incidental, or -consequential damages, with respect to any claim arising -out of or in connection with the use of the software, even -if it has been or is hereafter advised of the possibility of -such damages. -*/ diff --git a/lib/libsectok/ifdhandler.c b/lib/libsectok/ifdhandler.c index b09bfa65722..ad4a07ef3b2 100644 --- a/lib/libsectok/ifdhandler.c +++ b/lib/libsectok/ifdhandler.c @@ -1,11 +1,40 @@ +/* $Id: ifdhandler.c,v 1.4 2001/06/08 15:04:02 rees Exp $ */ + +/* +copyright 2000 +the regents of the university of michigan +all rights reserved + +permission is granted to use, copy, create derivative works +and redistribute this software and such derivative works +for any purpose, so long as the name of the university of +michigan is not used in any advertising or publicity +pertaining to the use or distribution of this software +without specific, written prior authorization. if the +above copyright notice or any other identification of the +university of michigan is included in any copy of any +portion of this software, then the disclaimer below must +also be included. + +this software is provided as is, without representation +from the university of michigan as to its fitness for any +purpose, and without warranty by the university of +michigan of any kind, either express or implied, including +without limitation the implied warranties of +merchantability and fitness for a particular purpose. the +regents of the university of michigan shall not be liable +for any damages, including special, indirect, incidental, or +consequential damages, with respect to any claim arising +out of or in connection with the use of the software, even +if it has been or is hereafter advised of the possibility of +such damages. +*/ + /* * IFD handler for CITI sc7816 dumb reader driver * - * See copyright notice at end of file - * * Jim Rees, University of Michigan CITI, August 2000 */ -static char *rcsid = "$Id: ifdhandler.c,v 1.3 2001/06/07 20:19:42 rees Exp $"; #include <sys/types.h> #include <stdio.h> @@ -230,33 +259,3 @@ IFD_Is_ICC_Present() { return (todos_sccardpresent(CT_ttyn) ? IFD_ICC_PRESENT : IFD_ICC_NOT_PRESENT); } - -/* -copyright 2000 -the regents of the university of michigan -all rights reserved - -permission is granted to use, copy, create derivative works -and redistribute this software and such derivative works -for any purpose, so long as the name of the university of -michigan is not used in any advertising or publicity -pertaining to the use or distribution of this software -without specific, written prior authorization. if the -above copyright notice or any other identification of the -university of michigan is included in any copy of any -portion of this software, then the disclaimer below must -also be included. - -this software is provided as is, without representation -from the university of michigan as to its fitness for any -purpose, and without warranty by the university of -michigan of any kind, either express or implied, including -without limitation the implied warranties of -merchantability and fitness for a particular purpose. the -regents of the university of michigan shall not be liable -for any damages, including special, indirect, incidental, or -consequential damages, with respect to any claim arising -out of or in connection with the use of the software, even -if it has been or is hereafter advised of the possibility of -such damages. -*/ diff --git a/lib/libsectok/ifdhandler.h b/lib/libsectok/ifdhandler.h index 8d148a560fd..578c53c488a 100644 --- a/lib/libsectok/ifdhandler.h +++ b/lib/libsectok/ifdhandler.h @@ -1,9 +1,37 @@ +/* $Id: ifdhandler.h,v 1.2 2001/06/08 15:04:03 rees Exp $ */ + +/* +copyright 2001 +the regents of the university of michigan +all rights reserved + +permission is granted to use, copy, create derivative works +and redistribute this software and such derivative works +for any purpose, so long as the name of the university of +michigan is not used in any advertising or publicity +pertaining to the use or distribution of this software +without specific, written prior authorization. if the +above copyright notice or any other identification of the +university of michigan is included in any copy of any +portion of this software, then the disclaimer below must +also be included. + +this software is provided as is, without representation +from the university of michigan as to its fitness for any +purpose, and without warranty by the university of +michigan of any kind, either express or implied, including +without limitation the implied warranties of +merchantability and fitness for a particular purpose. the +regents of the university of michigan shall not be liable +for any damages, including special, indirect, incidental, or +consequential damages, with respect to any claim arising +out of or in connection with the use of the software, even +if it has been or is hereafter advised of the possibility of +such damages. +*/ + /* * pcsc cruft - * - * See copyright notice at end of file - * - * $Id: ifdhandler.h,v 1.1 2001/06/07 15:17:32 rees Exp $ */ #define MAX_ATR_SIZE 33 @@ -36,33 +64,3 @@ u_long IFD_Transmit_to_ICC(struct SCARD_IO_HEADER SendPci, u_char ibuf[], u_long ilen, u_char obuf[], u_long *olen, struct SCARD_IO_HEADER *RecvPci); u_long IFD_Is_ICC_Present(); - -/* -copyright 2001 -the regents of the university of michigan -all rights reserved - -permission is granted to use, copy, create derivative works -and redistribute this software and such derivative works -for any purpose, so long as the name of the university of -michigan is not used in any advertising or publicity -pertaining to the use or distribution of this software -without specific, written prior authorization. if the -above copyright notice or any other identification of the -university of michigan is included in any copy of any -portion of this software, then the disclaimer below must -also be included. - -this software is provided as is, without representation -from the university of michigan as to its fitness for any -purpose, and without warranty by the university of -michigan of any kind, either express or implied, including -without limitation the implied warranties of -merchantability and fitness for a particular purpose. the -regents of the university of michigan shall not be liable -for any damages, including special, indirect, incidental, or -consequential damages, with respect to any claim arising -out of or in connection with the use of the software, even -if it has been or is hereafter advised of the possibility of -such damages. -*/ diff --git a/lib/libsectok/input.c b/lib/libsectok/input.c index c93fa9dee0e..014525b9abb 100644 --- a/lib/libsectok/input.c +++ b/lib/libsectok/input.c @@ -1,11 +1,40 @@ +/* $Id: input.c,v 1.3 2001/06/08 15:04:03 rees Exp $ */ + +/* +copyright 2001 +the regents of the university of michigan +all rights reserved + +permission is granted to use, copy, create derivative works +and redistribute this software and such derivative works +for any purpose, so long as the name of the university of +michigan is not used in any advertising or publicity +pertaining to the use or distribution of this software +without specific, written prior authorization. if the +above copyright notice or any other identification of the +university of michigan is included in any copy of any +portion of this software, then the disclaimer below must +also be included. + +this software is provided as is, without representation +from the university of michigan as to its fitness for any +purpose, and without warranty by the university of +michigan of any kind, either express or implied, including +without limitation the implied warranties of +merchantability and fitness for a particular purpose. the +regents of the university of michigan shall not be liable +for any damages, including special, indirect, incidental, or +consequential damages, with respect to any claim arising +out of or in connection with the use of the software, even +if it has been or is hereafter advised of the possibility of +such damages. +*/ + /* * turn text into hex in a flexible way * - * See copyright notice at end of file - * * Jim Rees, University of Michigan, July 2000 */ -static char *rcsid = "$Id: input.c,v 1.2 2001/06/07 16:09:59 rees Exp $"; #include <stdio.h> #include <ctype.h> @@ -104,33 +133,3 @@ parse_input(char *ibuf, unsigned char *obuf, int olen) return (up - obuf); } - -/* -copyright 2001 -the regents of the university of michigan -all rights reserved - -permission is granted to use, copy, create derivative works -and redistribute this software and such derivative works -for any purpose, so long as the name of the university of -michigan is not used in any advertising or publicity -pertaining to the use or distribution of this software -without specific, written prior authorization. if the -above copyright notice or any other identification of the -university of michigan is included in any copy of any -portion of this software, then the disclaimer below must -also be included. - -this software is provided as is, without representation -from the university of michigan as to its fitness for any -purpose, and without warranty by the university of -michigan of any kind, either express or implied, including -without limitation the implied warranties of -merchantability and fitness for a particular purpose. the -regents of the university of michigan shall not be liable -for any damages, including special, indirect, incidental, or -consequential damages, with respect to any claim arising -out of or in connection with the use of the software, even -if it has been or is hereafter advised of the possibility of -such damages. -*/ diff --git a/lib/libsectok/r1r2.c b/lib/libsectok/r1r2.c index af079c0ab92..a2c303cb514 100644 --- a/lib/libsectok/r1r2.c +++ b/lib/libsectok/r1r2.c @@ -1,9 +1,38 @@ +/* $Id: r1r2.c,v 1.3 2001/06/08 15:04:03 rees Exp $ */ + +/* +copyright 1999 +the regents of the university of michigan +all rights reserved + +permission is granted to use, copy, create derivative works +and redistribute this software and such derivative works +for any purpose, so long as the name of the university of +michigan is not used in any advertising or publicity +pertaining to the use or distribution of this software +without specific, written prior authorization. if the +above copyright notice or any other identification of the +university of michigan is included in any copy of any +portion of this software, then the disclaimer below must +also be included. + +this software is provided as is, without representation +from the university of michigan as to its fitness for any +purpose, and without warranty by the university of +michigan of any kind, either express or implied, including +without limitation the implied warranties of +merchantability and fitness for a particular purpose. the +regents of the university of michigan shall not be liable +for any damages, including special, indirect, incidental, or +consequential damages, with respect to any claim arising +out of or in connection with the use of the software, even +if it has been or is hereafter advised of the possibility of +such damages. +*/ + /* * Return text for a given pair of sw1/sw2 status bytes - * - * See copyright notice at end of file */ -static char *rcsid = "$Id: r1r2.c,v 1.2 2001/06/07 16:10:00 rees Exp $"; #ifdef __palmos__ #define NULL 0 @@ -126,33 +155,3 @@ dump_reply(unsigned char *p, int n, int r1, int r2) return fdump_reply(stdout, p, n, r1, r2); } #endif - -/* -copyright 1999 -the regents of the university of michigan -all rights reserved - -permission is granted to use, copy, create derivative works -and redistribute this software and such derivative works -for any purpose, so long as the name of the university of -michigan is not used in any advertising or publicity -pertaining to the use or distribution of this software -without specific, written prior authorization. if the -above copyright notice or any other identification of the -university of michigan is included in any copy of any -portion of this software, then the disclaimer below must -also be included. - -this software is provided as is, without representation -from the university of michigan as to its fitness for any -purpose, and without warranty by the university of -michigan of any kind, either express or implied, including -without limitation the implied warranties of -merchantability and fitness for a particular purpose. the -regents of the university of michigan shall not be liable -for any damages, including special, indirect, incidental, or -consequential damages, with respect to any claim arising -out of or in connection with the use of the software, even -if it has been or is hereafter advised of the possibility of -such damages. -*/ diff --git a/lib/libsectok/readers.c b/lib/libsectok/readers.c index 2818e9e9e5b..8ede7fbd971 100644 --- a/lib/libsectok/readers.c +++ b/lib/libsectok/readers.c @@ -1,12 +1,41 @@ +/* $Id: readers.c,v 1.2 2001/06/08 15:04:03 rees Exp $ */ + +/* +copyright 2001 +the regents of the university of michigan +all rights reserved + +permission is granted to use, copy, create derivative works +and redistribute this software and such derivative works +for any purpose, so long as the name of the university of +michigan is not used in any advertising or publicity +pertaining to the use or distribution of this software +without specific, written prior authorization. if the +above copyright notice or any other identification of the +university of michigan is included in any copy of any +portion of this software, then the disclaimer below must +also be included. + +this software is provided as is, without representation +from the university of michigan as to its fitness for any +purpose, and without warranty by the university of +michigan of any kind, either express or implied, including +without limitation the implied warranties of +merchantability and fitness for a particular purpose. the +regents of the university of michigan shall not be liable +for any damages, including special, indirect, incidental, or +consequential damages, with respect to any claim arising +out of or in connection with the use of the software, even +if it has been or is hereafter advised of the possibility of +such damages. +*/ + /* * parse the reader.conf file * - * See copyright notice at end of file - * * Jim Rees * University of Michigan CITI, August 2000 */ -static char *rcsid = "$Id: readers.c,v 1.1 2001/06/07 15:17:33 rees Exp $"; #include <stdlib.h> #include <stdio.h> @@ -53,33 +82,3 @@ DBUpdateReaders(char *readerconf, void (callback) (char *name, unsigned long cha fclose(f); return 0; } - -/* -copyright 2001 -the regents of the university of michigan -all rights reserved - -permission is granted to use, copy, create derivative works -and redistribute this software and such derivative works -for any purpose, so long as the name of the university of -michigan is not used in any advertising or publicity -pertaining to the use or distribution of this software -without specific, written prior authorization. if the -above copyright notice or any other identification of the -university of michigan is included in any copy of any -portion of this software, then the disclaimer below must -also be included. - -this software is provided as is, without representation -from the university of michigan as to its fitness for any -purpose, and without warranty by the university of -michigan of any kind, either express or implied, including -without limitation the implied warranties of -merchantability and fitness for a particular purpose. the -regents of the university of michigan shall not be liable -for any damages, including special, indirect, incidental, or -consequential damages, with respect to any claim arising -out of or in connection with the use of the software, even -if it has been or is hereafter advised of the possibility of -such damages. -*/ diff --git a/lib/libsectok/sc7816.c b/lib/libsectok/sc7816.c index 6a3fc3df04b..6f26058dae8 100644 --- a/lib/libsectok/sc7816.c +++ b/lib/libsectok/sc7816.c @@ -1,13 +1,42 @@ +/* $Id: sc7816.c,v 1.3 2001/06/08 15:04:04 rees Exp $ */ + +/* +copyright 2000 +the regents of the university of michigan +all rights reserved + +permission is granted to use, copy, create derivative works +and redistribute this software and such derivative works +for any purpose, so long as the name of the university of +michigan is not used in any advertising or publicity +pertaining to the use or distribution of this software +without specific, written prior authorization. if the +above copyright notice or any other identification of the +university of michigan is included in any copy of any +portion of this software, then the disclaimer below must +also be included. + +this software is provided as is, without representation +from the university of michigan as to its fitness for any +purpose, and without warranty by the university of +michigan of any kind, either express or implied, including +without limitation the implied warranties of +merchantability and fitness for a particular purpose. the +regents of the university of michigan shall not be liable +for any damages, including special, indirect, incidental, or +consequential damages, with respect to any claim arising +out of or in connection with the use of the software, even +if it has been or is hereafter advised of the possibility of +such damages. +*/ + /* * sc7816 library for use with pc/sc ifd drivers * - * See copyright notice at end of file - * * Jim Rees * Mukesh Agrawal * University of Michigan CITI, August 2000 */ -static char *rcsid = "$Id: sc7816.c,v 1.2 2001/06/07 16:10:00 rees Exp $"; #include <sys/types.h> #include <sys/time.h> @@ -404,11 +433,6 @@ scwrite(int ttyn, int cla, int ins, int p1, int p2, int p3, unsigned char *buf, sprintf (scperf_buf, "scwrite (ins %02x, p3 %02x) start", ins, p3); SetTime(scperf_buf); - - /* Ihis does not free scperf. It looks like memory leak ... - and it is, but it is actually the right behavior. - print_time() will print the messages later, so the buffer - must be there. */ #endif /* SCPERF */ rv = scrw(ttyn, cla, ins, p1, p2, p3, buf, 0, NULL, sw1p, sw2p); @@ -429,11 +453,6 @@ scread(int ttyn, int cla, int ins, int p1, int p2, int p3, unsigned char *buf, i sprintf (scperf_buf, "scread (ins %02x, p3 %02x) start", ins, p3); SetTime(scperf_buf); - - /* Ihis does not free scperf. It looks like memory leak ... - and it is, but it is actually the right behavior. - print_time() will print the messages later, so the buffer - must be there. */ #endif /* SCPERF */ rv = scrw(ttyn, cla, ins, p1, p2, 0, NULL, p3, buf, sw1p, sw2p); @@ -474,33 +493,3 @@ lookupSym(void *handle, char *name) #endif } #endif /* DL_READERS */ - -/* -copyright 2000 -the regents of the university of michigan -all rights reserved - -permission is granted to use, copy, create derivative works -and redistribute this software and such derivative works -for any purpose, so long as the name of the university of -michigan is not used in any advertising or publicity -pertaining to the use or distribution of this software -without specific, written prior authorization. if the -above copyright notice or any other identification of the -university of michigan is included in any copy of any -portion of this software, then the disclaimer below must -also be included. - -this software is provided as is, without representation -from the university of michigan as to its fitness for any -purpose, and without warranty by the university of -michigan of any kind, either express or implied, including -without limitation the implied warranties of -merchantability and fitness for a particular purpose. the -regents of the university of michigan shall not be liable -for any damages, including special, indirect, incidental, or -consequential damages, with respect to any claim arising -out of or in connection with the use of the software, even -if it has been or is hereafter advised of the possibility of -such damages. -*/ diff --git a/lib/libsectok/scT1.c b/lib/libsectok/scT1.c index 5441cf5415f..a1bc4059693 100644 --- a/lib/libsectok/scT1.c +++ b/lib/libsectok/scT1.c @@ -1,9 +1,40 @@ +/* $Id: scT1.c,v 1.3 2001/06/08 15:04:04 rees Exp $ */ + +/* +copyright 1997, 1999, 2000 +the regents of the university of michigan +all rights reserved + +permission is granted to use, copy, create derivative works +and redistribute this software and such derivative works +for any purpose, so long as the name of the university of +michigan is not used in any advertising or publicity +pertaining to the use or distribution of this software +without specific, written prior authorization. if the +above copyright notice or any other identification of the +university of michigan is included in any copy of any +portion of this software, then the disclaimer below must +also be included. + +this software is provided as is, without representation +from the university of michigan as to its fitness for any +purpose, and without warranty by the university of +michigan of any kind, either express or implied, including +without limitation the implied warranties of +merchantability and fitness for a particular purpose. the +regents of the university of michigan shall not be liable +for any damages, including special, indirect, incidental, or +consequential damages, with respect to any claim arising +out of or in connection with the use of the software, even +if it has been or is hereafter advised of the possibility of +such damages. +*/ + /* * T=1 protocol engine * * Jim Rees, University of Michigan, October 1997 */ -static char *rcsid = "$Id: scT1.c,v 1.2 2001/06/07 20:19:43 rees Exp $"; #ifdef __palmos__ #include <Common.h> @@ -146,33 +177,3 @@ scioT1pkt(int ttyn, unsigned char *ibuf, unsigned char *obuf) return len; } - -/* -copyright 1997, 1999, 2000 -the regents of the university of michigan -all rights reserved - -permission is granted to use, copy, create derivative works -and redistribute this software and such derivative works -for any purpose, so long as the name of the university of -michigan is not used in any advertising or publicity -pertaining to the use or distribution of this software -without specific, written prior authorization. if the -above copyright notice or any other identification of the -university of michigan is included in any copy of any -portion of this software, then the disclaimer below must -also be included. - -this software is provided as is, without representation -from the university of michigan as to its fitness for any -purpose, and without warranty by the university of -michigan of any kind, either express or implied, including -without limitation the implied warranties of -merchantability and fitness for a particular purpose. the -regents of the university of michigan shall not be liable -for any damages, including special, indirect, incidental, or -consequential damages, with respect to any claim arising -out of or in connection with the use of the software, even -if it has been or is hereafter advised of the possibility of -such damages. -*/ diff --git a/lib/libsectok/scio.c b/lib/libsectok/scio.c index 91a3153835c..81c4ddfc883 100644 --- a/lib/libsectok/scio.c +++ b/lib/libsectok/scio.c @@ -1,11 +1,40 @@ +/* $Id: scio.c,v 1.4 2001/06/08 15:04:04 rees Exp $ */ + +/* +copyright 1997 +the regents of the university of michigan +all rights reserved + +permission is granted to use, copy, create derivative works +and redistribute this software and such derivative works +for any purpose, so long as the name of the university of +michigan is not used in any advertising or publicity +pertaining to the use or distribution of this software +without specific, written prior authorization. if the +above copyright notice or any other identification of the +university of michigan is included in any copy of any +portion of this software, then the disclaimer below must +also be included. + +this software is provided as is, without representation +from the university of michigan as to its fitness for any +purpose, and without warranty by the university of +michigan of any kind, either express or implied, including +without limitation the implied warranties of +merchantability and fitness for a particular purpose. the +regents of the university of michigan shall not be liable +for any damages, including special, indirect, incidental, or +consequential damages, with respect to any claim arising +out of or in connection with the use of the software, even +if it has been or is hereafter advised of the possibility of +such damages. +*/ + /* * OS dependent part, Unix version * - * See copyright notice at end of file - * * Jim Rees, University of Michigan, October 1997 */ -static char *rcsid = "$Id: scio.c,v 1.3 2001/06/07 20:19:43 rees Exp $"; #include <sys/ioctl.h> #include <sys/file.h> @@ -430,33 +459,3 @@ todos_scdrain(int ttyn) { tcflush(sc[ttyn].fd, TCIFLUSH); } - -/* -copyright 1997 -the regents of the university of michigan -all rights reserved - -permission is granted to use, copy, create derivative works -and redistribute this software and such derivative works -for any purpose, so long as the name of the university of -michigan is not used in any advertising or publicity -pertaining to the use or distribution of this software -without specific, written prior authorization. if the -above copyright notice or any other identification of the -university of michigan is included in any copy of any -portion of this software, then the disclaimer below must -also be included. - -this software is provided as is, without representation -from the university of michigan as to its fitness for any -purpose, and without warranty by the university of -michigan of any kind, either express or implied, including -without limitation the implied warranties of -merchantability and fitness for a particular purpose. the -regents of the university of michigan shall not be liable -for any damages, including special, indirect, incidental, or -consequential damages, with respect to any claim arising -out of or in connection with the use of the software, even -if it has been or is hereafter advised of the possibility of -such damages. -*/ diff --git a/lib/libsectok/scrw.c b/lib/libsectok/scrw.c index 21a5093109a..b4633310358 100644 --- a/lib/libsectok/scrw.c +++ b/lib/libsectok/scrw.c @@ -1,11 +1,40 @@ +/* $Id: scrw.c,v 1.4 2001/06/08 15:04:05 rees Exp $ */ + +/* +copyright 1997, 1999, 2000 +the regents of the university of michigan +all rights reserved + +permission is granted to use, copy, create derivative works +and redistribute this software and such derivative works +for any purpose, so long as the name of the university of +michigan is not used in any advertising or publicity +pertaining to the use or distribution of this software +without specific, written prior authorization. if the +above copyright notice or any other identification of the +university of michigan is included in any copy of any +portion of this software, then the disclaimer below must +also be included. + +this software is provided as is, without representation +from the university of michigan as to its fitness for any +purpose, and without warranty by the university of +michigan of any kind, either express or implied, including +without limitation the implied warranties of +merchantability and fitness for a particular purpose. the +regents of the university of michigan shall not be liable +for any damages, including special, indirect, incidental, or +consequential damages, with respect to any claim arising +out of or in connection with the use of the software, even +if it has been or is hereafter advised of the possibility of +such damages. +*/ + /* * OS independent part * - * See copyright notice at end of file - * * Jim Rees, University of Michigan, October 1997 */ -static char *rcsid = "$Id: scrw.c,v 1.3 2001/06/07 20:19:43 rees Exp $"; #ifdef __palmos__ #include <Common.h> @@ -236,33 +265,3 @@ todos_scrw(int ttyn, int cla, int ins, int p1, int p2, int ilen, unsigned char * return r; } - -/* -copyright 1997, 1999, 2000 -the regents of the university of michigan -all rights reserved - -permission is granted to use, copy, create derivative works -and redistribute this software and such derivative works -for any purpose, so long as the name of the university of -michigan is not used in any advertising or publicity -pertaining to the use or distribution of this software -without specific, written prior authorization. if the -above copyright notice or any other identification of the -university of michigan is included in any copy of any -portion of this software, then the disclaimer below must -also be included. - -this software is provided as is, without representation -from the university of michigan as to its fitness for any -purpose, and without warranty by the university of -michigan of any kind, either express or implied, including -without limitation the implied warranties of -merchantability and fitness for a particular purpose. the -regents of the university of michigan shall not be liable -for any damages, including special, indirect, incidental, or -consequential damages, with respect to any claim arising -out of or in connection with the use of the software, even -if it has been or is hereafter advised of the possibility of -such damages. -*/ diff --git a/lib/libsectok/sectok.h b/lib/libsectok/sectok.h index 6e8e8aaeb71..bbd2bb31e79 100644 --- a/lib/libsectok/sectok.h +++ b/lib/libsectok/sectok.h @@ -1,8 +1,34 @@ +/* $Id: sectok.h,v 1.3 2001/06/08 15:04:05 rees Exp $ */ + /* - * See copyright notice at end of file - * - * $Id: sectok.h,v 1.2 2001/06/07 20:19:43 rees Exp $ - */ +copyright 1997, 2000 +the regents of the university of michigan +all rights reserved + +permission is granted to use, copy, create derivative works +and redistribute this software and such derivative works +for any purpose, so long as the name of the university of +michigan is not used in any advertising or publicity +pertaining to the use or distribution of this software +without specific, written prior authorization. if the +above copyright notice or any other identification of the +university of michigan is included in any copy of any +portion of this software, then the disclaimer below must +also be included. + +this software is provided as is, without representation +from the university of michigan as to its fitness for any +purpose, and without warranty by the university of +michigan of any kind, either express or implied, including +without limitation the implied warranties of +merchantability and fitness for a particular purpose. the +regents of the university of michigan shall not be liable +for any damages, including special, indirect, incidental, or +consequential damages, with respect to any claim arising +out of or in connection with the use of the software, even +if it has been or is hereafter advised of the possibility of +such damages. +*/ /* SCPERF - performance evaluation */ #ifdef SCPERF @@ -105,7 +131,7 @@ void print_time () int i; for (i = 0 ; i < perf_num ; i ++ ) { - printf ("%d.%06d: %s\n", + printf ("%ld.%06ld: %s\n", perf_tv[i].tv_sec, perf_tv[i].tv_usec, perf_buf[i]); } return; @@ -159,33 +185,3 @@ void print_time (); #define MESSAGE5(x,y,z,u,v) fprintf(stderr,x,y,z,u,v) #define MESSAGE6(x,y,z,u,v,w) fprintf(stderr,x,y,z,u,v,w) #endif /* SCFS */ - -/* -copyright 1997, 2000 -the regents of the university of michigan -all rights reserved - -permission is granted to use, copy, create derivative works -and redistribute this software and such derivative works -for any purpose, so long as the name of the university of -michigan is not used in any advertising or publicity -pertaining to the use or distribution of this software -without specific, written prior authorization. if the -above copyright notice or any other identification of the -university of michigan is included in any copy of any -portion of this software, then the disclaimer below must -also be included. - -this software is provided as is, without representation -from the university of michigan as to its fitness for any -purpose, and without warranty by the university of -michigan of any kind, either express or implied, including -without limitation the implied warranties of -merchantability and fitness for a particular purpose. the -regents of the university of michigan shall not be liable -for any damages, including special, indirect, incidental, or -consequential damages, with respect to any claim arising -out of or in connection with the use of the software, even -if it has been or is hereafter advised of the possibility of -such damages. -*/ diff --git a/lib/libsectok/todos_atr.c b/lib/libsectok/todos_atr.c index 70dbdae3dcd..53a56fadf69 100644 --- a/lib/libsectok/todos_atr.c +++ b/lib/libsectok/todos_atr.c @@ -1,11 +1,40 @@ +/* $Id: todos_atr.c,v 1.4 2001/06/08 15:04:05 rees Exp $ */ + +/* +copyright 1997, 1999, 2000 +the regents of the university of michigan +all rights reserved + +permission is granted to use, copy, create derivative works +and redistribute this software and such derivative works +for any purpose, so long as the name of the university of +michigan is not used in any advertising or publicity +pertaining to the use or distribution of this software +without specific, written prior authorization. if the +above copyright notice or any other identification of the +university of michigan is included in any copy of any +portion of this software, then the disclaimer below must +also be included. + +this software is provided as is, without representation +from the university of michigan as to its fitness for any +purpose, and without warranty by the university of +michigan of any kind, either express or implied, including +without limitation the implied warranties of +merchantability and fitness for a particular purpose. the +regents of the university of michigan shall not be liable +for any damages, including special, indirect, incidental, or +consequential damages, with respect to any claim arising +out of or in connection with the use of the software, even +if it has been or is hereafter advised of the possibility of +such damages. +*/ + /* * Parse smart card atr, return proto params * - * See copyright notice at end of file - * * Jim Rees, University of Michigan CITI */ -static char *rcsid = "$Id: todos_atr.c,v 1.3 2001/06/07 20:19:43 rees Exp $"; #ifdef __palmos__ #include <Common.h> @@ -325,33 +354,3 @@ todos_get_atr(int ttyn, int flags, unsigned char *atr, struct scparam *param) param->t = -1; return 0; } - -/* -copyright 1997, 1999, 2000 -the regents of the university of michigan -all rights reserved - -permission is granted to use, copy, create derivative works -and redistribute this software and such derivative works -for any purpose, so long as the name of the university of -michigan is not used in any advertising or publicity -pertaining to the use or distribution of this software -without specific, written prior authorization. if the -above copyright notice or any other identification of the -university of michigan is included in any copy of any -portion of this software, then the disclaimer below must -also be included. - -this software is provided as is, without representation -from the university of michigan as to its fitness for any -purpose, and without warranty by the university of -michigan of any kind, either express or implied, including -without limitation the implied warranties of -merchantability and fitness for a particular purpose. the -regents of the university of michigan shall not be liable -for any damages, including special, indirect, incidental, or -consequential damages, with respect to any claim arising -out of or in connection with the use of the software, even -if it has been or is hereafter advised of the possibility of -such damages. -*/ diff --git a/lib/libsectok/todos_scrw.h b/lib/libsectok/todos_scrw.h index 80882168413..8d69e887459 100644 --- a/lib/libsectok/todos_scrw.h +++ b/lib/libsectok/todos_scrw.h @@ -1,32 +1,4 @@ -/* - * See copyright notice at end of file - * - * $Id: todos_scrw.h,v 1.3 2001/06/07 20:19:43 rees Exp $ - */ - -extern unsigned char todos_scinvert[]; - -/* forward declarations */ - -int scgetc(int ttyn, unsigned char *cp, int ms); -int scputc(int ttyn, int ic); -int scputblk(int ttyn, unsigned char *bp, int n); -void scsleep(int ms); -int scioT1(int ttyn, int cla, int ins, int p1, int p2, int ilen, unsigned char *ibuf, int olen, unsigned char *obuf, int *sw1p, int *sw2p); -int scioT1Iblk(int ttyn, int ilen, unsigned char *ibuf, unsigned char *obuf); -int scioT1pkt(int ttyn, unsigned char *ibuf, unsigned char *obuf); - -int todos_scopen(int ttyn, int flags, int *ep); -int todos_scsetflags(int ttyn, int flags, int mask); -int todos_scsetspeed(int ttyn, int speed); -int todos_scrw(int ttyn, int cla, int ins, int p1, int p2, int ilen, unsigned char *ibuf, int olen, unsigned char *obuf, int *sw1p, int *sw2p); -int todos_sccardpresent(int ttyn); -int todos_scdsr(int ttyn); -int todos_scclose(int ttyn); -int todos_scxreset(int ttyn, int flags, unsigned char *atr, int *ep); -int todos_scdtr(int ttyn, int cmd); -void todos_scdrain(int ttyn); -int todos_get_atr(int ttyn, int flags, unsigned char *atr, struct scparam *param); +/* $Id: todos_scrw.h,v 1.4 2001/06/08 15:04:05 rees Exp $ */ /* copyright 1997, 2001 @@ -57,3 +29,19 @@ out of or in connection with the use of the software, even if it has been or is hereafter advised of the possibility of such damages. */ + +extern unsigned char todos_scinvert[]; + +/* forward declarations */ + +int todos_scopen(int ttyn, int flags, int *ep); +int todos_scsetflags(int ttyn, int flags, int mask); +int todos_scsetspeed(int ttyn, int speed); +int todos_scrw(int ttyn, int cla, int ins, int p1, int p2, int ilen, unsigned char *ibuf, int olen, unsigned char *obuf, int *sw1p, int *sw2p); +int todos_sccardpresent(int ttyn); +int todos_scdsr(int ttyn); +int todos_scclose(int ttyn); +int todos_scxreset(int ttyn, int flags, unsigned char *atr, int *ep); +int todos_scdtr(int ttyn, int cmd); +void todos_scdrain(int ttyn); +int todos_get_atr(int ttyn, int flags, unsigned char *atr, struct scparam *param); |