updates.

diff --git a/CHANGES b/CHANGES
index a8730a0dfe9914836b6ee322d950ceb87c99ff73..43d3dcbdff08841b5dd197f6b3a1e48bf99749c0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,21 @@
+Mon Jul 16 22:55:26 EEST 2001  Pekka Riikonen <priikone@silcnet.org>
+
+       * Fixed various compilation problems under WIN32.  Affected
+         files lib/silcutil/win32/silcwin32thread.c and
+         lib/silcutil/win32/silcwin32schedule.c.
+
+       * Removed all _internal.h #includes from public header
+         files.  Internal headers must never be included from
+         public headers.
+
+         Removed also the lib/silcske/payload_internal.h file.
+
+       * All include files that may be needed (public and some others
+         included by the public headers) by application developers are
+         now copied to the ./includes directory.  It does not copy any
+         internal headers.  Affected file Makefile.defines.pre and all
+         Makefile.am's under lib/ and subdirs.
+
 Thu Jul 12 17:49:31 EEST 2001  Pekka Riikonen <priikone@silcnet.org>
 
        * Do not change the ~/.silc directory's permissions automatically.

diff --git a/Makefile.defines.pre b/Makefile.defines.pre
index cee43cf8634ef882f8c3f8342cadd2a922157dc1..eb53e2d76f60fca4f5e4de7f5af8b37b6350cb6f 100644 (file)
--- a/Makefile.defines.pre
+++ b/Makefile.defines.pre
@@ -58,11 +58,8 @@ INCLUDES = $(ADD_INCLUDES) $(SILC_CFLAGS) \
        -I$(silc_top_srcdir)/lib/trq
 
 includes-install: Makefile
-       for i in $(include_HEADERS);                            \
-       do                                                      \
-          s=$(srcdir)/$$i;                                     \
-          d=$(silc_top_srcdir)/includes/$$i;                   \
-          ln $$s $$d 2>/dev/null || cp -fp $$s $$d;            \
+       for i in $(include_HEADERS); do s=$(srcdir)/$$i; d=$(silc_top_srcdir)/includes/$$i; \
+          ln $$s $$d 2>/dev/null || (rm -f $$d; cp -p $$s $$d;); \
        done;
 
 all-local: includes-install

diff --git a/includes/Makefile.am b/includes/Makefile.am
index 6702d837fdf668f93eb363d13e337e2ac27cfecc..12cc20fa627f929ffc6facf2507208894cf2f2b8 100644 (file)
--- a/includes/Makefile.am
+++ b/includes/Makefile.am
@@ -21,4 +21,12 @@ AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 all:
        -cd ..
 
-EXTRA_DIST = *.h
\ No newline at end of file
+include_HEADERS = \
+       bitmove.h \
+       clientlibincludes.h \
+       silcdefs.h \
+       silcincludes.h \
+       silcwin32.h \
+       version.h \
+       version_internal.h
+

diff --git a/lib/silcclient/Makefile.am b/lib/silcclient/Makefile.am
index b51424c6f8b45430d3ad14301cf9a6ffd33c8f83..43032ca38ebf3dd93443e18de2e264423877a318 100644 (file)
--- a/lib/silcclient/Makefile.am
+++ b/lib/silcclient/Makefile.am
@@ -31,6 +31,14 @@ libsilcclient_a_SOURCES = \
        idlist.c \
        protocol.c
 
+include_HEADERS=       \
+       client.h        \
+       command.h       \
+       command_reply.h \
+       idlist.h        \
+       protocol.h      \
+       silcapi.h
+
 EXTRA_DIST = *.h
 
-include $(top_srcdir)/Makefile.defines.in
\ No newline at end of file
+include $(top_srcdir)/Makefile.defines.in

diff --git a/lib/silccore/Makefile.am b/lib/silccore/Makefile.am
index 038ed448c393e0bfbbff4395f6b0394189e832c7..2933ba4ec7d9032f12893a55db443b74e4f524f1 100644 (file)
--- a/lib/silccore/Makefile.am
+++ b/lib/silccore/Makefile.am
@@ -32,6 +32,19 @@ libsilccore_a_SOURCES = \
        silcauth.c \
        silcprivate.c
 
+include_HEADERS =      \
+       silcauth.h      \
+       silcchannel.h   \
+       silccommand.h   \
+       silcidcache.h   \
+       silcid.h        \
+       silcmode.h      \
+       silcnotify.h    \
+       silcpacket.h    \
+       silcpayload.h   \
+       silcprivate.h   \
+       silcprotocol.h
+
 EXTRA_DIST = *.h
 
 include $(top_srcdir)/Makefile.defines.in

diff --git a/lib/silccrypt/Makefile.am b/lib/silccrypt/Makefile.am
index 3af1fac91ad6e3ea3c851c6d3e7a8ee6b5bd4fce..e55cb151c4197e0f1ec814bc0df0885058e9b4ca 100644 (file)
--- a/lib/silccrypt/Makefile.am
+++ b/lib/silccrypt/Makefile.am
@@ -39,6 +39,28 @@ libsilccrypt_a_SOURCES = \
        silcpkcs.c \
        pkcs1.c
 
+include_HEADERS =      \
+       aes.h           \
+       blowfish.h      \
+       cast.h          \
+       ciphers_def.h   \
+       ciphers.h       \
+       mars.h          \
+       md5.h           \
+       none.h          \
+       pkcs1.h         \
+       rc5.h           \
+       rc6.h           \
+       rsa.h           \
+       sha1.h          \
+       silccipher.h    \
+       silcdh.h        \
+       silchash.h      \
+       silchmac.h      \
+       silcpkcs.h      \
+       silcrng.h       \
+       twofish.h
+
 EXTRA_DIST = *.h
 
 include $(top_srcdir)/Makefile.defines.in

diff --git a/lib/silccrypt/aes.c b/lib/silccrypt/aes.c
index 568881d62026f85991cfa67c5d6bb2818884071f..840dfdde8f26986434b1b8ff637a81192f558d75 100644 (file)
--- a/lib/silccrypt/aes.c
+++ b/lib/silccrypt/aes.c
@@ -40,6 +40,7 @@ Mean:          500 cycles =    51.2 mbits/sec
 */
 
 #include "silcincludes.h"
+#include "rijndael_internal.h"
 #include "aes.h"
 
 /* 

diff --git a/lib/silccrypt/aes.h b/lib/silccrypt/aes.h
index d505f90ceb3e322d0b9aaed5457d8e7509f2459c..6efd6582de3b6b87a82f2254d809e45ac851bfde 100644 (file)
--- a/lib/silccrypt/aes.h
+++ b/lib/silccrypt/aes.h
@@ -21,8 +21,6 @@
 #ifndef RIJNDAEL_H
 #define RIJNDAEL_H
 
-#include "rijndael_internal.h"
-
 /* 
  * SILC Crypto API for Rijndael
  */

diff --git a/lib/silccrypt/blowfish.c b/lib/silccrypt/blowfish.c
index cf6fe609400dec5ca0973db6d342cb1188b62abe..1bea03106d4050ea5e5a119c3ee8f8a9c92d0bb2 100644 (file)
--- a/lib/silccrypt/blowfish.c
+++ b/lib/silccrypt/blowfish.c
@@ -34,6 +34,7 @@
  */
 
 #include "silcincludes.h"
+#include "blowfish_internal.h"
 #include "blowfish.h"
 
 /* 

diff --git a/lib/silccrypt/blowfish.h b/lib/silccrypt/blowfish.h
index 64634636cae80d9d2a33b55f6678eae5ca39650d..c0caeee7cd96f76657492f15a741fefbd71c5b1d 100644 (file)
--- a/lib/silccrypt/blowfish.h
+++ b/lib/silccrypt/blowfish.h
@@ -21,8 +21,6 @@
 #ifndef BLOWFISH_H
 #define BLOWFISH_H
 
-#include "blowfish_internal.h"
-
 /* 
  * SILC Crypto API for Blowfish
  */

diff --git a/lib/silccrypt/cast.c b/lib/silccrypt/cast.c
index a814ac021be7fd17d243c0669b75e7dfdb26e1c3..b3428cb2301e0fe5712227d42b2d11541dcfdd78 100644 (file)
--- a/lib/silccrypt/cast.c
+++ b/lib/silccrypt/cast.c
@@ -59,6 +59,7 @@ Mean:          674 cycles =    38.0 mbits/sec
 */
 
 #include "silcincludes.h"
+#include "cast_internal.h"
 #include "cast.h"
 
 #define io_swap

diff --git a/lib/silccrypt/cast.h b/lib/silccrypt/cast.h
index 9f36139520f642f096d3a92e63e86325a065cee8..fe7351906037a48b61e9c25390f09c1a9fcfdd66 100644 (file)
--- a/lib/silccrypt/cast.h
+++ b/lib/silccrypt/cast.h
@@ -21,8 +21,6 @@
 #ifndef CAST_H
 #define CAST_H
 
-#include "cast_internal.h"
-
 /* 
  * SILC Crypto API for Cast-256
  */

diff --git a/lib/silccrypt/mars.c b/lib/silccrypt/mars.c
index 454b402ae19881d8171448c3372fc0bd8e9ac6fd..73af702f194e3fd070e111a5640d49fe8f7d749d 100644 (file)
--- a/lib/silccrypt/mars.c
+++ b/lib/silccrypt/mars.c
@@ -39,6 +39,7 @@ Mean:          373 cycles =    68.7 mbits/sec
 */
 
 #include "silcincludes.h"
+#include "mars_internal.h"
 #include "mars.h"
 
 /* 

diff --git a/lib/silccrypt/mars.h b/lib/silccrypt/mars.h
index 33dd82649eddd072f7364385f064cafebebdb4ef..23a47b698493bd5dc450b407e7edbefa454dfaf1 100644 (file)
--- a/lib/silccrypt/mars.h
+++ b/lib/silccrypt/mars.h
@@ -17,20 +17,10 @@
   GNU General Public License for more details.
 
 */
-/*
- * $Id$
- * $Log$
- * Revision 1.1  2000/06/27 11:36:54  priikone
- * Initial revision
- *
- *
- */
 
 #ifndef MARS_H
 #define MARS_H
 
-#include "mars_internal.h"
-
 /* 
  * SILC Crypto API for MARS 
  */

diff --git a/lib/silccrypt/md5.c b/lib/silccrypt/md5.c
index 5a198c740057a57f3f83d724756456032722da3b..63514cd10f3c9684640d30e826aa1d47bd245d70 100644 (file)
--- a/lib/silccrypt/md5.c
+++ b/lib/silccrypt/md5.c
@@ -19,6 +19,7 @@
  */
 
 #include "silcincludes.h"
+#include "md5_internal.h"
 #include "md5.h"
 
 /* 

diff --git a/lib/silccrypt/md5.h b/lib/silccrypt/md5.h
index c80f4a326f619180179e40a25de24ae006c624b9..8b10d7ea4f5ff1801c3cd22de01f3c0fd34125f6 100644 (file)
--- a/lib/silccrypt/md5.h
+++ b/lib/silccrypt/md5.h
@@ -17,20 +17,10 @@
   GNU General Public License for more details.
 
 */
-/*
- * $Id$
- * $Log$
- * Revision 1.1  2000/06/27 11:36:55  priikone
- * Initial revision
- *
- *
- */
 
 #ifndef MD5_H
 #define MD5_H
 
-#include "md5_internal.h"
-
 /* 
  * SILC Hash API for MD5
  */

diff --git a/lib/silccrypt/pkcs1.c b/lib/silccrypt/pkcs1.c
index 47950d3b24557e0c89c93b7469b452b721614f1c..3b99b69b77408fb609854a6f4d0954e477dd276f 100644 (file)
--- a/lib/silccrypt/pkcs1.c
+++ b/lib/silccrypt/pkcs1.c
@@ -77,6 +77,7 @@
  */
 
 #include "silcincludes.h"
+#include "rsa_internal.h"
 #include "rsa.h"
 
 #define RSA_BLOCK_MIN_PAD_LEN          8

diff --git a/lib/silccrypt/rc5.c b/lib/silccrypt/rc5.c
index 1a886bee738c1b14c4ab14eac7d7c1146662dd76..34afc43fac0064b0dd8448ab8050330378f4939e 100644 (file)
--- a/lib/silccrypt/rc5.c
+++ b/lib/silccrypt/rc5.c
@@ -39,6 +39,7 @@
  */
 
 #include "silcincludes.h"
+#include "rc5_internal.h"
 #include "rc5.h"
 
 /* 

diff --git a/lib/silccrypt/rc5.h b/lib/silccrypt/rc5.h
index b8f024166f43faf8b5ddb37ac48145b5e6be3692..8909ebc04e5f622cc58809ef51eb04a855a5210e 100644 (file)
--- a/lib/silccrypt/rc5.h
+++ b/lib/silccrypt/rc5.h
@@ -21,8 +21,6 @@
 #ifndef RC5_H
 #define RC5_H
 
-#include "rc5_internal.h"
-
 /* 
  * SILC Crypto API for RC5
  */

diff --git a/lib/silccrypt/rc6.c b/lib/silccrypt/rc6.c
index 68dcb3c02a3d1ca9c3c0456325a42d7bd172e45c..7939b2888e5af1ce0cb975a24843c451b936a348 100644 (file)
--- a/lib/silccrypt/rc6.c
+++ b/lib/silccrypt/rc6.c
@@ -37,6 +37,7 @@ Mean:          249 cycles =   103.0 mbits/sec
 */
 
 #include "silcincludes.h"
+#include "rc6_internal.h"
 #include "rc6.h"
 
 /* 

diff --git a/lib/silccrypt/rc6.h b/lib/silccrypt/rc6.h
index ee85979539606b7fd135d6778a282d901d7ad159..c1d2ec0cd662d0a6f69353b7559a6b0c24ee3d18 100644 (file)
--- a/lib/silccrypt/rc6.h
+++ b/lib/silccrypt/rc6.h
@@ -17,20 +17,10 @@
   GNU General Public License for more details.
 
 */
-/*
- * $Id$
- * $Log$
- * Revision 1.1  2000/06/27 11:36:54  priikone
- * Initial revision
- *
- *
- */
 
 #ifndef RC6_H
 #define RC6_H
 
-#include "rc6_internal.h"
-
 /* 
  * SILC Crypto API for RC6
  */

diff --git a/lib/silccrypt/rsa.c b/lib/silccrypt/rsa.c
index 7694e324e54d2911051949bcde752d93f701c359..79d88cd2d7b0fd2227e0fa7711da9ea1244a4496 100644 (file)
--- a/lib/silccrypt/rsa.c
+++ b/lib/silccrypt/rsa.c
@@ -64,6 +64,7 @@
 */
 
 #include "silcincludes.h"
+#include "rsa_internal.h"
 #include "rsa.h"
 
 /*

diff --git a/lib/silccrypt/rsa.h b/lib/silccrypt/rsa.h
index 0c1ab1bacc3a7dc2966c0663e3d2ede3a2cad318..5f8262fa80f85c7194c6c8bec9b2c1b3c9e060b9 100644 (file)
--- a/lib/silccrypt/rsa.h
+++ b/lib/silccrypt/rsa.h
@@ -21,8 +21,6 @@
 #ifndef RSA_H
 #define RSA_H
 
-#include "rsa_internal.h"
-
 /*
  * SILC PKCS API for RSA
  */

diff --git a/lib/silccrypt/sha1.c b/lib/silccrypt/sha1.c
index ef51330d3dea7088ed1d0a2267cd7ca49699976a..e06c5b1b95bbfad09444345abe8669586dca0f62 100644 (file)
--- a/lib/silccrypt/sha1.c
+++ b/lib/silccrypt/sha1.c
@@ -5,6 +5,7 @@ By Steve Reid <steve@edmweb.com>
 */
 
 #include "silcincludes.h"
+#include "sha1_internal.h"
 #include "sha1.h"
 
 /* 

diff --git a/lib/silccrypt/sha1.h b/lib/silccrypt/sha1.h
index 6ac0d5b50933709e6098cdd6e36c45989c6aac49..ac52d6242b86f753c4c751233a8e62e8d4fcbc18 100644 (file)
--- a/lib/silccrypt/sha1.h
+++ b/lib/silccrypt/sha1.h
@@ -17,20 +17,10 @@
   GNU General Public License for more details.
 
 */
-/*
- * $Id$
- * $Log$
- * Revision 1.1  2000/06/27 11:36:55  priikone
- * Initial revision
- *
- *
- */
 
 #ifndef SHA1_H
 #define SHA1_H
 
-#include "sha1_internal.h"
-
 /* 
  * SILC Hash API for SHA1
  */

diff --git a/lib/silccrypt/twofish.c b/lib/silccrypt/twofish.c
index b9036b4ef7e742baad81a0b9c2d17ffa6bc61bc8..c4cf7c8629d42b6c879f0cbb7e6bed29a095e163 100644 (file)
--- a/lib/silccrypt/twofish.c
+++ b/lib/silccrypt/twofish.c
@@ -40,6 +40,7 @@ Mean:          378 cycles =    67.8 mbits/sec
 */
 
 #include "silcincludes.h"
+#include "twofish_internal.h"
 #include "twofish.h"
 
 /* 

diff --git a/lib/silccrypt/twofish.h b/lib/silccrypt/twofish.h
index 565bb8e31eb94acc04193b99c9e3e67e431ce9a5..6b96b302b388f7863702ce5bac14e29e72401521 100644 (file)
--- a/lib/silccrypt/twofish.h
+++ b/lib/silccrypt/twofish.h
@@ -17,20 +17,10 @@
   GNU General Public License for more details.
 
 */
-/*
- * $Id$
- * $Log$
- * Revision 1.1  2000/06/27 11:36:55  priikone
- * Initial revision
- *
- *
- */
 
 #ifndef TWOFISH_H
 #define TWOFISH_H
 
-#include "twofish_internal.h"
-
 /* 
  * SILC Crypto API for Twofish
  */

diff --git a/lib/silcmath/Makefile.am b/lib/silcmath/Makefile.am
index e362edcb8924eef9943afd51501edd8878916642..d4f5b7e206dc17a6125f6bf0288464726eb95ba6 100644 (file)
--- a/lib/silcmath/Makefile.am
+++ b/lib/silcmath/Makefile.am
@@ -38,6 +38,12 @@ libsilcmath_a_SOURCES = \
        mpbin.c \
        $(MP_SOURCE)
 
+include_HEADERS =      \
+       mp_gmp.h        \
+       mp_mpi.h        \
+       silcmath.h      \
+       silcmp.h
+
 EXTRA_DIST = *.h
 
 include $(top_srcdir)/Makefile.defines.in

diff --git a/lib/silcsim/Makefile.am b/lib/silcsim/Makefile.am
index 2a89eeefb6ca590a1aa99421425ac8e355d8491c..ad45d5be586e64f9c65301fb661fbf8f130fd866 100644 (file)
--- a/lib/silcsim/Makefile.am
+++ b/lib/silcsim/Makefile.am
@@ -75,6 +75,8 @@ $(SIM_HASH_OBJS): ../silccrypt/libsilccrypt.a
 
 CLEANFILES = $(SIM_MODULES_DIR)/*.sim.so
 
+include_HEADERS = silcsim.h silcsimutil.h
+
 EXTRA_DIST = *.h
 
 include $(top_srcdir)/Makefile.defines.in

diff --git a/lib/silcske/Makefile.am b/lib/silcske/Makefile.am
index 620f38dc892d848f67bb2b36152ed153a5ae426c..94dffa260e4159824c311fe7fcfcab36ac0f284e 100644 (file)
--- a/lib/silcske/Makefile.am
+++ b/lib/silcske/Makefile.am
@@ -25,6 +25,12 @@ libsilcske_a_SOURCES = \
        payload.c \
         groups.c
 
+include_HEADERS =      \
+       groups.h        \
+       payload.h       \
+       silcske.h       \
+       silcske_status.h
+
 EXTRA_DIST = *.h
 
 include $(top_srcdir)/Makefile.defines.in

diff --git a/lib/silcske/groups.h b/lib/silcske/groups.h
index eacd3f257955c04054283d6f6cfbe18619dca2d2..29941dbfe10bc2c84d453c0bb464f74299cfb1ca 100644 (file)
--- a/lib/silcske/groups.h
+++ b/lib/silcske/groups.h
@@ -22,7 +22,6 @@
 #define GROUPS_H
 
 #include "silcske_status.h"
-#include "groups_internal.h"
 
 /* Forward declaration */
 typedef struct SilcSKEDiffieHellmanGroupStruct *SilcSKEDiffieHellmanGroup;

diff --git a/lib/silcske/payload.c b/lib/silcske/payload.c
index 0a987e8eedd443e1102e263bb440e16881db7bd6..ef420bdec71cb8fe34c7cd997252628e3c748377 100644 (file)
--- a/lib/silcske/payload.c
+++ b/lib/silcske/payload.c
@@ -20,7 +20,6 @@
 /* $Id$ */
 
 #include "silcincludes.h"
-#include "payload_internal.h"
 
 /* Encodes Key Exchange Start Payload into a SILC Buffer to be sent
    to the other end. */

diff --git a/lib/silcske/payload.h b/lib/silcske/payload.h
index df982a7bca3d416b9a889f079a59620ec11597c8..dd31fc105f8024912f92a231fbc2afb58776bf66 100644 (file)
--- a/lib/silcske/payload.h
+++ b/lib/silcske/payload.h
@@ -22,7 +22,52 @@
 #define PAYLOAD_H
 
 #include "silcske_status.h"
-#include "payload_internal.h"
+
+/* Forward declarations */
+typedef struct SilcSKEStartPayloadStruct SilcSKEStartPayload;
+typedef struct SilcSKEKEPayloadStruct SilcSKEKEPayload;
+
+/* SILC Key Exchange Start Payload */
+struct SilcSKEStartPayloadStruct {
+  unsigned char flags;
+  uint16 len;
+
+  unsigned char *cookie;
+  uint16 cookie_len;
+
+  unsigned char *version;
+  uint16 version_len;
+
+  uint16 ke_grp_len;
+  unsigned char *ke_grp_list;
+
+  uint16 pkcs_alg_len;
+  unsigned char *pkcs_alg_list;
+
+  uint16 enc_alg_len;
+  unsigned char *enc_alg_list;
+  
+  uint16 hash_alg_len;
+  unsigned char *hash_alg_list;
+
+  uint16 hmac_alg_len;
+  unsigned char *hmac_alg_list;
+
+  uint16 comp_alg_len;
+  unsigned char *comp_alg_list;
+};
+
+/* SILC Key Exchange Payload */
+struct SilcSKEKEPayloadStruct {
+  uint16 pk_len;
+  unsigned char *pk_data;
+  uint16 pk_type;
+
+  SilcMPInt x;
+
+  uint16 sign_len;
+  unsigned char *sign_data;
+};
 
 /* Prototypes */
 SilcSKEStatus silc_ske_payload_start_encode(SilcSKE ske,

diff --git a/lib/silcske/payload_internal.h b/lib/silcske/payload_internal.h
deleted file mode 100644 (file)
index 3312d1e..0000000
--- a/lib/silcske/payload_internal.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-
-  payload_internal.h
-
-  Author: Pekka Riikonen <priikone@poseidon.pspt.fi>
-
-  Copyright (C) 2000 - 2001 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
-  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.
-
-*/
-
-#ifndef PAYLOAD_INTERNAL_H
-#define PAYLOAD_INTERNAL_H
-
-/* SILC Key Exchange Start Payload */
-typedef struct {
-  unsigned char flags;
-  uint16 len;
-
-  unsigned char *cookie;
-  uint16 cookie_len;
-
-  unsigned char *version;
-  uint16 version_len;
-
-  uint16 ke_grp_len;
-  unsigned char *ke_grp_list;
-
-  uint16 pkcs_alg_len;
-  unsigned char *pkcs_alg_list;
-
-  uint16 enc_alg_len;
-  unsigned char *enc_alg_list;
-  
-  uint16 hash_alg_len;
-  unsigned char *hash_alg_list;
-
-  uint16 hmac_alg_len;
-  unsigned char *hmac_alg_list;
-
-  uint16 comp_alg_len;
-  unsigned char *comp_alg_list;
-} SilcSKEStartPayload;
-
-/* SILC Key Exchange Payload */
-typedef struct {
-  uint16 pk_len;
-  unsigned char *pk_data;
-  uint16 pk_type;
-
-  SilcMPInt x;
-
-  uint16 sign_len;
-  unsigned char *sign_data;
-} SilcSKEKEPayload;
-
-#endif

diff --git a/lib/silcske/silcske.c b/lib/silcske/silcske.c
index 0d0e4ff314709ee0980b53e6c7b908be5b36b08f..b9d45b4b4919d2d6a55e97b0c092fe189fa85a60 100644 (file)
--- a/lib/silcske/silcske.c
+++ b/lib/silcske/silcske.c
@@ -20,7 +20,7 @@
 /* $Id$ */
 
 #include "silcincludes.h"
-#include "payload_internal.h"
+#include "silcske.h"
 #include "groups_internal.h"
 
 /* Structure to hold all SKE callbacks-> */

diff --git a/lib/silcutil/Makefile.am b/lib/silcutil/Makefile.am
index fbf6b12db071d5662ef03c887a7512535756f4c5..161f04712922c77a157843affe375efab809d323 100644 (file)
--- a/lib/silcutil/Makefile.am
+++ b/lib/silcutil/Makefile.am
@@ -38,6 +38,22 @@ libsilcutil_a_SOURCES = \
        silchashtable.c \
        silcsockconn.c
 
+include_HEADERS =      \
+       silcbuffer.h    \
+       silcbuffmt.h    \
+       silcbufutil.h   \
+       silcconfig.h    \
+       silchashtable.h \
+       silclog.h       \
+       silcmemory.h    \
+       silcmutex.h     \
+       silcnet.h       \
+       silcschedule.h  \
+       silcsockconn.h  \
+       silctask.h      \
+       silcthread.h    \
+       silcutil.h
+
 EXTRA_DIST = *.h
 
 include $(top_srcdir)/Makefile.defines.in