Date: Fri, 4 Feb 2005 10:29:52 GMT From: Dag-Erling Smorgrav <des@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 70298 for review Message-ID: <200502041029.j14ATqb7017413@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=70298 Change 70298 by des@des.at.des.thinksec.com on 2005/02/04 10:29:34 Old WIP. Affected files ... .. //depot/projects/cryptoki/Makefile#4 edit .. //depot/projects/cryptoki/bin/slots/Makefile#2 edit .. //depot/projects/cryptoki/doc/Makefile#1 add .. //depot/projects/cryptoki/doc/design/Makefile#1 add .. //depot/projects/cryptoki/doc/design/design.tex#1 add .. //depot/projects/cryptoki/lib/_ck_etoken.c#1 add .. //depot/projects/cryptoki/lib/_ck_misc.h#1 add .. //depot/projects/cryptoki/lib/_ck_serial.c#3 edit .. //depot/projects/cryptoki/lib/_ck_slot.h#1 add .. //depot/projects/cryptoki/lib/_ck_tlp224.c#1 add Differences ... ==== //depot/projects/cryptoki/Makefile#4 (text+ko) ==== @@ -32,10 +32,11 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/cryptoki/Makefile#3 $ +# $P4: //depot/projects/cryptoki/Makefile#4 $ # SUBDIR = +SUBDIR += doc SUBDIR += etc SUBDIR += include SUBDIR += lib ==== //depot/projects/cryptoki/bin/slots/Makefile#2 (text+ko) ==== @@ -32,7 +32,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $P4: //depot/projects/cryptoki/bin/slots/Makefile#1 $ +# $P4: //depot/projects/cryptoki/bin/slots/Makefile#2 $ # PROG = slots @@ -40,6 +40,6 @@ CFLAGS += -I${.CURDIR}/../../include DPADD = ${.OBJDIR}/../../lib/libcryptoki.so LDADD = -L${.OBJDIR}/../../lib -R${.OBJDIR}/../../lib -lcryptoki -NOMAN = YES +MAN = .include <bsd.prog.mk> ==== //depot/projects/cryptoki/lib/_ck_serial.c#3 (text+ko) ==== @@ -31,16 +31,32 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/cryptoki/lib/_ck_serial.c#2 $ + * $P4: //depot/projects/cryptoki/lib/_ck_serial.c#3 $ */ +#include <stdlib.h> + #include "_ck_impl.h" #include "_ck_slot.h" +struct serial_param { + int sp_fd; +}; + static int _ck_serial_open(_ck_slot_ptr slot, int flags) { +/* + struct serial_param *sp; + if ((sp = calloc(1, sizeof(*sp))) == NULL) + return (-1); + if ((sp->fd = open(slot->cks_dev, O_RDWR)) == -1) { + free(sp); + return (-1); + } + slot->cks_driver_data = +*/ (void)slot; (void)flags; return (-1);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200502041029.j14ATqb7017413>