Second general clean-up

build.sh

@@ -54,6 +54,6 @@ if [ -a testok.txt ] && [ -f testok.txt ]; then
 fi
 exit 1
 
-# $Source$
-# $Revision$
-# $Date$
+# ref:         $Format:%D$
+# git commit:  $Format:%H$
+# commit time: $Format:%ai$

check_source.sh

@@ -10,6 +10,6 @@ echo "checking..."
 
 exit 0
 
-# $Source$
-# $Revision$
-# $Date$
+# ref:         $Format:%D$
+# git commit:  $Format:%H$
+# commit time: $Format:%ai$

coverage.sh

@@ -46,6 +46,6 @@ fi
 
 exit 0
 
-# $Source$
-# $Revision$
-# $Date$
+# ref:         $Format:%D$
+# git commit:  $Format:%H$
+# commit time: $Format:%ai$

coverage_more.sh

@@ -19,6 +19,6 @@ fi
 
 exit 0
 
-# $Source$
-# $Revision$
-# $Date$
+# ref:         $Format:%D$
+# git commit:  $Format:%H$
+# commit time: $Format:%ai$

demos/constants.c

@@ -5,8 +5,6 @@
  *
  * The library is free for all purposes without any express
  * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
  */
 #include "tomcrypt.h"
 
@@ -49,6 +47,6 @@ int main(void) {
 }
 
 
-/* $Source$ */
-/* $Revision$ */
-/* $Date$ */
+/* ref:         $Format:%D$ */
+/* git commit:  $Format:%H$ */
+/* commit time: $Format:%ai$ */

demos/hashsum.c

@@ -1,3 +1,12 @@
+/* LibTomCrypt, modular cryptographic library -- Tom St Denis
+ *
+ * LibTomCrypt is a library that provides various cryptographic
+ * algorithms in a highly modular and flexible manner.
+ *
+ * The library is free for all purposes without any express
+ * guarantee it works.
+ */
+
 /*
  * Written by Daniel Richards <kyhwana@world-net.co.nz> 6/7/2002
  * hash.c: This app uses libtomcrypt to hash either stdin or a file
@@ -260,6 +269,6 @@ int main(int argc, char **argv)
    return EXIT_SUCCESS;
 }
 
-/* $Source$ */
-/* $Revision$ */
-/* $Date$ */
+/* ref:         $Format:%D$ */
+/* git commit:  $Format:%H$ */
+/* commit time: $Format:%ai$ */

demos/ltcrypt.c

@@ -1,3 +1,12 @@
+/* LibTomCrypt, modular cryptographic library -- Tom St Denis
+ *
+ * LibTomCrypt is a library that provides various cryptographic
+ * algorithms in a highly modular and flexible manner.
+ *
+ * The library is free for all purposes without any express
+ * guarantee it works.
+ */
+
 /* encrypt V1.1 Fri Oct 18 04:28:03 NZDT 2002 */
 /* File de/encryption, using libtomcrypt */
 /* Written by Daniel Richards <kyhwana@world-net.co.nz> */
@@ -190,6 +199,6 @@ int main(int argc, char *argv[])
    return 0;
 }
 
-/* $Source$ */
-/* $Revision$ */
-/* $Date$ */
+/* ref:         $Format:%D$ */
+/* git commit:  $Format:%H$ */
+/* commit time: $Format:%ai$ */

demos/openssl-enc.c

@@ -1,3 +1,12 @@
+/* LibTomCrypt, modular cryptographic library -- Tom St Denis
+ *
+ * LibTomCrypt is a library that provides various cryptographic
+ * algorithms in a highly modular and flexible manner.
+ *
+ * The library is free for all purposes without any express
+ * guarantee it works.
+ */
+
 /*
  * Demo to do the rough equivalent of:
  *
@@ -382,3 +391,7 @@ int main(int argc, char *argv[]) {
    fclose(infd); fclose(outfd);
    return 0;
 }
+
+/* ref:         $Format:%D$ */
+/* git commit:  $Format:%H$ */
+/* commit time: $Format:%ai$ */

demos/sizes.c

@@ -5,8 +5,6 @@
  *
  * The library is free for all purposes without any express
  * guarantee it works.
- *
- * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
  */
 #include "tomcrypt.h"
 
@@ -42,7 +40,6 @@ int main(void) {
     return 0;
 }
 
-
-/* $Source:  $ */
-/* $Revision:  $ */
-/* $Date:  $ */
+/* ref:         $Format:%D$ */
+/* git commit:  $Format:%H$ */
+/* commit time: $Format:%ai$ */

demos/small.c

@@ -1,3 +1,11 @@
+/* LibTomCrypt, modular cryptographic library -- Tom St Denis
+ *
+ * LibTomCrypt is a library that provides various cryptographic
+ * algorithms in a highly modular and flexible manner.
+ *
+ * The library is free for all purposes without any express
+ * guarantee it works.
+ */
 /* small demo app that just includes a cipher/hash/prng */
 #include <tomcrypt.h>
 
@@ -9,6 +17,6 @@ int main(void)
    return 0;
 }
 
-/* $Source$ */
-/* $Revision$ */
-/* $Date$ */
+/* ref:         $Format:%D$ */
+/* git commit:  $Format:%H$ */
+/* commit time: $Format:%ai$ */

demos/timing.c

@@ -1,3 +1,11 @@
+/* LibTomCrypt, modular cryptographic library -- Tom St Denis
+ *
+ * LibTomCrypt is a library that provides various cryptographic
+ * algorithms in a highly modular and flexible manner.
+ *
+ * The library is free for all purposes without any express
+ * guarantee it works.
+ */
 #include <tomcrypt.h>
 
 #if defined(_WIN32)
@@ -1454,6 +1462,6 @@ return EXIT_SUCCESS;
 
 }
 
-/* $Source$ */
-/* $Revision$ */
-/* $Date$ */
+/* ref:         $Format:%D$ */
+/* git commit:  $Format:%H$ */
+/* commit time: $Format:%ai$ */

demos/tv_gen.c

@@ -1,3 +1,11 @@
+/* LibTomCrypt, modular cryptographic library -- Tom St Denis
+ *
+ * LibTomCrypt is a library that provides various cryptographic
+ * algorithms in a highly modular and flexible manner.
+ *
+ * The library is free for all purposes without any express
+ * guarantee it works.
+ */
 #include <tomcrypt.h>
 
 void hash_gen(void)
@@ -784,6 +792,6 @@ int main(void)
    return 0;
 }
 
-/* $Source$ */
-/* $Revision$ */
-/* $Date$ */
+/* ref:         $Format:%D$ */
+/* git commit:  $Format:%H$ */
+/* commit time: $Format:%ai$ */

doc/crypt.tex

@@ -51,13 +51,13 @@
 \newcommand{\mysection}[1]    % Re-define the chaptering command to use
 	{                   % THESE headers.
 	\section{#1}
-   \markboth{\textsf{www.libtom.org}}{\thesection ~ {#1}}
+   \markboth{\textsf{www.libtom.net}}{\thesection ~ {#1}}
 	}
 
 \newcommand{\mystarsection}[1]    % Re-define the chaptering command to use
 	{                   % THESE headers.
 	\section*{#1}
-   \markboth{\textsf{www.libtom.org}}{{#1}}
+   \markboth{\textsf{www.libtom.net}}{{#1}}
 	}
 \pagestyle{empty}
 \begin{document}
@@ -7312,6 +7312,6 @@ \subsection{RSA Functions}
 
 \end{document}
 
-% $Source$
-% $Revision$
-% $Date$
+% ref:         $Format:%D$
+% git commit:  $Format:%H$
+% commit time: $Format:%ai$

doc/footer.html

@@ -4,7 +4,7 @@
 <a href="http://jlcooke.ca/tom/hidden_image.png">
 
 <!--
-/* $Source$ */
-/* $Revision$ */
-/* $Date$ */
+/* ref:         $Format:%D$ */
+/* git commit:  $Format:%H$ */
+/* commit time: $Format:%ai$ */
 -->

helper.pl

@@ -135,7 +135,7 @@ sub check_comments {
 /* commit time: $Format:%ai$ */
 MARKER
   my @all_files;
-  find({ wanted=> sub { push @all_files, $_ if $_ =~ /\.(c|h)$/ }, no_chdir=>1 }, 'src');
+  find({ wanted=> sub { push @all_files, $_ if $_ =~ /\.(c|h)$/ }, no_chdir=>1 }, 'demos', 'src', 'tests');
   for my $f (@all_files) {
     my $txt = read_file($f);
     if ($txt !~ /^\Q$first_comment\E/s) {

makefile

@@ -23,7 +23,7 @@ endif
 
 # ranlib tools
 ifndef RANLIB
-RANLIB:=$(PREFIX)ranlib
+RANLIB:=$(CROSS_COMPILE)ranlib
 endif
 INSTALL_CMD = install
 

makefile.mingw

@@ -7,15 +7,15 @@
 #
 # gmake -f makefile.mingw all
 # test.exe
-# gmake -f makefile.mingw DESTDIR=c:\devel\libtom install
+# gmake -f makefile.mingw PREFIX=c:\devel\libtom install
 #
 #Or:
 #
 # gmake -f makefile.mingw CFLAGS="-O3 -DUSE_LTM -DLTM_DESC -Ic:/path/to/libtommath" EXTRALIBS="-Lc:/path/to/libtommath -ltommath" all
 #
 
 #The following can be overridden from command line e.g. make -f makefile.mingw CC=gcc ARFLAGS=rcs
-DESTDIR   = c:\mingw
+PREFIX    = c:\mingw
 CC        = gcc
 AR        = ar
 ARFLAGS   = r
@@ -262,20 +262,20 @@ clean:
 
 #Install the library + headers
 install: $(LIBMAIN_S) $(LIBMAIN_I) $(LIBMAIN_D)
-	cmd /c if not exist "$(DESTDIR)\bin" mkdir "$(DESTDIR)\bin"
-	cmd /c if not exist "$(DESTDIR)\lib" mkdir "$(DESTDIR)\lib"
-	cmd /c if not exist "$(DESTDIR)\include" mkdir "$(DESTDIR)\include"
-	copy /Y $(LIBMAIN_S) "$(DESTDIR)\lib"
-	copy /Y $(LIBMAIN_I) "$(DESTDIR)\lib"
-	copy /Y $(LIBMAIN_D) "$(DESTDIR)\bin"
-	copy /Y src\headers\tomcrypt*.h "$(DESTDIR)\include"
+	cmd /c if not exist "$(PREFIX)\bin" mkdir "$(PREFIX)\bin"
+	cmd /c if not exist "$(PREFIX)\lib" mkdir "$(PREFIX)\lib"
+	cmd /c if not exist "$(PREFIX)\include" mkdir "$(PREFIX)\include"
+	copy /Y $(LIBMAIN_S) "$(PREFIX)\lib"
+	copy /Y $(LIBMAIN_I) "$(PREFIX)\lib"
+	copy /Y $(LIBMAIN_D) "$(PREFIX)\bin"
+	copy /Y src\headers\tomcrypt*.h "$(PREFIX)\include"
 
 #Install useful tools
 install_bins: hashsum
-	cmd /c if not exist "$(DESTDIR)\bin" mkdir "$(DESTDIR)\bin"
-	copy /Y hashsum.exe "$(DESTDIR)\bin"
+	cmd /c if not exist "$(PREFIX)\bin" mkdir "$(PREFIX)\bin"
+	copy /Y hashsum.exe "$(PREFIX)\bin"
 
 #Install documentation
 install_docs: doc/crypt.pdf
-	cmd /c if not exist "$(DESTDIR)\doc" mkdir "$(DESTDIR)\doc"
-	copy /Y doc\crypt.pdf "$(DESTDIR)\doc"
+	cmd /c if not exist "$(PREFIX)\doc" mkdir "$(PREFIX)\doc"
+	copy /Y doc\crypt.pdf "$(PREFIX)\doc"

makefile.msvc

@@ -7,15 +7,15 @@
 #
 # nmake -f makefile.msvc all
 # test.exe
-# nmake -f makefile.msvc DESTDIR=c:\devel\libtom install
+# nmake -f makefile.msvc PREFIX=c:\devel\libtom install
 #
 #Or:
 #
 # nmake -f makefile.msvc CFLAGS="/DUSE_LTM /DLTM_DESC /Ic:\path\to\libtommath" EXTRALIBS=c:\path\to\libtommath\tommath.lib all
 #
 
 #The following can be overridden from command line e.g. make -f makefile.msvc CC=gcc ARFLAGS=rcs
-DESTDIR   = c:\devel
+PREFIX    = c:\devel
 CFLAGS    = /Ox /DUSE_LTM /DLTM_DESC /I../libtommath
 EXTRALIBS = ../libtommath/tommath.lib
 
@@ -249,18 +249,18 @@ clean:
 
 #Install the library + headers
 install: $(LIBMAIN_S)
-	cmd /c if not exist "$(DESTDIR)\bin" mkdir "$(DESTDIR)\bin"
-	cmd /c if not exist "$(DESTDIR)\lib" mkdir "$(DESTDIR)\lib"
-	cmd /c if not exist "$(DESTDIR)\include" mkdir "$(DESTDIR)\include"
-	copy /Y $(LIBMAIN_S) "$(DESTDIR)\lib"
-	copy /Y src\headers\tomcrypt*.h "$(DESTDIR)\include"
+	cmd /c if not exist "$(PREFIX)\bin" mkdir "$(PREFIX)\bin"
+	cmd /c if not exist "$(PREFIX)\lib" mkdir "$(PREFIX)\lib"
+	cmd /c if not exist "$(PREFIX)\include" mkdir "$(PREFIX)\include"
+	copy /Y $(LIBMAIN_S) "$(PREFIX)\lib"
+	copy /Y src\headers\tomcrypt*.h "$(PREFIX)\include"
 
 #Install useful tools
 install_bins: hashsum
-	cmd /c if not exist "$(DESTDIR)\bin" mkdir "$(DESTDIR)\bin"
-	copy /Y hashsum.exe "$(DESTDIR)\bin"
+	cmd /c if not exist "$(PREFIX)\bin" mkdir "$(PREFIX)\bin"
+	copy /Y hashsum.exe "$(PREFIX)\bin"
 
 #Install documentation
 install_docs: doc/crypt.pdf
-	cmd /c if not exist "$(DESTDIR)\doc" mkdir "$(DESTDIR)\doc"
-	copy /Y doc\crypt.pdf "$(DESTDIR)\doc"
+	cmd /c if not exist "$(PREFIX)\doc" mkdir "$(PREFIX)\doc"
+	copy /Y doc\crypt.pdf "$(PREFIX)\doc"