Re-arrangement of source tree.

git-svn-id: file:///home/mbr/svn/fwknop/trunk@14 510a4753-2344-4c79-9c09-4d669213fbeb

Makefile.am

@@ -1 +1 @@
-SUBDIRS = lib src
+SUBDIRS = fko src

autogen.sh

@@ -4,10 +4,10 @@
 #
 # Run this script to generate all the initial makefiles, etc.
 #
-aclocal
+aclocal -I config
 libtoolize --automake
 autoheader
-automake -a
+automake --add-missing --copy --foreign
 autoconf
 
 ###EOF###

config/config.guess

@@ -0,0 +1 @@
+/usr/share/libtool/config.guess

config/config.sub

@@ -0,0 +1 @@
+/usr/share/libtool/config.sub

config/ltmain.sh

@@ -0,0 +1 @@
+/usr/share/libtool/ltmain.sh

configure.ac

@@ -7,6 +7,7 @@ m4_define(my_version, [2.0.0-alpha])
 m4_define(my_bug_email, [dstuart@dstuart.org])
 
 AC_INIT(my_package, my_version, my_bug_email)
+AC_CONFIG_AUX_DIR(config)
 AM_INIT_AUTOMAKE(my_package, my_version)
 
 dnl AM_MAINTAINER_MODE
@@ -47,9 +48,11 @@ AC_C_CONST
 
 # Checks for library functions.
 #
-AC_CHECK_FUNCS([gettimeofday memmove memset setlocale strchr])
+AC_FUNC_MALLOC
+AC_CHECK_FUNCS([bzero gettimeofday memmove memset setlocale strchr strdup])
 
+AC_CONFIG_FILES([Makefile
+                 fko/Makefile
+                 src/Makefile])
 
-# Generate the Makefiles
-#
-AC_OUTPUT(lib/Makefile src/Makefile Makefile)
+AC_OUTPUT

fko/fko_common.h

@@ -26,9 +26,9 @@
 #ifndef FKO_COMMON_H
 #define FKO_COMMON_H 1
 
-//#if HAVE_CONFIG_H
+#if HAVE_CONFIG_H
   #include "config.h"
-//#endif
+#endif
 
 #include <stdio.h>
 #include <sys/types.h>
@@ -44,6 +44,8 @@
   #include <unistd.h>
 #endif
 
+/* Convenient macros for wrapping sections in 'extern "C" {' constructs.
+*/
 #ifdef __cplusplus
   #define BEGIN_C_DECLS extern "C" {
   #define END_C_DECLS   }
@@ -53,9 +55,14 @@
 #endif /* __cplusplus */
 
 #include "fko_types.h"
-//#include "fko.h"
 #include "fko_util.h"
 
+/* Try to cover for those that do not have bzero.
+*/
+#if !HAVE_BZERO && HAVE_MEMSET
+# define bzero(buf, bytes)      ((void) memset (buf, 0, bytes))
+#endif
+
 #endif /* FKO_COMMON_H */
 
 /***EOF***/

src/Makefile.am

@@ -2,5 +2,5 @@ bin_PROGRAMS = fwknop
 
 fwknop_SOURCES = fwknop.c
 
-fwknop_LDADD = $(top_builddir)/lib/libfko.a
-fwknop_CPPFLAGS = -I $(top_srcdir)/lib
+fwknop_LDADD = $(top_builddir)/fko/libfko.a
+fwknop_CPPFLAGS = -I $(top_srcdir)/fko

src/fwknop.c

@@ -106,9 +106,9 @@ void display_ctx(fko_ctx_t *ctx)
         "    Server Auth: %s\n"
         " Client Timeout: %u\n"
         "    Digest Type: %u\n"
-        "SPA Data Digest: %s\n"
-        "\n   Encoded Data:\n%s\n"
-        "\n Encrypted Data:\n%s\n"
+        "\n   Encoded Data: %s\n"
+        "\nSPA Data Digest: %s\n"
+        "\nFinal Packed/Encrypted/Encoded Data:\n\n%s\n\n"
         ,
         fko_get_rand_value(ctx),
         (fko_get_username(ctx) == NULL) ? "<NULL>" : fko_get_username(ctx),
@@ -120,9 +120,9 @@ void display_ctx(fko_ctx_t *ctx)
         (fko_get_spa_server_auth(ctx) == NULL) ? "<NULL>" : fko_get_spa_server_auth(ctx),
         fko_get_spa_client_timeout(ctx),
         fko_get_spa_digest_type(ctx),
+        (ctx->encoded_msg == NULL) ? "<NULL>" : ctx->encoded_msg,
         (fko_get_spa_digest(ctx) == NULL) ? "<NULL>" : fko_get_spa_digest(ctx),
 
-        (ctx->encoded_msg == NULL) ? "<NULL>" : ctx->encoded_msg,
         (ctx->encrypted_msg == NULL) ? "<NULL>" : ctx->encrypted_msg
     );