Compilation environment fixes to make make install work correctly.

diff --git a/Makefile.ad b/Makefile.ad
index ac015a1ce829294353cb7bc8cffd70b6166d7429..586780434b76ff4580c42baeb7e1e935e31394c6 100644 (file)
--- a/Makefile.ad
+++ b/Makefile.ad
@@ -25,7 +25,7 @@ SUBDIRS =             \
        doc
 
 EXTRA_DIST =           \
-       silcdefs.h.in   \
+       cryptodefs.h.in \
        sct.spec        \
        symbian         \
        CHANGES CREDITS

diff --git a/configure.ad b/configure.ad
index 48bf498bd43a8c3c8f2e153f9b44ccb9837f66bc..ebc5ddf880ec7d052611c650be56a86e696b0b67 100644 (file)
--- a/configure.ad
+++ b/configure.ad
@@ -136,20 +136,16 @@ case "$host_cpu" in
     SILC_CPU_FLAG(sse2, true, AC_DEFINE([SILC_CPU_SSE2], [], [SILC_CPU_SSE2]), [])
     SILC_CPU_FLAG(pni, true, AC_DEFINE([SILC_CPU_SSE3], [], [SILC_CPU_SSE3]), [])
     SILC_CPU_FLAG(ssse3, true, AC_DEFINE([SILC_CPU_SSSE3], [], [SILC_CPU_SSSE3]), [])
-    SILC_CPU_FLAG(sse4, true, AC_DEFINE([SILC_CPU_SSE4], [], [SILC_CPU_SSE4]), [])
+    SILC_CPU_FLAG(sse4a, true, AC_DEFINE([SILC_CPU_SSE4A], [], [SILC_CPU_SSE4A]), [])
+    SILC_CPU_FLAG(sse4_1, true, AC_DEFINE([SILC_CPU_SSE41], [], [SILC_CPU_SSE41]), [])
+    SILC_CPU_FLAG(sse4_2, true, AC_DEFINE([SILC_CPU_SSE42], [], [SILC_CPU_SSE42]), [])
+    SILC_CPU_FLAG(sse5, true, AC_DEFINE([SILC_CPU_SSE5], [], [SILC_CPU_SSE5]), [])
     ;;
 
   # Intel IA-64, 64-bit CPU (not x86_64 compatible)
   ia64)
     AC_DEFINE([SILC_IA64], [], [SILC_IA64])
     cpu_ia64=true
-
-    # Check for specific CPU features
-    SILC_CPU_FLAG(mmx, true, AC_DEFINE([SILC_CPU_MMX], [], [SILC_CPU_MMX]), [])
-    SILC_CPU_FLAG(sse2, true, AC_DEFINE([SILC_CPU_SSE2], [], [SILC_CPU_SSE2]), [])
-    SILC_CPU_FLAG(pni, true, AC_DEFINE([SILC_CPU_SSE3], [], [SILC_CPU_SSE3]), [])
-    SILC_CPU_FLAG(ssse3, true, AC_DEFINE([SILC_CPU_SSSE3], [], [SILC_CPU_SSSE3]), [])
-    SILC_CPU_FLAG(sse4, true, AC_DEFINE([SILC_CPU_SSE4], [], [SILC_CPU_SSE4]), [])
     ;;
 
   # AMD/Intel x86_64, 64-bit CPU
@@ -161,7 +157,10 @@ case "$host_cpu" in
     SILC_CPU_FLAG(sse2, true, AC_DEFINE([SILC_CPU_SSE2], [], [SILC_CPU_SSE2]), [])
     SILC_CPU_FLAG(pni, true, AC_DEFINE([SILC_CPU_SSE3], [], [SILC_CPU_SSE3]), [])
     SILC_CPU_FLAG(ssse3, true, AC_DEFINE([SILC_CPU_SSSE3], [], [SILC_CPU_SSSE3]), [])
-    SILC_CPU_FLAG(sse4, true, AC_DEFINE([SILC_CPU_SSE4], [], [SILC_CPU_SSE4]), [])
+    SILC_CPU_FLAG(sse4a, true, AC_DEFINE([SILC_CPU_SSE4A], [], [SILC_CPU_SSE4A]), [])
+    SILC_CPU_FLAG(sse4_1, true, AC_DEFINE([SILC_CPU_SSE41], [], [SILC_CPU_SSE41]), [])
+    SILC_CPU_FLAG(sse4_2, true, AC_DEFINE([SILC_CPU_SSE42], [], [SILC_CPU_SSE42]), [])
+    SILC_CPU_FLAG(sse5, true, AC_DEFINE([SILC_CPU_SSE5], [], [SILC_CPU_SSE5]), [])
     ;;
 
   # PowerPC, 32-bit and 64-bit CPUs
@@ -182,7 +181,10 @@ if test x$want_cpu_optimizations = xtrue; then
   # Set some compiler options based on CPU
   if test "x$CC" = "xicc"; then
     # ICC flags
-    if test x$x_have_cpu_sse4 = xtrue; then
+    if test x$x_have_cpu_sse4_1 = xtrue; then
+      SILC_ADD_CFLAGS(-axS)
+    fi
+    if test x$x_have_cpu_sse4_2 = xtrue; then
       SILC_ADD_CFLAGS(-axS)
     fi
     if test x$x_have_cpu_ssse3 = xtrue; then
@@ -203,7 +205,10 @@ if test x$want_cpu_optimizations = xtrue; then
     if test x$x_have_cpu_ssse3 = xtrue; then
       SILC_ADD_CFLAGS(-mssse3)
     fi
-    if test x$x_have_cpu_sse4 = xtrue; then
+    if test x$x_have_cpu_sse4_1 = xtrue; then
+      SILC_ADD_CFLAGS(-msse4)
+    fi
+    if test x$x_have_cpu_sse4_2 = xtrue; then
       SILC_ADD_CFLAGS(-msse4)
     fi
   fi
@@ -455,12 +460,29 @@ AM_CONDITIONAL(SILC_NO_ASM, test x$want_asm = xfalse)
 SILC_ASSEMBLER=""
 have_assembler=false
 if test x$want_asm = xtrue; then
+  ASM_FLAGS=
+  if test x$x_have_cpu_sse2 = xtrue; then
+    ASM_FLAGS="$ASM_FLAGS -D SILC_CPU_SSE2"
+  fi
+  if test x$x_have_cpu_pni = xtrue; then
+    ASM_FLAGS="$ASM_FLAGS -D SILC_CPU_SSE3"
+  fi
+  if test x$x_have_cpu_ssse3 = xtrue; then
+    ASM_FLAGS="$ASM_FLAGS -D SILC_CPU_SSSE3"
+  fi
+  if test x$x_have_cpu_sse4_1 = xtrue; then
+    ASM_FLAGS="$ASM_FLAGS -D SILC_CPU_SSE41"
+  fi
+  if test x$x_have_cpu_sse4_2 = xtrue; then
+    ASM_FLAGS="$ASM_FLAGS -D SILC_CPU_SSE42"
+  fi
+
   AC_PATH_PROG([NASM], [nasm], [no])
   if test "x$NASM" != "xno"; then
     if test x$cpu_x86_64 = xtrue; then
-      SILC_ASSEMBLER="$NASM -O2 -felf64"
+      SILC_ASSEMBLER="$NASM -O2 -felf64 $ASM_FLAGS"
     else
-      SILC_ASSEMBLER="$NASM -O2 -felf"
+      SILC_ASSEMBLER="$NASM -O2 -felf $ASM_FLAGS"
     fi
     have_assembler=true
   fi
@@ -468,9 +490,9 @@ if test x$want_asm = xtrue; then
   AC_PATH_PROG([YASM], [yasm], [no])
   if test "x$YASM" != "xno"; then
     if test x$cpu_x86_64 = xtrue; then
-      SILC_ASSEMBLER="$YASM -Xgnu -felf64"
+      SILC_ASSEMBLER="$YASM -Xgnu -felf64 $ASM_FLAGS"
     else
-      SILC_ASSEMBLER="$YASM -Xgnu -felf"
+      SILC_ASSEMBLER="$YASM -Xgnu -felf $ASM_FLAGS"
     fi
     have_assembler=true
   fi

diff --git a/distdir/crypto b/distdir/crypto
index 1799c4c95488a16140cbd57b93ce5700cd329fe6..ffa85871cf2f591dc3728faf236e5e8e364fb3e3 100644 (file)
--- a/distdir/crypto
+++ b/distdir/crypto
@@ -30,7 +30,8 @@ include README.MACOSX
 include README.SYMBIAN
 
 # Noprocess to optimize packaging and avoid re-licensing of certain files
-noprocess COPYING GPL BSD
+#noprocess COPYING GPL BSD
+noprocess COPYING
 noprocess apps/
 noprocess win32/
 noprocess symbian/

diff --git a/distdir/pre-dist-crypto b/distdir/pre-dist-crypto
index cfebacca134fae7373d64763ad44731c2e3f51f1..4a4bd8aca420e2b62b964e9e52adfa2a8e2973b6 100644 (file)
--- a/distdir/pre-dist-crypto
+++ b/distdir/pre-dist-crypto
@@ -18,4 +18,4 @@ sed -e "s/SILC_VERSION/$dist_version/" -e "s/SILC_RELEASE/$release/" \
 cd doc
 make toolkit-ref-html
 cd ..
-cp ChangeLog doc/runtime/ChangeLog
+cp ChangeLog doc/crypto/ChangeLog

diff --git a/doc/crypto.in/crypto.rc b/doc/crypto.in/crypto.rc
index 6ceea16647d19a80b53644fc5babb9b395c42614..1d5e840797a954bf64bde0595d89d3dfd73622d8 100644 (file)
--- a/doc/crypto.in/crypto.rc
+++ b/doc/crypto.in/crypto.rc
@@ -17,6 +17,56 @@ options:
        --document_footer footer
        --css crypto.css
 
+items:
+       SOURCE
+       NAME
+       COPYRIGHT
+       SYNOPSIS
+       USAGE
+       FUNCTION
+       DESCRIPTION
+       PURPOSE
+       AUTHOR
+       CREATION DATE
+       MODIFICATION HISTORY
+       HISTORY
+       INPUTS
+       INPUT
+       ARGUMENTS
+       OPTIONS
+       PARAMETERS
+       SWITCHES
+       OUTPUT
+       SIDE EFFECTS
+       RESULTS
+       RESULT
+       RETURN VALUE
+       EXAMPLE
+       NOTE
+       NOTES
+       DIAGNOSTICS
+       WARNINGS
+       ERRORS
+       BUGS
+       TODO
+       IDEAS
+       PORTABILITY
+       SEE ALSO
+       METHODS
+       NEW METHODS
+       ATTRIBUTES
+       NEW ATTRIBUTES
+       TAGS
+       COMMANDS
+       DERIVED FROM
+       DERIVED BY
+       USES
+       CHILDREN
+       USED BY
+       PARENTS
+       ACCELERATORS
+       PERFORMANCE
+
 preformatted items:
        EXAMPLE
        SYNOPSIS

diff --git a/doc/crypto.in/index.html.in b/doc/crypto.in/index.html.in
index 54a1702c4ac4378d8c4e89d9a84015a54ce1e484..9d48a2f4d31faa6e74ba3deb2e15449aba8fad04 100644 (file)
--- a/doc/crypto.in/index.html.in
+++ b/doc/crypto.in/index.html.in
@@ -62,7 +62,7 @@ SCT is free software and is licensed with GNU GPL.
 To clone SCT repository give one of the following commands:
 <pre>
  git clone git://git.silc.fi/crypto
- git clone http://git.silc.fi/crypto
+ git clone http://git.silc.fi/crypto.in
 </pre>
 </p>
 

diff --git a/includes/Makefile.ad b/includes/Makefile.ad
index b682a39c9b8d0a1e55656858a930228537162f77..dfa9dc9d145ae51c6f6505850fd23a2ea496bfed 100644 (file)
--- a/includes/Makefile.ad
+++ b/includes/Makefile.ad
@@ -3,7 +3,7 @@
 #
 #  Author: Pekka Riikonen <priikone@silcnet.org>
 #
-#  Copyright (C) 2000 - 2005 Pekka Riikonen
+#  Copyright (C) 2000 - 2005, 2008 Pekka Riikonen
 #
 #  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
@@ -25,9 +25,6 @@ include_HEADERS = \
        silcversion.h
 #endif SILC_DIST_TOOLKIT
 
-EXTRA_DIST = \
-       silc.h \
-       silcwin32.h \
-       silcsymbian.h \
-       silcversion.h.in \
-       silcdistdefs.h
+EXTRA_DIST =           \
+       silcdistdefs.h  \
+       silccompile.h

diff --git a/lib/silcacc/Makefile.ad b/lib/silcacc/Makefile.ad
index 099c04b900effd8dd4bde669291a39c446e8a861..4b9375304811f9ecacd28e16a2a42968fc97cfe9 100644 (file)
--- a/lib/silcacc/Makefile.ad
+++ b/lib/silcacc/Makefile.ad
@@ -17,6 +17,8 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
+SUBDIRS=tests
+
 noinst_LTLIBRARIES = libsilcacc.la
 
 libsilcacc_la_SOURCES = silcacc.c              \

diff --git a/lib/silcacc/tests/Makefile.am b/lib/silcacc/tests/Makefile.am
index 8ceace81c9d1bce407b82db1edc108c1076b1004..72827b0e9494d006d7437817e432daf2e38510bc 100644 (file)
--- a/lib/silcacc/tests/Makefile.am
+++ b/lib/silcacc/tests/Makefile.am
@@ -3,7 +3,7 @@
 #
 #  Author: Pekka Riikonen <priikone@silcnet.org>
 #
-#  Copyright (C) 2007 Pekka Riikonen
+#  Copyright (C) 2007, 2008 Pekka Riikonen
 #
 #  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
@@ -17,14 +17,10 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
-bin_PROGRAMS =         test_softacc                    \
+check_PROGRAMS = test_softacc                  \
                test_softacc_cipher             \
                test_softacc_cipher2
 
-test_softacc_SOURCES = test_softacc.c
-test_softacc_cipher_SOURCES = test_softacc_cipher.c
-test_softacc_cipher2_SOURCES = test_softacc_cipher2.c
-
 LIBS = $(SILC_COMMON_LIBS)
 LDADD = -L.. -L../.. -lsct
 

diff --git a/lib/silcasn1/Makefile.ad b/lib/silcasn1/Makefile.ad
index 34629a5ae3181c65d2460d98f82aae0b08679bea..26bca6169b28bd17c96acd41490d5a763ac2feb7 100644 (file)
--- a/lib/silcasn1/Makefile.ad
+++ b/lib/silcasn1/Makefile.ad
@@ -17,6 +17,8 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
+SUBDIRS=tests
+
 noinst_LTLIBRARIES = libsilcasn1.la
 
 libsilcasn1_la_SOURCES =       \
@@ -24,14 +26,15 @@ libsilcasn1_la_SOURCES =    \
        silcasn1.c              \
        silcasn1_decode.c       \
        silcasn1_encode.c
+       silcber.h               \
+       silcasn1.h              \
+       silcasn1_i.h
 
 include_HEADERS =      \
        silcber.h       \
        silcasn1.h      \
        silcasn1_i.h
 
-SILC_EXTRA_DIST = tests
-
-EXTRA_DIST = *.h $(SILC_EXTRA_DIST)
+EXTRA_DIST = 
 
 include $(top_srcdir)/Makefile.defines.in

diff --git a/lib/silcasn1/silcber.h b/lib/silcasn1/silcber.h
index b8280d8448503c519ee9985947de8c97b73a0740..511380119ba68e27da17717c43b66b55de0196eb 100644 (file)
--- a/lib/silcasn1/silcber.h
+++ b/lib/silcasn1/silcber.h
@@ -27,6 +27,9 @@
  * to encode and decode DER blocks as well.  These routines does not
  * allocate any memory and have been optimized for general ASN.1 usage.
  *
+ * This is a low level interface and is not usually needed or used
+ * directly.
+ *
  * References: ITU-T X.690
  * http://www.itu.int/ITU-T/studygroups/com17/languages/X690_0702.pdf
  *

diff --git a/lib/silcasn1/tests/Makefile.am b/lib/silcasn1/tests/Makefile.am
index e7e5dae85482bce1275cdb534109edc9f80fe2d4..335c0c88a3985a1446a0134ad3b0b0fb3d23ec3f 100644 (file)
--- a/lib/silcasn1/tests/Makefile.am
+++ b/lib/silcasn1/tests/Makefile.am
@@ -17,9 +17,7 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
-bin_PROGRAMS = test_silcasn1
-
-test_silcasn1_SOURCES = test_silcasn1.c
+check_PROGRAMS = test_silcasn1
 
 LIBS = $(SILC_COMMON_LIBS)
 LDADD = -L.. -L../.. -lsilc -lsilcasn1

diff --git a/lib/silccrypt/Makefile.ad b/lib/silccrypt/Makefile.ad
index afa77f574f2460fe16325bc1f14af99521efd0b4..286ead43dbf6b35c8e95894ebd82366d0a258351 100644 (file)
--- a/lib/silccrypt/Makefile.ad
+++ b/lib/silccrypt/Makefile.ad
@@ -17,6 +17,8 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
+SUBDIRS=tests
+
 noinst_LTLIBRARIES = libsilccrypt.la
 
 if SILC_AES_ASM
@@ -67,7 +69,7 @@ include_HEADERS =             \
        silcpkcs1.h             \
        silcpk.h
 
-SILC_EXTRA_DIST = tests
+SILC_EXTRA_DIST =
 
 SUFFIXES = .asm
 

diff --git a/lib/silccrypt/silcdh.h b/lib/silccrypt/silcdh.h
index e66faa8a2a88e2e8fc4c8320e97d76b2eb61da46..c04bb06eded3600962d92ba19d0420eefbdcbd12 100644 (file)
--- a/lib/silccrypt/silcdh.h
+++ b/lib/silccrypt/silcdh.h
@@ -1,10 +1,10 @@
 /*
 
-  silcdh.h 
+  silcdh.h
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2001 Pekka Riikonen
+  Copyright (C) 2001 - 2008 Pekka Riikonen
 
   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
@@ -17,7 +17,7 @@
 
 */
 
-/****h* silccrypt/SilcDH/silcdh.h
+/****h* silccrypt/Diffie Hellman Interface
  *
  * DESCRIPTION
  *
@@ -31,10 +31,10 @@
 
 #include "silcmp.h"
 
-/****s* silccrypt/SilcDH/SilcDH
+/****s* silccrypt/SilcDH
  *
  * NAME
- * 
+ *
  *    typedef struct SilcDHStruct *SilcDH;
  *
  * DESCRIPTION
@@ -58,12 +58,12 @@ struct SilcDHStruct {
   SilcMPInt *z;                     /* The computed secret key (z = y' ^ x mod p) */
 };
 
-/****f* silccrypt/SilcDH/silc_dh_alloc
+/****f* silccrypt/silc_dh_alloc
  *
  * SYNOPSIS
- *    
+ *
  *    SilcDH silc_dh_alloc(SilcMPInt *g, SilcMPInt *p, SilcMPInt *lpf);
- * 
+ *
  * DESCRIPTION
  *
  *    Allocate SilcDH context. The `g' is the public base generator used
@@ -72,12 +72,12 @@ struct SilcDHStruct {
  *    publicly as well. The `lpf' is optional and if it is not supplied
  *    then the private values generated satifies 0 < x < p - 1 instead
  *    of 0 < x < lpf. Returns NULL on error or allocated SilcDH context
- *    on success. 
+ *    on success.
  *
  ***/
 SilcDH silc_dh_alloc(SilcMPInt *g, SilcMPInt *p, SilcMPInt *lpf);
 
-/****f* silccrypt/SilcDH/silc_dh_free
+/****f* silccrypt/silc_dh_free
  *
  * SYNOPSIS
  *
@@ -85,13 +85,13 @@ SilcDH silc_dh_alloc(SilcMPInt *g, SilcMPInt *p, SilcMPInt *lpf);
  *
  * DESCRIPTION
  *
- *    Free the SilcDH context. Frees all the allocated data inside the 
- *    SilcDH context. 
+ *    Free the SilcDH context. Frees all the allocated data inside the
+ *    SilcDH context.
  *
  ***/
 void silc_dh_free(SilcDH dh);
 
-/****f* silccrypt/SilcDH/silc_dh_generate_private
+/****f* silccrypt/silc_dh_generate_private
  *
  * SYNOPSIS
  *
@@ -102,12 +102,12 @@ void silc_dh_free(SilcDH dh);
  *    Generates random private value `x' such that 0 < x < lpf at most of
  *    length of lpf. Returns FALSE if the random number could not be generated.
  *    Returns the generated value into `x' pointer sent as argument, unless
- *    the `x' is NULL. The returned `x' must not be freed by the caller. 
+ *    the `x' is NULL. The returned `x' must not be freed by the caller.
  *
  ***/
 SilcBool silc_dh_generate_private(SilcDH dh, const SilcMPInt **x);
 
-/****f* silccrypt/SilcDH/silc_dh_compute_public
+/****f* silccrypt/silc_dh_compute_public
  *
  * SYNOPSIS
  *
@@ -118,12 +118,12 @@ SilcBool silc_dh_generate_private(SilcDH dh, const SilcMPInt **x);
  *    Computes the public key y = g ^ x mod p, and returns it to the `y'
  *    pointer sent as argument, unless the `y' is NULL. Returns FALSE if
  *    the computation could not be performed. The returned `y' must not be
- *    freed by the caller. 
+ *    freed by the caller.
  *
  ***/
 SilcBool silc_dh_compute_public(SilcDH dh, const SilcMPInt **y);
 
-/****f* silccrypt/SilcDH/silc_dh_remote_public
+/****f* silccrypt/silc_dh_remote_public
  *
  * SYNOPSIS
  *
@@ -132,13 +132,13 @@ SilcBool silc_dh_compute_public(SilcDH dh, const SilcMPInt **y);
  * DESCRIPTION
  *
  *    Sets the remote end's public value y' into the SilcDH context.
- *    This must be done before computing the secret key. Returns FALSE 
- *    on error. 
+ *    This must be done before computing the secret key. Returns FALSE
+ *    on error.
  *
  ***/
 SilcBool silc_dh_set_remote_public(SilcDH dh, SilcMPInt *y);
 
-/****f* silccrypt/SilcDH/silc_dh_compute_key
+/****f* silccrypt/silc_dh_compute_key
  *
  * SYNOPSIS
  *
@@ -149,16 +149,16 @@ SilcBool silc_dh_set_remote_public(SilcDH dh, SilcMPInt *y);
  *    Computes the secret key z = y' ^ x mod p, and returns the key to the
  *    `z' pointer sent as argument, unless the `z' is NULL. Returns FALSE if
  *    the computation could not be performed. The returned `z' must not be
- *    freed by the caller. 
+ *    freed by the caller.
  *
  ***/
 SilcBool silc_dh_compute_key(SilcDH dh, const SilcMPInt **z);
 
-/****f* silccrypt/SilcDH/silc_dh_remote_public
+/****f* silccrypt/silc_dh_compute_key_data
  *
  * SYNOPSIS
  *
- *    SilcBool silc_dh_compute_key_data(SilcDH dh, unsigned char **z, 
+ *    SilcBool silc_dh_compute_key_data(SilcDH dh, unsigned char **z,
  *                                  SilcUInt32 *z_len);
  *
  * DESCRIPTION
@@ -167,7 +167,7 @@ SilcBool silc_dh_compute_key(SilcDH dh, const SilcMPInt **z);
  *    string.  The caller must free the returned binary string.
  *
  ***/
-SilcBool silc_dh_compute_key_data(SilcDH dh, unsigned char **z, 
+SilcBool silc_dh_compute_key_data(SilcDH dh, unsigned char **z,
                              SilcUInt32 *z_len);
 
 #endif

diff --git a/lib/silccrypt/silcmac.h b/lib/silccrypt/silcmac.h
index ad6548c628f001151fb59146b515862f2a9a4e10..78d4a0c3bff89962c59d2023effe8f075c10a6b7 100644 (file)
--- a/lib/silccrypt/silcmac.h
+++ b/lib/silccrypt/silcmac.h
@@ -513,6 +513,7 @@ void silc_mac_final(SilcMac mac, unsigned char *return_hash,
 #define silc_hmac_set_key silc_mac_set_key
 #define silc_hmac_get_key silc_mac_get_key
 #define silc_hmac_make silc_mac_make
+#define silc_hmac_init silc_mac_init
 #define silc_hmac_init_with_key silc_mac_init_with_key
 #define silc_hmac_update silc_mac_update
 #define silc_hmac_final silc_mac_final

diff --git a/lib/silccrypt/silcpkcs1.h b/lib/silccrypt/silcpkcs1.h
index 6b2d134cf67f39c68f29d31953c0485206707822..48d3b23d218afcfa2210d384a20dc73b3280a381 100644 (file)
--- a/lib/silccrypt/silcpkcs1.h
+++ b/lib/silccrypt/silcpkcs1.h
@@ -27,6 +27,8 @@
  * such as digital signatures and their verification, and encryption and
  * decryption.
  *
+ * This is a low level interface that usually is not needed or used directly.
+ *
  ***/
 
 #ifndef SILCPKCS1_H

diff --git a/lib/silccrypt/tests/Makefile.am b/lib/silccrypt/tests/Makefile.am
index 9e86175b65b87e75f8aa1c7fe6c4a23853c5a071..8d79e2027a1a5ac667161297e027a1c3ae2266f2 100644 (file)
--- a/lib/silccrypt/tests/Makefile.am
+++ b/lib/silccrypt/tests/Makefile.am
@@ -3,7 +3,7 @@
 #
 #  Author: Pekka Riikonen <priikone@silcnet.org>
 #
-#  Copyright (C) 2002 - 2003 Pekka Riikonen
+#  Copyright (C) 2002 - 2003, 2008 Pekka Riikonen
 #
 #  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
@@ -17,7 +17,7 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
-bin_PROGRAMS =         test_sha1       \
+check_PROGRAMS = test_sha1     \
                test_sha256     \
                test_md5        \
                test_hmacsha1   \
@@ -32,23 +32,6 @@ bin_PROGRAMS =       test_sha1       \
                test_hash       \
                test_cipher
 
-test_hash_SOURCES = test_hash.c
-test_sha1_SOURCES = test_sha1.c
-test_sha256_SOURCES = test_sha256.c
-test_md5_SOURCES = test_md5.c
-test_hmacsha1_SOURCES = test_hmacsha1.c
-test_hmacsha256_SOURCES = test_hmacsha256.c
-test_hmacmd5_SOURCES = test_hmacmd5.c
-
-test_cipher_SOURCES = test_cipher.c
-test_aes_SOURCES = test_aes.c
-test_twofish_SOURCES = test_twofish.c
-test_cast5_SOURCES = test_cast5.c
-test_des_SOURCES = test_des.c
-
-test_silcpkcs_SOURCES = test_silcpkcs.c
-test_dsa_SOURCES = test_dsa.c
-
 LIBS = $(SILC_COMMON_LIBS)
 LDADD = -L.. -L../.. -lsct
 

diff --git a/lib/silcmath/Makefile.ad b/lib/silcmath/Makefile.ad
index 76892d57afb460f7d56c9af97549f7af29bd72e5..3f589eb051883b4ae647421d44e5cabe49b756a5 100644 (file)
--- a/lib/silcmath/Makefile.ad
+++ b/lib/silcmath/Makefile.ad
@@ -17,6 +17,8 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
+SUBDIRS=tests
+
 noinst_LTLIBRARIES = libsilcmath.la
 
 if SILC_MP_SILCMATH

diff --git a/lib/silcpgp/Makefile.ad b/lib/silcpgp/Makefile.ad
index b8dd8601733f7bad9ef35d64fb675a42edd9248a..6e083376ccc8395aa9ccc5a1b0c425f13a4ac89b 100644 (file)
--- a/lib/silcpgp/Makefile.ad
+++ b/lib/silcpgp/Makefile.ad
@@ -17,17 +17,23 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
+SUBDIRS=tests
+
 noinst_LTLIBRARIES = libsilcpgp.la
 
 libsilcpgp_la_SOURCES =        \
        silcpgp.c               \
        silcpgp_pubkey.c        \
        silcpgp_seckey.c        \
-       silcpgp_pkcs.c
+       silcpgp_pkcs.c          \
+       silcpgp.h               \
+       silcpgp_pkcs.h          \
+       silcpgp_i.h
 
 include_HEADERS =              \
-       silcpgp.h
+       silcpgp.h               \
+       silcpgp_i.h
 
-EXTRA_DIST = *.h tests
+EXTRA_DIST = 
 
 include $(top_srcdir)/Makefile.defines.in

diff --git a/lib/silcpgp/tests/Makefile.am b/lib/silcpgp/tests/Makefile.am
index 375f1aa74156a5e9fd43081719e5ce26020b6b85..244021cce838e908863c55dae263dcd2157a83f7 100644 (file)
--- a/lib/silcpgp/tests/Makefile.am
+++ b/lib/silcpgp/tests/Makefile.am
@@ -17,9 +17,7 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
-bin_PROGRAMS =         test_silcpgp
-
-test_silcpgp_SOURCES = test_silcpgp.c
+check_PROGRAMS =       test_silcpgp
 
 LIBS = $(SILC_COMMON_LIBS)
 LDADD = -L.. -L../.. -lsct

diff --git a/lib/silcskr/Makefile.ad b/lib/silcskr/Makefile.ad
index 14b98c6d4d9ed41a763ca437ca09eacca5f6c9eb..125009f806b3ec0fed3bdc40366db736cac1f832 100644 (file)
--- a/lib/silcskr/Makefile.ad
+++ b/lib/silcskr/Makefile.ad
@@ -17,12 +17,14 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
+SUBDIRS=tests
+
 noinst_LTLIBRARIES = libsilcskr.la
 
-libsilcskr_la_SOURCES = silcskr.c
+libsilcskr_la_SOURCES = silcskr.c silcskr.h silcskr_i.h
 
 include_HEADERS = silcskr.h silcskr_i.h
 
-EXTRA_DIST = *.h $(SILC_EXTRA_DIST)
+EXTRA_DIST = 
 
 include $(top_srcdir)/Makefile.defines.in

diff --git a/lib/silcskr/silcskr_i.h b/lib/silcskr/silcskr_i.h
index f8e8e92aa2b4b5c4354f2ff4c1c2641c2e3eaf72..01afe80561a6126aab8944820e1052d47aadc363 100644 (file)
--- a/lib/silcskr/silcskr_i.h
+++ b/lib/silcskr/silcskr_i.h
@@ -43,6 +43,7 @@ struct SilcSKRFindStruct {
 };
 
 /* Backwards support */
+#define SilcSKRStatus SilcResult
 #define SILC_SKR_OK SILC_OK
 #define SILC_SKR_ERROR SILC_ERR
 #define SILC_SKR_ALREADY_EXIST SILC_ERR_ALREADY_EXISTS

diff --git a/lib/silcskr/tests/Makefile.am b/lib/silcskr/tests/Makefile.am
index 580daadf0033c4906d4568e2be85e437c0ede095..47473aa74ef5741ee0bf4c5cb9d112571e2e3a54 100644 (file)
--- a/lib/silcskr/tests/Makefile.am
+++ b/lib/silcskr/tests/Makefile.am
@@ -17,11 +17,9 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
-bin_PROGRAMS = test_silcskr
-
-test_silcskr_SOURCES = test_silcskr.c
+check_PROGRAMS = test_silcskr
 
 LIBS = $(SILC_COMMON_LIBS)
-LDADD = -L.. -L../.. -lsilc -lsilcskr
+LDADD = -L.. -L../.. -lsct
 
 include $(top_srcdir)/Makefile.defines.in

diff --git a/lib/silcssh/Makefile.ad b/lib/silcssh/Makefile.ad
index 6a45dabbc486c6e250099d69cfd093a61098f953..102f8c9cfe1cc5f9f30db5b15d2e299b3f921f94 100644 (file)
--- a/lib/silcssh/Makefile.ad
+++ b/lib/silcssh/Makefile.ad
@@ -17,12 +17,19 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
+SUBDIRS=tests
+
 noinst_LTLIBRARIES = libsilcssh.la
 
-libsilcssh_la_SOURCES = silcssh.c silcssh_pkcs.c
+libsilcssh_la_SOURCES =        \
+       silcssh.c               \
+       silcssh_pkcs.c          \
+       silcssh.h               \
+       silcssh_i.h             \
+       silcssh_pkcs.h
 
 include_HEADERS = silcssh.h silcssh_i.h
 
-EXTRA_DIST = *.h $(SILC_EXTRA_DIST)
+EXTRA_DIST =
 
 include $(top_srcdir)/Makefile.defines.in

diff --git a/lib/silcssh/tests/Makefile.am b/lib/silcssh/tests/Makefile.am
index 1aae529b6897c7f08781135d85a5b9ceef1ff64b..90d2dbbc84739c2f9a2b08665e6e1107c8d22f91 100644 (file)
--- a/lib/silcssh/tests/Makefile.am
+++ b/lib/silcssh/tests/Makefile.am
@@ -17,12 +17,10 @@
 
 AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
-bin_PROGRAMS = test_silcssh
-
-test_silcssh_SOURCES = test_silcssh.c
+check_PROGRAMS = test_silcssh
 
 LIBS = $(SILC_COMMON_LIBS)
-LDADD = -L.. -L../.. -lsilc -lsilcssh
+LDADD = -L.. -L../.. -lsct
 CFLAGS = -O0
 
 include $(top_srcdir)/Makefile.defines.in

diff --git a/scripts/release b/scripts/release
new file mode 100644 (file)
index 0000000..b5ab3fb
--- /dev/null
+++ b/scripts/release
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+last="$1"
+new="$2"
+git tag $new
+git log --no-merges $new ^$last > ChangeLog
+echo "" >> ChangeLog
+git diff --stat --summary -M $last $new >> ChangeLog