Date: Fri, 13 Jul 2012 06:39:10 +0000 From: vchan@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r239331 - soc2012/vchan/gtcp/bwalex-tc-play Message-ID: <20120713063910.AE581106564A@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vchan Date: Fri Jul 13 06:39:10 2012 New Revision: 239331 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=239331 Log: all compiling and linking errors fixed Modified: soc2012/vchan/gtcp/bwalex-tc-play/Makefile soc2012/vchan/gtcp/bwalex-tc-play/main.c soc2012/vchan/gtcp/bwalex-tc-play/pbkdf2-openssl.c Modified: soc2012/vchan/gtcp/bwalex-tc-play/Makefile ============================================================================== --- soc2012/vchan/gtcp/bwalex-tc-play/Makefile Fri Jul 13 05:33:53 2012 (r239330) +++ soc2012/vchan/gtcp/bwalex-tc-play/Makefile Fri Jul 13 06:39:10 2012 (r239331) @@ -18,23 +18,23 @@ SRCS= tcplay.c crc32.c safe_mem.c io.c hdr.c humanize.c SRCS+= crypto.c generic_xts.c -OBJS= tcplay.o crc32.o safe_mem.o io.o hdr.o humanize.o -OBJS+= crypto.o generic_xts.o +OBJS= tcplay.o crc32.o safe_mem.o io.o hdr.o humanize.o +OBJS+= crypto.o generic_xts.o -CFLAGS+= $(WARNFLAGS) -I/usr/include -I/usr/local/include +CFLAGS+= $(WARNFLAGS) -I/usr/src/sbin/ggate/shared -I/usr/include -I/usr/local/include ifeq (${DEBUG}, yes) - CFLAGS+= -O0 -g -DDEBUG + CFLAGS+= -O0 -g -DDEBUG else - CFLAGS+= -O3 + CFLAGS+= -O3 endif - LIBS+= -lcrypto -lgeom -lutil -lsbuf - SRCS+= crypto-dev.c ggate.c - OBJS+= crypto-dev.o - SRCS+= pbkdf2-openssl.c - OBJS+= pbkdf2-openssl.o + LIBS+= -lcrypto -lgeom -lutil -lsbuf + SRCS+= crypto-dev.c /usr/src/sbin/ggate/shared/ggate.c + OBJS+= crypto-dev.o + SRCS+= pbkdf2-openssl.c + OBJS+= pbkdf2-openssl.o program: @@ -48,4 +48,3 @@ gcc -O0 -g -L./usr/home/monty/vchan/gtcp/bwal-tc-play/ -I. tcplay_api_test.c -ltcplay -lcrypto -ldm -lprop clean: rm -f tcplay libtcplay.so tcplay.core *.o ktrace.out - Modified: soc2012/vchan/gtcp/bwalex-tc-play/main.c ============================================================================== --- soc2012/vchan/gtcp/bwalex-tc-play/main.c Fri Jul 13 05:33:53 2012 (r239330) +++ soc2012/vchan/gtcp/bwalex-tc-play/main.c Fri Jul 13 06:39:10 2012 (r239331) @@ -37,6 +37,9 @@ #include <signal.h> #include <time.h> +#include <geom/gate/g_gate.h> +#include <ggate.h> + #include "tcplay.h" #ifndef SIGINFO @@ -278,6 +281,8 @@ /* Create a new volume */ if (create_vol) { + g_gate_load_module(); + g_gate_open_device(); error = create_volume(map_name, dev, contain_hidden, keyfiles, nkeyfiles, h_keyfiles, n_hkeyfiles, prf, cipher_chain, h_prf, h_cipher_chain, NULL, NULL, @@ -291,11 +296,14 @@ keyfiles, nkeyfiles, h_keyfiles, n_hkeyfiles, NULL, NULL, 1 /* interactive */, DEFAULT_RETRIES, 0); } else if (map_vol) { + g_gate_load_module(); + g_gate_open_device(); error = map_volume(map_name, dev, sflag, sys_dev, protect_hidden, keyfiles, nkeyfiles, h_keyfiles, n_hkeyfiles, NULL, NULL, 1 /* interactive */, DEFAULT_RETRIES, 0); } - + g_gate_close_device(); + exit(EXIT_SUCCESS); return error; } Modified: soc2012/vchan/gtcp/bwalex-tc-play/pbkdf2-openssl.c ============================================================================== --- soc2012/vchan/gtcp/bwalex-tc-play/pbkdf2-openssl.c Fri Jul 13 05:33:53 2012 (r239330) +++ soc2012/vchan/gtcp/bwalex-tc-play/pbkdf2-openssl.c Fri Jul 13 06:39:10 2012 (r239331) @@ -48,8 +48,8 @@ tc_log(1, "Hash %s not found\n", hash->name); return ENOENT; } - r = PKCS5_PBKDF2_HMAC(pass, passlen, salt, saltlen, - hash->iteration_count, md, keylen, out); + r = PKCS5_PBKDF2_HMAC_SHA1(pass, passlen, salt, saltlen, + hash->iteration_count, keylen, out); if (r == 0) { tc_log(1, "Error in PBKDF2\n");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120713063910.AE581106564A>