cryptar-cvs Mailing List for cryptar
Status: Beta
Brought to you by:
jma2
Menu
▾
▴
cryptar-cvs — Receive cvs commits
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(18) |
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: Jeff A. <jm...@us...> - 2004-06-08 13:33:26
|
Update of /cvsroot/cryptar/cryptar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30501 Modified Files: option.c Log Message: Add GPL note to usage message. Index: option.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/option.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** option.c 4 Jun 2004 15:23:15 -0000 1.18 --- option.c 8 Jun 2004 13:33:15 -0000 1.19 *************** *** 268,271 **** --- 268,273 ---- void usage() { + fprintf(stderr, " Cryptar, Copyright (C) 2004 Jeff Abrahamson\n Cryptar comes with ABSOLUTELY NO WARRANTY.\n This is free software, and you are welcome to redistribute it\n under certain conditions.\n See the file COPYING that came with this distribution of cryptar,\n or see http://www.fsf.org/licenses/gpl.txt.\n\n"); + fprintf(stderr, "Usage/version info should be here.\n"); |
|
From: Jeff A. <jm...@us...> - 2004-06-08 13:13:34
|
Update of /cvsroot/cryptar/cryptar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26392 Modified Files: gpl.txt Log Message: *** empty log message *** Index: gpl.txt =================================================================== RCS file: /cvsroot/cryptar/cryptar/gpl.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gpl.txt 28 May 2004 18:10:21 -0000 1.1 --- gpl.txt 8 Jun 2004 13:13:25 -0000 1.2 *************** *** 1,5 **** ! /* prefs.c ! * Copyright (C) 2004 by: ! * Jeff Abrahamson * * This program is free software; you can redistribute it and/or modify --- 1,4 ---- ! /* progname ! * Copyright (C) 2004 by Jeff Abrahamson * * This program is free software; you can redistribute it and/or modify |
|
From: Jeff A. <jm...@us...> - 2004-06-08 13:12:36
|
Update of /cvsroot/cryptar/cryptar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26171 Modified Files: COPYING Log Message: Update from FSF web page. Index: COPYING =================================================================== RCS file: /cvsroot/cryptar/cryptar/COPYING,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** COPYING 27 Apr 2003 17:40:34 -0000 1.1 --- COPYING 8 Jun 2004 13:12:26 -0000 1.2 *************** *** 3,7 **** Copyright (C) 1989, 1991 Free Software Foundation, Inc. ! 675 Mass Ave, Cambridge, MA 02139, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. --- 3,7 ---- Copyright (C) 1989, 1991 Free Software Foundation, Inc. ! 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. *************** *** 280,284 **** END OF TERMS AND CONDITIONS ! Appendix: How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest --- 280,284 ---- END OF TERMS AND CONDITIONS ! How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest *************** *** 292,296 **** <one line to give the program's name and a brief idea of what it does.> ! Copyright (C) 19yy <name of author> This program is free software; you can redistribute it and/or modify --- 292,296 ---- <one line to give the program's name and a brief idea of what it does.> ! Copyright (C) <year> <name of author> This program is free software; you can redistribute it and/or modify *************** *** 306,310 **** You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software ! Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Also add information on how to contact you by electronic and paper mail. --- 306,311 ---- You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software ! Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! Also add information on how to contact you by electronic and paper mail. *************** *** 313,317 **** when it starts in an interactive mode: ! Gnomovision version 69, Copyright (C) 19yy name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it --- 314,318 ---- when it starts in an interactive mode: ! Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it |
Update of /cvsroot/cryptar/cryptar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5983 Modified Files: archive.c block.c checksum.c checksum.h compress.c compress.h coprocess.c coprocess.h covering.h cryptar-db.c db_misc.c db_misc.h encryption.c env.c extract.c fileio.c filename.c filename.h hash.c hash.h io.c io.h ios.c ios.h list.c log.c main.c option.c option.h options.c options.h prefs.c prefs.h protocol.c protocol.h queue.c remote.c remote.h requests.c requests.h summary.c summary.h syscall.c workticket.c workticket.h Log Message: update copyright dates Index: requests.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/requests.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** requests.c 15 Dec 2003 19:16:54 -0000 1.11 --- requests.c 4 Jun 2004 15:23:16 -0000 1.12 *************** *** 1,4 **** /* requests.c ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* requests.c ! * Copyright (C) 2002, 2003 by: * Jeff Abrahamson * Index: requests.h =================================================================== RCS file: /cvsroot/cryptar/cryptar/requests.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** requests.h 14 May 2003 13:25:06 -0000 1.4 --- requests.h 4 Jun 2004 15:23:16 -0000 1.5 *************** *** 1,4 **** /* requests.h ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* requests.h ! * Copyright (C) 2002-2003 by: * Jeff Abrahamson * Index: extract.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/extract.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** extract.c 15 May 2004 14:41:58 -0000 1.13 --- extract.c 4 Jun 2004 15:23:15 -0000 1.14 *************** *** 1,4 **** /* extract.c ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* extract.c ! * Copyright (C) 2002, 2003, 2004 by: * Jeff Abrahamson * Index: ios.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/ios.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ios.c 16 Nov 2003 22:47:39 -0000 1.14 --- ios.c 4 Jun 2004 15:23:15 -0000 1.15 *************** *** 1,4 **** /* ios.c ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* ios.c ! * Copyright (C) 2002, 2003 by: * Jeff Abrahamson * Index: cryptar-db.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/cryptar-db.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** cryptar-db.c 10 Nov 2003 01:58:04 -0000 1.7 --- cryptar-db.c 4 Jun 2004 15:23:15 -0000 1.8 *************** *** 1,4 **** /* cryptar-db.c ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* cryptar-db.c ! * Copyright (C) 2002, 2003 by: * Jeff Abrahamson * Index: summary.h =================================================================== RCS file: /cvsroot/cryptar/cryptar/summary.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** summary.h 3 Jan 2004 22:45:04 -0000 1.3 --- summary.h 4 Jun 2004 15:23:16 -0000 1.4 *************** *** 1,4 **** /* summary.h ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* summary.h ! * Copyright (C) 2002-2004 by: * Jeff Abrahamson * Index: hash.h =================================================================== RCS file: /cvsroot/cryptar/cryptar/hash.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** hash.h 22 Jan 2003 19:56:52 -0000 1.3 --- hash.h 4 Jun 2004 15:23:15 -0000 1.4 *************** *** 1,4 **** /* hash.h ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* hash.h ! * Copyright (C) 2002-2003 by: * Jeff Abrahamson * Index: workticket.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/workticket.c,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** workticket.c 15 May 2004 13:13:53 -0000 1.27 --- workticket.c 4 Jun 2004 15:23:16 -0000 1.28 *************** *** 1,4 **** /* workticket.c ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* workticket.c ! * Copyright (C) 2002-2004 by: * Jeff Abrahamson * Index: list.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/list.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** list.c 15 May 2004 14:41:59 -0000 1.4 --- list.c 4 Jun 2004 15:23:15 -0000 1.5 *************** *** 1,4 **** /* list.c ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* list.c ! * Copyright (C) 2002, 2003, 2004 by: * Jeff Abrahamson * Index: summary.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/summary.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** summary.c 15 Dec 2003 18:45:50 -0000 1.7 --- summary.c 4 Jun 2004 15:23:16 -0000 1.8 *************** *** 1,4 **** /* summary.c ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* summary.c ! * Copyright (C) 2002, 2003 by: * Jeff Abrahamson * Index: options.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/options.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** options.c 15 May 2004 14:42:03 -0000 1.5 --- options.c 4 Jun 2004 15:23:15 -0000 1.6 *************** *** 1,4 **** /* options.c ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* options.c ! * Copyright (C) 2002-2004 by: * Jeff Abrahamson * Index: workticket.h =================================================================== RCS file: /cvsroot/cryptar/cryptar/workticket.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** workticket.h 4 Jan 2004 00:46:24 -0000 1.10 --- workticket.h 4 Jun 2004 15:23:16 -0000 1.11 *************** *** 1,4 **** /* workticket.h ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* workticket.h ! * Copyright (C) 2002-2004 by: * Jeff Abrahamson * Index: hash.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/hash.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** hash.c 31 Dec 2003 17:20:22 -0000 1.5 --- hash.c 4 Jun 2004 15:23:15 -0000 1.6 *************** *** 1,4 **** /* hash.c ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* hash.c ! * Copyright (C) 2002, 2003 by: * Jeff Abrahamson * Index: remote.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/remote.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** remote.c 3 Jan 2004 18:40:26 -0000 1.11 --- remote.c 4 Jun 2004 15:23:16 -0000 1.12 *************** *** 1,4 **** /* remote.c ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* remote.c ! * Copyright (C) 2002-2004 by: * Jeff Abrahamson * Index: queue.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/queue.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** queue.c 3 Dec 2002 20:34:37 -0000 1.1 --- queue.c 4 Jun 2004 15:23:16 -0000 1.2 *************** *** 1,4 **** /* queue.c ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* queue.c ! * Copyright (C) 2002-2004 by: * Jeff Abrahamson * Index: encryption.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/encryption.c,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** encryption.c 24 Apr 2004 18:56:09 -0000 1.27 --- encryption.c 4 Jun 2004 15:23:15 -0000 1.28 *************** *** 1,4 **** /* encryption.c ! * Copyright (C) 2002, 2003 by * Jeff Abrahamson * Adam O'Donnell --- 1,4 ---- /* encryption.c ! * Copyright (C) 2002, 2003, 2004 by * Jeff Abrahamson * Adam O'Donnell Index: db_misc.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/db_misc.c,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** db_misc.c 24 Apr 2004 15:49:06 -0000 1.26 --- db_misc.c 4 Jun 2004 15:23:15 -0000 1.27 *************** *** 1,4 **** /* db_misc.c ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* db_misc.c ! * Copyright (C) 2002, 2003, 2004 by: * Jeff Abrahamson * Index: fileio.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/fileio.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** fileio.c 15 May 2003 02:31:52 -0000 1.5 --- fileio.c 4 Jun 2004 15:23:15 -0000 1.6 *************** *** 1,4 **** /* fileio.c ! Copyright (C) Jeff Abrahamson 2002 Copyright (C) Andrew Tridgell 1998 Copyright (C) 2002 by Martin Pool --- 1,4 ---- /* fileio.c ! Copyright (C) Jeff Abrahamson 2002, 2003 Copyright (C) Andrew Tridgell 1998 Copyright (C) 2002 by Martin Pool Index: compress.h =================================================================== RCS file: /cvsroot/cryptar/cryptar/compress.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** compress.h 15 Dec 2003 16:06:35 -0000 1.4 --- compress.h 4 Jun 2004 15:23:15 -0000 1.5 *************** *** 1,4 **** /* compress.h ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* compress.h ! * Copyright (C) 2002-2003 by: * Jeff Abrahamson * Index: checksum.h =================================================================== RCS file: /cvsroot/cryptar/cryptar/checksum.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** checksum.h 27 Apr 2003 22:41:47 -0000 1.7 --- checksum.h 4 Jun 2004 15:23:15 -0000 1.8 *************** *** 1,4 **** /* checksum.h ! Copyright (C) Jeff Abrahamson 2002 Copyright (C) Andrew Tridgell 1996 Copyright (C) Paul Mackerras 1996 --- 1,4 ---- /* checksum.h ! Copyright (C) Jeff Abrahamson 2002-2003 Copyright (C) Andrew Tridgell 1996 Copyright (C) Paul Mackerras 1996 Index: options.h =================================================================== RCS file: /cvsroot/cryptar/cryptar/options.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** options.h 28 May 2004 18:13:36 -0000 1.10 --- options.h 4 Jun 2004 15:23:15 -0000 1.11 *************** *** 1,4 **** /* options.c ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* options.c ! * Copyright (C) 2002-2004 by: * Jeff Abrahamson * Index: remote.h =================================================================== RCS file: /cvsroot/cryptar/cryptar/remote.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** remote.h 10 Nov 2003 13:51:13 -0000 1.7 --- remote.h 4 Jun 2004 15:23:16 -0000 1.8 *************** *** 1,4 **** /* remote.h ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* remote.h ! * Copyright (C) 2002-2003 by: * Jeff Abrahamson * Index: archive.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/archive.c,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** archive.c 28 May 2004 18:10:08 -0000 1.32 --- archive.c 4 Jun 2004 15:23:15 -0000 1.33 *************** *** 1,4 **** /* archive.c ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* archive.c ! * Copyright (C) 2002, 2003, 2004 by: * Jeff Abrahamson * Index: covering.h =================================================================== RCS file: /cvsroot/cryptar/cryptar/covering.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** covering.h 4 Jan 2004 00:46:18 -0000 1.7 --- covering.h 4 Jun 2004 15:23:15 -0000 1.8 *************** *** 1,4 **** /* covering.h ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* covering.h ! * Copyright (C) 2002-2004 by: * Jeff Abrahamson * Index: checksum.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/checksum.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** checksum.c 4 Jan 2004 03:05:12 -0000 1.14 --- checksum.c 4 Jun 2004 15:23:15 -0000 1.15 *************** *** 1,4 **** /* checksum.c ! Copyright (C) Jeff Abrahamson 2002 Copyright (C) Andrew Tridgell 1996 Copyright (C) Paul Mackerras 1996 --- 1,4 ---- /* checksum.c ! Copyright (C) Jeff Abrahamson 2002, 2003, 2004 Copyright (C) Andrew Tridgell 1996 Copyright (C) Paul Mackerras 1996 Index: compress.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/compress.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** compress.c 17 Dec 2003 05:34:28 -0000 1.12 --- compress.c 4 Jun 2004 15:23:15 -0000 1.13 *************** *** 1,4 **** /* compress.c ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* compress.c ! * Copyright (C) 2002, 2003 by: * Jeff Abrahamson * Index: io.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/io.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** io.c 2 Jan 2004 00:12:48 -0000 1.15 --- io.c 4 Jun 2004 15:23:15 -0000 1.16 *************** *** 1,4 **** /* io.c ! * Copyright (C) 2002, 2003 by: * Jeff Abrahamson * --- 1,4 ---- /* io.c ! * Copyright (C) 2002, 2003, 2004 by: * Jeff Abrahamson * Index: prefs.h =================================================================== RCS file: /cvsroot/cryptar/cryptar/prefs.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** prefs.h 28 May 2004 18:12:46 -0000 1.11 --- prefs.h 4 Jun 2004 15:23:15 -0000 1.12 *************** *** 1,4 **** /* prefs.h ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* prefs.h ! * Copyright (C) 2002-2004 by: * Jeff Abrahamson * Index: option.h =================================================================== RCS file: /cvsroot/cryptar/cryptar/option.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** option.h 22 Jan 2003 19:56:52 -0000 1.5 --- option.h 4 Jun 2004 15:23:15 -0000 1.6 *************** *** 1,4 **** /* option.h ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* option.h ! * Copyright (C) 2002-2003 by: * Jeff Abrahamson * Index: prefs.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/prefs.c,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** prefs.c 29 May 2004 04:29:35 -0000 1.24 --- prefs.c 4 Jun 2004 15:23:15 -0000 1.25 *************** *** 1,4 **** /* prefs.c ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* prefs.c ! * Copyright (C) 2002-2004 by: * Jeff Abrahamson * Index: ios.h =================================================================== RCS file: /cvsroot/cryptar/cryptar/ios.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ios.h 10 Nov 2003 14:02:51 -0000 1.8 --- ios.h 4 Jun 2004 15:23:15 -0000 1.9 *************** *** 1,4 **** /* ios.h ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* ios.h ! * Copyright (C) 2002-2003 by: * Jeff Abrahamson * Index: io.h =================================================================== RCS file: /cvsroot/cryptar/cryptar/io.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** io.h 4 Dec 2003 16:30:57 -0000 1.9 --- io.h 4 Jun 2004 15:23:15 -0000 1.10 *************** *** 1,4 **** /* io.h ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* io.h ! * Copyright (C) 2002-2003 by: * Jeff Abrahamson * Index: main.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/main.c,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** main.c 28 May 2004 18:11:32 -0000 1.26 --- main.c 4 Jun 2004 15:23:15 -0000 1.27 *************** *** 1,5 **** /* -*- c-file-style: "linux" -*- ! Copyright (C) 2002 by Jeff Abrahamson Copyright (C) 1996-2001 by Andrew Tridgell <tr...@sa...> Copyright (C) Paul Mackerras 1996 --- 1,5 ---- /* -*- c-file-style: "linux" -*- ! Copyright (C) 2002-2004 by Jeff Abrahamson Copyright (C) 1996-2001 by Andrew Tridgell <tr...@sa...> Copyright (C) Paul Mackerras 1996 Index: option.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/option.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** option.c 29 May 2004 04:30:12 -0000 1.17 --- option.c 4 Jun 2004 15:23:15 -0000 1.18 *************** *** 1,4 **** /* option.c ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* option.c ! * Copyright (C) 2002-2004 by: * Jeff Abrahamson * Index: coprocess.h =================================================================== RCS file: /cvsroot/cryptar/cryptar/coprocess.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** coprocess.h 7 Sep 2003 15:31:04 -0000 1.4 --- coprocess.h 4 Jun 2004 15:23:15 -0000 1.5 *************** *** 1,4 **** /* coprocess.h ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* coprocess.h ! * Copyright (C) 2002-2003 by: * Jeff Abrahamson * Index: syscall.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/syscall.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** syscall.c 14 May 2003 16:35:50 -0000 1.6 --- syscall.c 4 Jun 2004 15:23:16 -0000 1.7 *************** *** 1,4 **** /* syscall.c ! Copyright (C) Jeff Abrahamson 2002 Copyright (C) Andrew Tridgell 1998 Copyright (C) 2002 by Martin Pool --- 1,4 ---- /* syscall.c ! Copyright (C) Jeff Abrahamson 2002, 2003 Copyright (C) Andrew Tridgell 1998 Copyright (C) 2002 by Martin Pool Index: coprocess.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/coprocess.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** coprocess.c 15 Dec 2003 19:40:04 -0000 1.9 --- coprocess.c 4 Jun 2004 15:23:15 -0000 1.10 *************** *** 1,5 **** /* -*- c-file-style: "linux" -*- ! Copyright (C) 2002 by Jeff Abrahamson Copyright (C) 1996-2001 by Andrew Tridgell <tr...@sa...> Copyright (C) Paul Mackerras 1996 --- 1,5 ---- /* -*- c-file-style: "linux" -*- ! Copyright (C) 2002, 2003 by Jeff Abrahamson Copyright (C) 1996-2001 by Andrew Tridgell <tr...@sa...> Copyright (C) Paul Mackerras 1996 Index: log.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/log.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** log.c 14 May 2003 16:35:50 -0000 1.3 --- log.c 4 Jun 2004 15:23:15 -0000 1.4 *************** *** 1,4 **** /* log.c ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* log.c ! * Copyright (C) 2002, 2003 by: * Jeff Abrahamson * Index: filename.h =================================================================== RCS file: /cvsroot/cryptar/cryptar/filename.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** filename.h 14 May 2003 13:25:06 -0000 1.2 --- filename.h 4 Jun 2004 15:23:15 -0000 1.3 *************** *** 1,4 **** /* filename.h ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* filename.h ! * Copyright (C) 2002-2003 by: * Jeff Abrahamson * Index: env.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/env.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** env.c 15 May 2003 02:31:52 -0000 1.4 --- env.c 4 Jun 2004 15:23:15 -0000 1.5 *************** *** 1,4 **** /* env.c ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* env.c ! * Copyright (C) 2002, 2003 by: * Jeff Abrahamson * Index: protocol.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/protocol.c,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** protocol.c 15 May 2004 14:42:04 -0000 1.43 --- protocol.c 4 Jun 2004 15:23:15 -0000 1.44 *************** *** 1,4 **** /* protocol.c ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* protocol.c ! * Copyright (C) 2002-2004 by: * Jeff Abrahamson * Index: filename.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/filename.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** filename.c 10 Nov 2003 01:58:04 -0000 1.4 --- filename.c 4 Jun 2004 15:23:15 -0000 1.5 *************** *** 1,4 **** /* filename.c ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* filename.c ! * Copyright (C) 2002, 2003 by: * Jeff Abrahamson * Index: block.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/block.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** block.c 15 May 2004 13:12:04 -0000 1.4 --- block.c 4 Jun 2004 15:23:15 -0000 1.5 *************** *** 1,4 **** /* block.c ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* block.c ! * Copyright (C) 2002, 2003, 2004 by: * Jeff Abrahamson * Index: protocol.h =================================================================== RCS file: /cvsroot/cryptar/cryptar/protocol.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** protocol.h 10 Nov 2003 13:51:13 -0000 1.12 --- protocol.h 4 Jun 2004 15:23:15 -0000 1.13 *************** *** 1,4 **** /* protocol.h ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* protocol.h ! * Copyright (C) 2002-2003 by: * Jeff Abrahamson * Index: db_misc.h =================================================================== RCS file: /cvsroot/cryptar/cryptar/db_misc.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** db_misc.h 7 Sep 2003 22:25:37 -0000 1.11 --- db_misc.h 4 Jun 2004 15:23:15 -0000 1.12 *************** *** 1,4 **** /* db_misc.h ! * Copyright (C) 2002 by: * Jeff Abrahamson * --- 1,4 ---- /* db_misc.h ! * Copyright (C) 2002, 2003 by: * Jeff Abrahamson * |
|
From: Jeff A. <jm...@us...> - 2004-05-29 13:52:49
|
Update of /cvsroot/cryptar/cryptar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3820 Modified Files: constants.c Log Message: Add VERBOSE_DB traces. Index: constants.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/constants.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** constants.c 28 May 2004 18:09:31 -0000 1.1 --- constants.c 29 May 2004 13:52:41 -0000 1.2 *************** *** 25,28 **** --- 25,29 ---- #include "db_misc.h" #include "ios.h" + #include "options.h" *************** *** 42,45 **** --- 43,48 ---- ios_free(ios_key); ios_free(ios_data); + if(int_option(kOption_verbose) & VERBOSE_DB) + g_message("constant: %s <-- %s", key, val); return; } *************** *** 69,72 **** --- 72,77 ---- ios_free(ios_key); ios_free(ios_data); + if(int_option(kOption_verbose) & VERBOSE_DB) + g_message("constant: %s --> %s", key, ret_buf); return ret_buf; } *************** *** 87,90 **** --- 92,97 ---- ios_free(ios_key); ios_free(ios_data); + if(int_option(kOption_verbose) & VERBOSE_DB) + g_message("constant: %s <-- %d", key, val); return; } *************** *** 106,109 **** --- 113,118 ---- ios_free(ios_key); ios_free(ios_data); + if(int_option(kOption_verbose) & VERBOSE_DB) + g_message("constant: %s --> %d", key, val); return val; } |
|
From: Jeff A. <jm...@us...> - 2004-05-29 04:31:13
|
Update of /cvsroot/cryptar/cryptar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22318 Modified Files: README.code.txt Log Message: Note to consider encrypting local db. Index: README.code.txt =================================================================== RCS file: /cvsroot/cryptar/cryptar/README.code.txt,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** README.code.txt 28 May 2004 18:08:51 -0000 1.11 --- README.code.txt 29 May 2004 04:31:04 -0000 1.12 *************** *** 157,160 **** --- 157,165 ---- should track it. + - If we are compiling against a version of Berkeley DB that allows for + encryption, we should take advantage of it. This would mean we + would need a passphrase from the user, though, which alters the + interface. Maybe this should be an optional feature. + Documentation: |
|
From: Jeff A. <jm...@us...> - 2004-05-29 04:30:29
|
Update of /cvsroot/cryptar/cryptar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22199 Modified Files: option.c Log Message: Create is a valid action to request. Index: option.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/option.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** option.c 28 May 2004 18:11:55 -0000 1.16 --- option.c 29 May 2004 04:30:12 -0000 1.17 *************** *** 188,192 **** #endif || int_option(kOption_list) || int_option(kOption_server) ! || int_option(kOption_ping))) { g_message("You must choose an action to perform."); return 1; --- 188,192 ---- #endif || int_option(kOption_list) || int_option(kOption_server) ! || int_option(kOption_ping) || int_option(kOption_create))) { g_message("You must choose an action to perform."); return 1; |
|
From: Jeff A. <jm...@us...> - 2004-05-29 04:29:44
|
Update of /cvsroot/cryptar/cryptar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22057 Modified Files: prefs.c Log Message: Preference values are stored in database. Remove old config file code Index: prefs.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/prefs.c,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** prefs.c 28 May 2004 18:12:46 -0000 1.23 --- prefs.c 29 May 2004 04:29:35 -0000 1.24 *************** *** 25,28 **** --- 25,29 ---- #include "constants.h" + #include "db_misc.h" #include "option.h" #include "options.h" *************** *** 61,64 **** --- 62,66 ---- + #define YESNO_SIZE 10 void do_create() { *************** *** 68,76 **** char *daemon_command, *to_archive, *block_length; int n_block_length; ! char buf[11]; /* used in scanf below, length below ! must not exceed one less than this. ! */ /* ### Good target for I18N ### */ daemon_command = get_pref_from_user("daemon command", "This is the local command to use to talk to the remote cryptar server.\nTypically it will be \"ssh hostname cryptar --daemon\", where you replace hostname\nwith the name of the host with which you're communicating.\n", "ssh host cryptar --daemon"); to_archive = get_pref_from_user("files to archive", "This is a comma-separated list of files to archive.", getenv("HOME")); --- 70,78 ---- char *daemon_command, *to_archive, *block_length; int n_block_length; ! char buf[YESNO_SIZE]; /* ### Good target for I18N ### */ + printf("\nThis will lead you through the steps to create a new archive.\n"); + daemon_command = get_pref_from_user("daemon command", "This is the local command to use to talk to the remote cryptar server.\nTypically it will be \"ssh hostname cryptar --daemon\", where you replace hostname\nwith the name of the host with which you're communicating.\n", "ssh host cryptar --daemon"); to_archive = get_pref_from_user("files to archive", "This is a comma-separated list of files to archive.", getenv("HOME")); *************** *** 89,94 **** printf("block length = %d\n", n_block_length); printf("\nOK? [Y]es/no "); ! scanf("%10s", buf); ! if(buf[0] == 'y' || buf[0] == 'Y') { /* We could be more polite, we could offer to edit, etc. */ printf("Sorry, try again when you know what you want.\n"); --- 91,96 ---- printf("block length = %d\n", n_block_length); printf("\nOK? [Y]es/no "); ! fgets(buf, YESNO_SIZE, stdin); ! if(buf[0] != 'y' && buf[0] != 'Y') { /* We could be more polite, we could offer to edit, etc. */ printf("Sorry, try again when you know what you want.\n"); *************** *** 96,99 **** --- 98,102 ---- } + db_open(kConstants); const_put_string(PREF_DAEMON_COMMAND, daemon_command); const_put_string(PREF_TO_ARCHIVE, to_archive); *************** *** 108,124 **** static char *get_pref_from_user(const char *name, const char *description, const char *default_val) { ! char buf[10241]; /* length is repeated in scanf spec ! below and nowhere else, must be one ! more here than below due to ! terminating NULL. */ ! g_assert(name); printf("\n\n"); if(description) printf("%s\n", description); ! printf("%s [%s]:", name, default_val); ! scanf("%10240s", buf); return g_strdup(buf); } --- 111,128 ---- + #define BUFSIZE 10240 static char *get_pref_from_user(const char *name, const char *description, const char *default_val) { ! char buf[BUFSIZE]; ! g_assert(name); printf("\n\n"); if(description) printf("%s\n", description); ! printf("%s [%s]: ", name, default_val); ! fgets(buf, BUFSIZE, stdin); ! g_strchomp(buf); ! if(buf[0] == '\0') ! return g_strdup(default_val); return g_strdup(buf); } *************** *** 183,291 **** - - - #if 0 - /* Functions to read preferences from the preference file. - */ - - - /* Determine the name of the preferences file, then read preferences - into the pref tree. - - This function is a major hack, see notes at pref_parse_prefs. - */ - void pref_get_prefs() - { - char *file; - FileContents cont; - - file = g_strconcat(getenv("HOME"), "/.cryptar", NULL); - cont = pref_read_pref_file(file); - prefs = g_tree_new(PrefCompare); - #if 0 - pref_parse_prefs(cont); - #endif - return; - } - - - - /* Tree ordering callback */ - static gint PrefCompare(gconstpointer a, gconstpointer b) - { - return strcmp(a, b); - } - - - - /* Read file to a buffer so we can parse it. Buffer should not be - freed, we just point the parse tree into the cont.buf buffer. - */ - static FileContents pref_read_pref_file(const char *file) - { - FILE *fp; - struct stat sbuf; - FileContents ret; - g_assert(file); - - if(stat(file, &sbuf)) { - perror("stat of pref file failed"); - g_error(" ==> Can't read file %s", file); - } - ret.len = sbuf.st_size; - fp = fopen(file, "r"); - g_assert(fp); - ret.buf = g_malloc(ret.len); - if(fread(ret.buf, 1, ret.len, fp) < ret.len) - g_error("Failed to read preference file '%s'\n", file); - return ret; - } - - - - /* Records are delimited by '\n', fields by the first '=' in the - record. Write a '\0' to the buffer to terminate the strings rather - than copying things about. - - This should either be moved to the local db or else expanded to - allow comments and backslash escapes. We should trim - spaces. Probably more. - - In addition, we need to support preferences for multiple archive - here, keyed on the archive name the user specifies on the command - line. - */ - static void pref_parse_prefs(FileContents cont) - { - guint i; - gchar *key; - gchar *value; - - g_assert(prefs); - key = &cont.buf[0]; - value = NULL; - for(i = 0; i < cont.len; i++) { - if(cont.buf[i] == '=' && !value) { - cont.buf[i] = '\0'; - value = &cont.buf[i+1]; - } else if(cont.buf[i] == '\n') { - if(!value) - g_error("Error in pref file, character %d: no '=' found in line.\n", i); - if((value == key) || (&cont.buf[i] == value)) - g_error("Error in pref file, character %d: key or value is empty.\n", i); - g_assert(key); - g_assert(value); - cont.buf[i] = '\0'; - g_tree_insert(prefs, key, value); - #if 0 - /* debug */ - g_message("Inserted in tree: key = '%s', value = '%s'", - key, value); - #endif - key = &cont.buf[i + 1]; - value = NULL; - } - } - } - #endif /* 0 */ - --- 187,188 ---- |
|
From: Jeff A. <jm...@us...> - 2004-05-28 18:14:05
|
Update of /cvsroot/cryptar/cryptar/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13195/doc Modified Files: usage.txt Log Message: improved man page (prototype) Index: usage.txt =================================================================== RCS file: /cvsroot/cryptar/cryptar/doc/usage.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** usage.txt 28 May 2004 15:11:30 -0000 1.1 --- usage.txt 28 May 2004 18:13:56 -0000 1.2 *************** *** 6,10 **** SYNOPSIS ! cryptar [options] patterns DESCRIPTION --- 6,10 ---- SYNOPSIS ! cryptar [options] archive patterns DESCRIPTION *************** *** 30,44 **** OPTIONS ! --archive=name, -a name ! archive files to archive name ! --create=name, -c name ! create a new archive called name ! --extract-name, -x name ! extract files from archive name ! --list=name, -t name ! list files in archive name --ping, -p --- 30,44 ---- OPTIONS ! --backup, -b ! archive files ! --create, -c ! create a new archive ! --extract, -x ! extract files from an archive ! --list, -t ! list files --ping, -p *************** *** 84,96 **** work-files: ! cryptar --archive=work-files ! To see what's in the databse: ! cryptar --list=work-files To restore those files again: ! cryptar --extract=work-files FILES --- 84,96 ---- work-files: ! cryptar --backup work-files ! To see what's in the database: ! cryptar --list work-files To restore those files again: ! cryptar --extract work-files FILES |
|
From: Jeff A. <jm...@us...> - 2004-05-28 18:13:45
|
Update of /cvsroot/cryptar/cryptar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13119 Modified Files: options.h Log Message: rationalize commandline UI, enums to match Index: options.h =================================================================== RCS file: /cvsroot/cryptar/cryptar/options.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** options.h 15 May 2004 14:42:03 -0000 1.9 --- options.h 28 May 2004 18:13:36 -0000 1.10 *************** *** 27,30 **** --- 27,31 ---- enum int_options { kOption_backup, + kOption_create, kOption_extract, kOption_list, *************** *** 50,54 **** enum char_options { kArchive_target, /* the archive (database) to work with */ ! kBackup_pattern, /* pattern to backup (subset of configured files) */ kExtract_pattern, /* pattern to restore */ kList_pattern, /* pattern to list */ --- 51,55 ---- enum char_options { kArchive_target, /* the archive (database) to work with */ ! kBackup_pattern, /* pattern to backup (subset of configured files) */ kExtract_pattern, /* pattern to restore */ kList_pattern, /* pattern to list */ |
|
From: Jeff A. <jm...@us...> - 2004-05-28 18:12:56
|
Update of /cvsroot/cryptar/cryptar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12908 Modified Files: prefs.c prefs.h Log Message: preferences come directly from database (constants table), not from a config file. Create a new archive in a rational way (hopefully). Index: prefs.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/prefs.c,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** prefs.c 3 Jan 2004 22:43:48 -0000 1.22 --- prefs.c 28 May 2004 18:12:46 -0000 1.23 *************** *** 24,27 **** --- 24,28 ---- #include <string.h> + #include "constants.h" #include "option.h" #include "options.h" *************** *** 35,38 **** --- 36,40 ---- + #if 0 /* Do this instead with mmap. */ typedef struct file_contents { *************** *** 47,63 **** GTree *prefs = NULL; static gint PrefCompare(gconstpointer a, gconstpointer b); static FileContents pref_read_pref_file(const char *file); static void pref_parse_prefs(FileContents cont); ! /* First functions to fetch preference values. - Farther down, functions to read preferences from the preference - file. - */ --- 49,127 ---- GTree *prefs = NULL; + #endif + static char *get_pref_from_user(const char *name, const char *description, const char *default_value); + #if 0 static gint PrefCompare(gconstpointer a, gconstpointer b); static FileContents pref_read_pref_file(const char *file); static void pref_parse_prefs(FileContents cont); + #endif ! void do_create() ! { ! /* These char pointers will be malloc'ed for us, so we must ! free them at the end. ! */ ! char *daemon_command, *to_archive, *block_length; ! int n_block_length; ! char buf[11]; /* used in scanf below, length below ! must not exceed one less than this. ! */ ! ! /* ### Good target for I18N ### */ ! daemon_command = get_pref_from_user("daemon command", "This is the local command to use to talk to the remote cryptar server.\nTypically it will be \"ssh hostname cryptar --daemon\", where you replace hostname\nwith the name of the host with which you're communicating.\n", "ssh host cryptar --daemon"); ! to_archive = get_pref_from_user("files to archive", "This is a comma-separated list of files to archive.", getenv("HOME")); ! block_length = get_pref_from_user("block length", "This is the block size for use in the differencing algorithm.\nUnless you know what you are doing, leave this at the default value.", ! #if MAINTAINER_MODE ! "4" ! #else ! "512" ! #endif ! ); ! n_block_length = atoi(block_length); ! ! printf("\n\n"); ! printf("daemon command = \"%s\"\n", daemon_command); ! printf("to archive = \"%s\"\n", to_archive); ! printf("block length = %d\n", n_block_length); ! printf("\nOK? [Y]es/no "); ! scanf("%10s", buf); ! if(buf[0] == 'y' || buf[0] == 'Y') { ! /* We could be more polite, we could offer to edit, etc. */ ! printf("Sorry, try again when you know what you want.\n"); ! return; ! } ! ! const_put_string(PREF_DAEMON_COMMAND, daemon_command); ! const_put_string(PREF_TO_ARCHIVE, to_archive); ! const_put_int(PREF_BLOCK_LENGTH, n_block_length); ! ! g_free(daemon_command); ! g_free(to_archive); ! g_free(block_length); ! return; ! } ! ! ! ! static char *get_pref_from_user(const char *name, const char *description, const char *default_val) ! { ! char buf[10241]; /* length is repeated in scanf spec ! below and nowhere else, must be one ! more here than below due to ! terminating NULL. */ ! ! g_assert(name); ! printf("\n\n"); ! if(description) ! printf("%s\n", description); ! printf("%s [%s]:", name, default_val); ! scanf("%10240s", buf); ! return g_strdup(buf); ! } *************** *** 68,77 **** g_assert(key); ! value = g_tree_lookup(prefs, key); if(!value) { g_message("Failed to find preference value for key '%s'\n" "Using empty string. This is probably wrong!\n", key); ! return ""; } return value; --- 132,141 ---- g_assert(key); ! value = const_get_string(key); if(!value) { g_message("Failed to find preference value for key '%s'\n" "Using empty string. This is probably wrong!\n", key); ! return g_strdup(""); } return value; *************** *** 83,91 **** int pref_get_int_value(char *key) { - const char *value; - g_assert(key); ! value = pref_get_value(key); ! return atoi(value); } --- 147,152 ---- int pref_get_int_value(char *key) { g_assert(key); ! return const_get_int(key); } *************** *** 100,106 **** g_assert(key); g_assert(deflt); ! value = g_tree_lookup(prefs, key); if(!value) { ! return deflt; } return value; --- 161,167 ---- g_assert(key); g_assert(deflt); ! value = const_get_string(key); if(!value) { ! return g_strdup(deflt); } return value; *************** *** 111,123 **** /* Wrapper to get integer preference values without error if the value is not available. */ int pref_get_int_value_silent_default(char *key, const char *deflt) { - const char *value; - g_assert(key); g_assert(deflt); ! value = pref_get_value_silent_default(key, deflt); ! return atoi(value); } --- 172,183 ---- /* Wrapper to get integer preference values without error if the value is not available. + + ### We can't distinguish between key not found and key == 0. ### */ int pref_get_int_value_silent_default(char *key, const char *deflt) { g_assert(key); g_assert(deflt); ! return const_get_int(key); } *************** *** 125,128 **** --- 185,189 ---- + #if 0 /* Functions to read preferences from the preference file. */ *************** *** 142,146 **** --- 203,209 ---- cont = pref_read_pref_file(file); prefs = g_tree_new(PrefCompare); + #if 0 pref_parse_prefs(cont); + #endif return; } *************** *** 225,228 **** } } ! --- 288,291 ---- } } ! #endif /* 0 */ Index: prefs.h =================================================================== RCS file: /cvsroot/cryptar/cryptar/prefs.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** prefs.h 3 Jan 2004 19:20:35 -0000 1.10 --- prefs.h 28 May 2004 18:12:46 -0000 1.11 *************** *** 38,41 **** --- 38,42 ---- #define DEFAULT_BLOCK_LENGTH "1024" + void do_create(); const char *pref_get_value(char *key); int pref_get_int_value(char *key); |
|
From: Jeff A. <jm...@us...> - 2004-05-28 18:12:05
|
Update of /cvsroot/cryptar/cryptar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12752 Modified Files: option.c Log Message: Improve commandline user interface. Index: option.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/option.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** option.c 15 May 2004 14:42:01 -0000 1.15 --- option.c 28 May 2004 18:11:55 -0000 1.16 *************** *** 45,53 **** static struct option long_options[] = { ! {"archive-name", required_argument, NULL, 'a'}, ! {"backup", optional_argument, NULL, 'b'}, {"create", no_argument, NULL, 'c'}, ! {"extract", optional_argument, NULL, 'x'}, ! {"list", optional_argument, NULL, 't'}, {"ping", no_argument, NULL, 'p'}, {"verbose", optional_argument, NULL, 'v'}, --- 45,52 ---- static struct option long_options[] = { ! {"backup", no_argument, NULL, 'b'}, {"create", no_argument, NULL, 'c'}, ! {"extract", no_argument, NULL, 'x'}, ! {"list", no_argument, NULL, 't'}, {"ping", no_argument, NULL, 'p'}, {"verbose", optional_argument, NULL, 'v'}, *************** *** 72,102 **** options_init(); ! while (c = getopt_long (argc, argv, "c:x:t:v::h", long_options, 0), c != EOF) { switch (c) { ! case 'a': ! log_am_client(); ! set_char_option(kArchive_target, g_strdup(optarg)); ! if(int_option(kOption_verbose) & VERBOSE_FLOW_PLUS) ! g_message ("Archive is '%s'", ! char_option_safe(kArchive_target)); ! break; ! case 'b': log_am_client(); set_int_option(kOption_backup, 1); - if(optarg) - set_char_option(kBackup_pattern, g_strdup(optarg)); if(int_option(kOption_verbose) & VERBOSE_FLOW_PLUS) ! g_message ("action archive: %s", ! char_option(kBackup_pattern)); break; case 'c': log_am_client(); ! set_int_option(kOption_backup, 1); if(int_option(kOption_verbose) & VERBOSE_FLOW_PLUS) ! g_message ("action create:"); break; --- 71,91 ---- options_init(); ! while (c = getopt_long (argc, argv, "bcxtpv::nh", long_options, 0), c != EOF) { switch (c) { ! case 'b': log_am_client(); set_int_option(kOption_backup, 1); if(int_option(kOption_verbose) & VERBOSE_FLOW_PLUS) ! g_message ("action backup"); break; case 'c': log_am_client(); ! set_int_option(kOption_create, 1); if(int_option(kOption_verbose) & VERBOSE_FLOW_PLUS) ! g_message ("action create"); break; *************** *** 104,112 **** log_am_client(); set_int_option(kOption_extract, 1); - if(optarg) - set_char_option(kExtract_pattern, g_strdup(optarg)); if(int_option(kOption_verbose) & VERBOSE_FLOW_PLUS) ! g_message("action extract, file '%s'", ! char_option_safe(kExtract_pattern)); break; --- 93,98 ---- log_am_client(); set_int_option(kOption_extract, 1); if(int_option(kOption_verbose) & VERBOSE_FLOW_PLUS) ! g_message("action extract"); break; *************** *** 114,122 **** log_am_client(); set_int_option(kOption_list, 1); - if(optarg) - set_char_option(kList_pattern, g_strdup(optarg)); if(int_option(kOption_verbose) & VERBOSE_FLOW_PLUS) ! g_message("option list, file '%s'", ! char_option_safe(kList_pattern)); break; --- 100,105 ---- log_am_client(); set_int_option(kOption_list, 1); if(int_option(kOption_verbose) & VERBOSE_FLOW_PLUS) ! g_message("option list"); break; *************** *** 149,152 **** --- 132,136 ---- set_int_option(kOption_verbose, int_option(kOption_verbose | VERBOSE_FILES)); + g_error("This option isn't currently implemented."); break; *************** *** 189,192 **** --- 173,182 ---- num_args = argc - optind; + if(optind < argc) { + set_char_option(kArchive_target, argv[optind++]); + if(int_option(kOption_verbose) & VERBOSE_FLOW_PLUS) + g_message ("Archive is '%s'", + char_option_safe(kArchive_target)); + } g_args = g_ptr_array_new(); while(optind < argc) |
|
From: Jeff A. <jm...@us...> - 2004-05-28 18:11:48
|
Update of /cvsroot/cryptar/cryptar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12674 Modified Files: main.c Log Message: free memory returned from preference functions (constants table) Index: main.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/main.c,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** main.c 15 May 2004 14:42:00 -0000 1.25 --- main.c 28 May 2004 18:11:32 -0000 1.26 *************** *** 101,104 **** --- 101,105 ---- pid_t pid; int rc; + char *cmd; /* Don't clobber argv[] so that ps(1) can still show the right *************** *** 109,115 **** argc--; if (int_option(kOption_verbose) & VERBOSE_FLOW_PLUS) ! g_message("cmd=%s\n", pref_get_value(PREF_DAEMON_COMMAND)); ! pid = do_cmd(pref_get_value(PREF_DAEMON_COMMAND)); if(!pid) return -1; --- 110,118 ---- argc--; + cmd = pref_get_value(PREF_DAEMON_COMMAND); if (int_option(kOption_verbose) & VERBOSE_FLOW_PLUS) ! g_message("cmd=%s\n", cmd); ! pid = do_cmd(cmd); ! g_free(cmd); if(!pid) return -1; *************** *** 257,261 **** NULL); - pref_get_prefs(); setup_signals(); g_atexit(db_error_exit); --- 260,263 ---- *************** *** 264,268 **** return 1; } ! #ifdef CLEARTEXT /* The server doesn't do encryption or compression anyway, so --- 266,275 ---- return 1; } ! ! if(int_option(kOption_create)) { ! do_create(); ! return 0; ! } ! #ifdef CLEARTEXT /* The server doesn't do encryption or compression anyway, so |
|
From: Jeff A. <jm...@us...> - 2004-05-28 18:10:30
|
Update of /cvsroot/cryptar/cryptar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12495 Added Files: gpl.txt Log Message: template for easy inserting --- NEW FILE: gpl.txt --- /* prefs.c * Copyright (C) 2004 by: * Jeff Abrahamson * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program 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 General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ |
|
From: Jeff A. <jm...@us...> - 2004-05-28 18:10:18
|
Update of /cvsroot/cryptar/cryptar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12449 Modified Files: archive.c Log Message: Free memory returned from preference (constants) interface. Index: archive.c =================================================================== RCS file: /cvsroot/cryptar/cryptar/archive.c,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** archive.c 4 Jan 2004 17:54:37 -0000 1.31 --- archive.c 28 May 2004 18:10:08 -0000 1.32 *************** *** 85,88 **** --- 85,89 ---- to_archive = g_strsplit(to_archive_list, " ", 0); + g_free(to_archive_list); for(i = 0; to_archive[i]; i++) { ftw(to_archive[i], archive_it, ftw_depth); |
|
From: Jeff A. <jm...@us...> - 2004-05-28 18:09:41
|
Update of /cvsroot/cryptar/cryptar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12235 Added Files: constants.c constants.h Log Message: interface to constants table in database --- NEW FILE: constants.c --- /* prefs.c * Copyright (C) 2004 by: * Jeff Abrahamson * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program 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 General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <glib.h> #include <string.h> #include "constants.h" #include "db_misc.h" #include "ios.h" void const_put_string(const char *key, const char *val) { IOSBuf *ios_key, *ios_data; g_assert(key); g_assert(val); ios_key = ios_new(); ios_data = ios_new(); ios_set_buffer(ios_key, key, strlen(key)); ios_append_string(ios_data, val); db_put(kConstants, ios_key, ios_data); ios_free(ios_key); ios_free(ios_data); return; } /* Returned value must be freed by caller. Returns NULL if key is not found in database. */ char *const_get_string(const char *key) { IOSBuf *ios_key, *ios_data; char *ret_buf, *val; g_assert(key); ios_key = ios_new(); ios_data = ios_new(); ios_set_buffer(ios_key, key, strlen(key)); db_get(kConstants, ios_key, ios_data); val = ios_read_str(ios_data); if(val) ret_buf = g_strdup(val); else ret_buf = NULL; ios_free(ios_key); ios_free(ios_data); return ret_buf; } void const_put_int(const char *key, const guint32 val) { IOSBuf *ios_key, *ios_data; g_assert(key); ios_key = ios_new(); ios_data = ios_new(); ios_set_buffer(ios_key, key, strlen(key)); ios_append_int32(ios_data, val); db_put(kConstants, ios_key, ios_data); ios_free(ios_key); ios_free(ios_data); return; } int const_get_int(const char *key) { IOSBuf *ios_key, *ios_data; guint32 val; g_assert(key); ios_key = ios_new(); ios_data = ios_new(); ios_set_buffer(ios_key, key, strlen(key)); db_get(kConstants, ios_key, ios_data); val = ios_read_int32(ios_data); /* ### Hmm, what happens if we don't have one? */ ios_free(ios_key); ios_free(ios_data); return val; } --- NEW FILE: constants.h --- /* prefs.c * Copyright (C) 2004 by: * Jeff Abrahamson * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program 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 General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef __CONSTANTS_H__ #define __CONSTANTS_H__ #include <glib.h> void const_put_string(const char *key, const char *val); char *const_get_string(const char *key); void const_put_int(const char *key, const guint32 val); int const_get_int(const char *key); #endif |
|
From: Jeff A. <jm...@us...> - 2004-05-28 18:09:03
|
Update of /cvsroot/cryptar/cryptar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12010 Modified Files: README.code.txt Log Message: More things that aren't done or need fixing. Index: README.code.txt =================================================================== RCS file: /cvsroot/cryptar/cryptar/README.code.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** README.code.txt 28 May 2004 15:11:30 -0000 1.10 --- README.code.txt 28 May 2004 18:08:51 -0000 1.11 *************** *** 87,90 **** --- 87,97 ---- need to pay attention to it. + - The handshake with the remote could surely be better. Probably + should allow better authentication. + + - If communication with the remote is lost, it is currently quite + difficult to re-establish it due to the single I/O queue pair. A + second pair could make this much easier. + - Optionally request deletion of no longer needed blocks. Note that db_del is not tested. *************** *** 118,123 **** file. - - - backup, list, and extract take optional pattern arguments, but they are not handled well or are ignored. They should be handled as --- 125,128 ---- |
|
From: Jeff A. <jm...@us...> - 2004-05-28 18:06:11
|
Update of /cvsroot/cryptar/cryptar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11592 Modified Files: GNUmakefile Log Message: Add constants.o Index: GNUmakefile =================================================================== RCS file: /cvsroot/cryptar/cryptar/GNUmakefile,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** GNUmakefile 4 Jan 2004 03:05:10 -0000 1.19 --- GNUmakefile 28 May 2004 18:06:00 -0000 1.20 *************** *** 40,46 **** OBJS=$(OBJS1) $(OBJS2) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) # And for testing, redefine ! OBJS=main.o util.o option.o fileio.o cryptar.o syscall.o options.o coprocess.o prefs.o extract.o list.o daemon.o archive.o env.o io.o protocol.o ios.o checksum.o sum.o db_misc.o remote.o covering.o hash.o queue.o workticket.o encryption.o compress.o requests.o log.o filename.o summary.o block.o key.o ! DB_OBJS=cryptar-db.o db_misc.o filename.o summary.o block.o remote.o options.o prefs.o ios.o syscall.o checksum.o hash.o key.o TLS_OBJ = tls.o syscall.o lib/permstring.o --- 40,46 ---- OBJS=$(OBJS1) $(OBJS2) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) # And for testing, redefine ! OBJS=main.o util.o option.o fileio.o cryptar.o syscall.o options.o coprocess.o prefs.o extract.o list.o daemon.o archive.o env.o io.o protocol.o ios.o checksum.o sum.o db_misc.o remote.o covering.o hash.o queue.o workticket.o encryption.o compress.o requests.o log.o filename.o summary.o block.o key.o constants.o ! DB_OBJS=cryptar-db.o db_misc.o filename.o summary.o block.o remote.o options.o prefs.o ios.o syscall.o checksum.o hash.o key.o constants.o TLS_OBJ = tls.o syscall.o lib/permstring.o |
|
From: Jeff A. <jm...@us...> - 2004-05-28 15:11:45
|
Update of /cvsroot/cryptar/cryptar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9726 Modified Files: README.code.txt Log Message: improve documentation in the hopes that another mortal might be able to help out Index: README.code.txt =================================================================== RCS file: /cvsroot/cryptar/cryptar/README.code.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** README.code.txt 28 May 2004 14:06:16 -0000 1.9 --- README.code.txt 28 May 2004 15:11:30 -0000 1.10 *************** *** 84,87 **** --- 84,90 ---- *** What needs to be done *** + - Anything marked with "###" means something is missing there and I + need to pay attention to it. + - Optionally request deletion of no longer needed blocks. Note that db_del is not tested. *************** *** 89,92 **** --- 92,100 ---- - Setup autoconf. GNUmakefile is a temporary hack. + - The (de)serialization code will probably fail on machines that are + picky about alignment. The failure would be in the form of + terminated execution due to an illegal memory access. Sparc is a + good candidate for this. + - Consider compilation under other than debian gnu/linux sarge... *************** *** 144,145 **** --- 152,157 ---- should track it. + + Documentation: + + See doc/README.txt |
|
From: Jeff A. <jm...@us...> - 2004-05-28 15:11:41
|
Update of /cvsroot/cryptar/cryptar/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9726/doc Added Files: README.txt usage.txt Log Message: improve documentation in the hopes that another mortal might be able to help out --- NEW FILE: usage.txt --- CRYPTAR(1) NAME cryptar - A cryptographic archiving program SYNOPSIS cryptar [options] patterns DESCRIPTION This manual page documents cryptar, a cryptographic backup program that does not trust its repository to be sufficiently secure to prevent intruders reading or even modifying the data it stores. It can prevent the first and detect the second. Nothing (possible) can prevent the store from losing or modifying the data stored, but these events can at least be detected. Cryptar is an implementation of the cryptar algorithm, which in turn is based on the rsync algorithm. By propitious use of a split database, it stores backup data on a remote server in encrypted form, maintaining sufficient signature information in the local database that it can compute efficient differences between the current versions of files and their previously backed up versions. In doing so it avoids the need to trust the remote database beyond the hope that data stored there will be saved and returned. It is able to guarantee, however, that data returned is legitimate and unmodified. No unencrypted data leaves the client for the server. OPTIONS --archive=name, -a name archive files to archive name --create=name, -c name create a new archive called name --extract-name, -x name extract files from archive name --list=name, -t name list files in archive name --ping, -p ping a remote server --verbose=num, -v num be more verbose, num is the bitwise or of one or more of these: 1=files, 2=protocol, 4=IO, 8=IO summary 16=flow, 32=detail flow, 64=DB --dry-run, -n don't actually do anything --daemon run as a server (block store) --help, -h display a helpful message --selftest test the protocol and some internal functions, only available if MAINTAINER_MODE is set to non-zero at compile time SETUP You must create a file called $HOME/.cryptar to specify the archives you know about. This should change and become automated as a part of the --create option. An archive specification includes the directories to backup as well as the host to which to back it up. Thus, in usage, one need merely state the archive to use. What to backup (or restore) and where it is stored remotely is determined from the local database. EXAMPLES Note that pattern matching (the final arguments to cryptar) is not well implemented yet. In some cases it's not implemented at all. This should change soon... To archive some files as configured in a database called work-files: cryptar --archive=work-files To see what's in the databse: cryptar --list=work-files To restore those files again: cryptar --extract=work-files FILES $HOME/cryptar/ Directory for local databases. If this goes away, there is no recovery. $HOME/.cryptar Configuration file, probably will get wrapped into --create and the local database. BUGS This software is early beta. It has many bugs. The object serialization and network protocol standards may change without notice as it becomes more stable. This means you can use it, but at your own risk and with the understanding that your current archive may not be accessible by a future version of cryptar. As cryptar approaches proper release, we will implement backward compatibility from that point forward. In addition, it may not even work as advertised. Please help: report bugs or help with development. See the file README.code.txt in the source distribution. AUTHOR Written by Jeff Abrahamson REPORTING BUGS Report bugs to <je...@pu...> COPYRIGHT Copyright © 2004 Jeff Abrahamson This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. SEE ALSO J. Abrahamson, A. J. O'Donnell,Cryptar: Secure, Untrustful, Differencing Backup, NordU/usenix conference, Copenhagen, Denmark, January 31 - February 1, 2004. --- NEW FILE: README.txt --- The documents in this folder should surely be converted to a better form (docbook?) that can generate the various forms that would be nice to have (man, info, html, etc.). |
|
From: Jeff A. <jm...@us...> - 2004-05-28 14:50:19
|
Update of /cvsroot/cryptar/cryptar/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5650/doc Log Message: Directory /cvsroot/cryptar/cryptar/doc added to the repository |
|
From: Jeff A. <jm...@us...> - 2004-05-28 14:06:26
|
Update of /cvsroot/cryptar/cryptar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30439 Modified Files: README.code.txt Log Message: update Index: README.code.txt =================================================================== RCS file: /cvsroot/cryptar/cryptar/README.code.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** README.code.txt 21 May 2004 19:10:00 -0000 1.8 --- README.code.txt 28 May 2004 14:06:16 -0000 1.9 *************** *** 84,99 **** *** What needs to be done *** ! [ ! Once we get it back to archiving properly, it's not requesting ! deletion of the remote blocks. This means we don't see appropriate ! shrinkage in the remote db. ! ! db_del is therefore not tested. But I pasted the code from somewhere ! else where it worked, so I suspect it will be fine, or almost fine, ! but not subtly buggy. ! ! See also the file TODO ! ] ! - Setup autoconf. GNUmakefile is a temporary hack. --- 84,89 ---- *** What needs to be done *** ! - Optionally request deletion of no longer needed blocks. Note that ! db_del is not tested. - Setup autoconf. GNUmakefile is a temporary hack. |