 @@ -1,18 +1,18 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.63 for netpgp 20090423.
+#
-# Report bugs to <"Alistair Crooks agc@netbsd.org c0596823">.
+# Report bugs to <Alistair Crooks <agc@netbsd.org> c0596823>.
+#
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
 @@ -588,27 +588,27 @@ ac_clean_files=
 ac_config_libobj_dir=.
 LIBOBJS=
 cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
 SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='netpgp'
 PACKAGE_TARNAME='netpgp'
 PACKAGE_VERSION='20090423'
 PACKAGE_STRING='netpgp 20090423'
-PACKAGE_BUGREPORT='"Alistair Crooks agc@netbsd.org c0596823"'
+PACKAGE_BUGREPORT='Alistair Crooks <agc@netbsd.org> c0596823'
 ac_unique_file="src/bin/netpgp.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
 #ifdef STDC_HEADERS
 # include <stdlib.h>
 @@ -1345,27 +1345,27 @@ if test -n "$ac_init_help"; then
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
-Report bugs to <"Alistair Crooks agc@netbsd.org c0596823">.
+Report bugs to <Alistair Crooks <agc@netbsd.org> c0596823>.
 _ACEOF
 ac_status=$?
 fi
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
     test -d "$ac_dir" ||
       { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
       continue
     ac_builddir=.
 case "$ac_dir" in
 @@ -3782,27 +3782,27 @@ $as_echo "$as_me: WARNING: $ac_header: p
 $as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 $as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 $as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 $as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## -------------------------------------------------------- ##
-## Report this to "Alistair Crooks agc@netbsd.org c0596823" ##
+## Report this to Alistair Crooks <agc@netbsd.org> c0596823 ##
 ## -------------------------------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 $as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}
 @@ -3817,28 +3817,27 @@ as_val=`eval 'as_val=${'$as_ac_Header'}
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 fi
 done
 for ac_header in bzlib.h dmalloc.h direct.h errno.h fcntl.h
 for ac_header in assert.h bzlib.h dmalloc.h direct.h errno.h fcntl.h
 do
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 $as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}
 		 $as_echo "$as_val"'`
 	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 else
 @@ -3938,27 +3937,27 @@ $as_echo "$as_me: WARNING: $ac_header: p
 $as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 $as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 $as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 $as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## -------------------------------------------------------- ##
-## Report this to "Alistair Crooks agc@netbsd.org c0596823" ##
+## Report this to Alistair Crooks <agc@netbsd.org> c0596823 ##
 ## -------------------------------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 $as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}
 @@ -4092,27 +4091,27 @@ $as_echo "$as_me: WARNING: $ac_header: p
 $as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 $as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 $as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 $as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## -------------------------------------------------------- ##
-## Report this to "Alistair Crooks agc@netbsd.org c0596823" ##
+## Report this to Alistair Crooks <agc@netbsd.org> c0596823 ##
 ## -------------------------------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 $as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}
 @@ -4244,27 +4243,27 @@ $as_echo "$as_me: WARNING: $ac_header: p
 $as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 $as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 $as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 $as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## -------------------------------------------------------- ##
-## Report this to "Alistair Crooks agc@netbsd.org c0596823" ##
+## Report this to Alistair Crooks <agc@netbsd.org> c0596823 ##
 ## -------------------------------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 $as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}
 @@ -4399,27 +4398,27 @@ $as_echo "$as_me: WARNING: $ac_header: p
 $as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 $as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 $as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 $as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## -------------------------------------------------------- ##
-## Report this to "Alistair Crooks agc@netbsd.org c0596823" ##
+## Report this to Alistair Crooks <agc@netbsd.org> c0596823 ##
 ## -------------------------------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 $as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}
 @@ -4555,27 +4554,27 @@ $as_echo "$as_me: WARNING: $ac_header: p
 $as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 $as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 $as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 $as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## -------------------------------------------------------- ##
-## Report this to "Alistair Crooks agc@netbsd.org c0596823" ##
+## Report this to Alistair Crooks <agc@netbsd.org> c0596823 ##
 ## -------------------------------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 $as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}
 @@ -4710,27 +4709,27 @@ $as_echo "$as_me: WARNING: $ac_header: p
 $as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
 $as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
 $as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
 $as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
 $as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
     { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
 $as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
     ( cat <<\_ASBOX
 ## -------------------------------------------------------- ##
-## Report this to "Alistair Crooks agc@netbsd.org c0596823" ##
+## Report this to Alistair Crooks <agc@netbsd.org> c0596823 ##
 ## -------------------------------------------------------- ##
 _ASBOX
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 $as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
   $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=\$ac_header_preproc"
 fi
 ac_res=`eval 'as_val=${'$as_ac_Header'}

 @@ -1,41 +1,41 @@
-dnl $Id: configure.ac,v 1.2 2009/04/25 01:29:14 agc Exp $
+dnl $Id: configure.ac,v 1.3 2009/05/05 15:29:46 agc Exp $
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.57)
 AC_INIT([netpgp],[20090423],[Alistair Crooks <agc@netbsd.org> c0596823])
 AC_CONFIG_SRCDIR([src/bin/netpgp.c])
 AC_CONFIG_HEADER(src/lib/config.h)
 AC_ARG_PROGRAM
 AC_CANONICAL_HOST
 CANONICAL_HOST=$host
 AC_SUBST(CANONICAL_HOST)
 # Checks for programs.
 AC_PROG_MAKE_SET
 AC_PROG_AWK
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AUTOCONF=${AUTOCONF-"$srcdir/missing --run autoconf"}
 AC_SUBST(AUTOCONF)
 AUTOHEADER=${AUTOHEADER-"$srcdir/missing --run autoheader"}
 AC_SUBST(AUTOHEADER)
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([CommonCrypto/CommonDigest.h])
-AC_CHECK_HEADERS([assert.h bzlib.h dmalloc.h direct.h errno.h fcntl.h])
+AC_CHECK_HEADERS([bzlib.h dmalloc.h direct.h errno.h fcntl.h])
 AC_CHECK_HEADERS([inttypes.h libgen.h limits.h malloc.h])
 AC_CHECK_HEADERS([stdbool.h zlib.h])
 AC_CHECK_HEADERS([openssl/aes.h openssl/bn.h openssl/cast.h openssl/des.h openssl/dsa.h])
 AC_CHECK_HEADERS([openssl/err.h openssl/idea.h openssl/md5.h openssl/rand.h openssl/rsa.h openssl/sha.h])
 AC_CHECK_HEADERS([sys/cdefs.h sys/file.h sys/mman.h sys/param.h sys/uio.h])
 AC_TYPE_UINT8_T
 AC_TYPE_UINT16_T
 AC_TYPE_UINT32_T
 AC_TYPE_UINT64_T
 # check for libraries
 AC_CHECK_LIB(z, gzopen)

 @@ -1,19 +1,16 @@
 /* src/lib/config.h.  Generated from config.h.in by configure.  */
 /* src/lib/config.h.in.  Generated from configure.ac by autoheader.  */
 /* Define to 1 if you have the <assert.h> header file. */
 #define HAVE_ASSERT_H 1
 /* Define to 1 if you have the <bzlib.h> header file. */
 #define HAVE_BZLIB_H 1
 /* Define to 1 if you have the <CommonCrypto/CommonDigest.h> header file. */
 /* #undef HAVE_COMMONCRYPTO_COMMONDIGEST_H */
 /* Define to 1 if you have the <direct.h> header file. */
 /* #undef HAVE_DIRECT_H */
 /* Define to 1 if you have the <dmalloc.h> header file. */
 /* #undef HAVE_DMALLOC_H */
 /* Define to 1 if you have the <errno.h> header file. */
 @@ -112,27 +109,27 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
 /* Define to 1 if you have the <sys/uio.h> header file. */
 #define HAVE_SYS_UIO_H 1
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1
 /* Define to 1 if you have the <zlib.h> header file. */
 #define HAVE_ZLIB_H 1
 /* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "Alistair Crooks agc@netbsd.org c0596823"
+#define PACKAGE_BUGREPORT "Alistair Crooks <agc@netbsd.org> c0596823"
 /* Define to the full name of this package. */
 #define PACKAGE_NAME "netpgp"
 /* Define to the full name and version of this package. */
 #define PACKAGE_STRING "netpgp 20090423"
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "netpgp"
 /* Define to the version of this package. */
 #define PACKAGE_VERSION "20090423"

 @@ -1,18 +1,15 @@
 /* src/lib/config.h.in.  Generated from configure.ac by autoheader.  */
 /* Define to 1 if you have the <assert.h> header file. */
 #undef HAVE_ASSERT_H
 /* Define to 1 if you have the <bzlib.h> header file. */
 #undef HAVE_BZLIB_H
 /* Define to 1 if you have the <CommonCrypto/CommonDigest.h> header file. */
 #undef HAVE_COMMONCRYPTO_COMMONDIGEST_H
 /* Define to 1 if you have the <direct.h> header file. */
 #undef HAVE_DIRECT_H
 /* Define to 1 if you have the <dmalloc.h> header file. */
 #undef HAVE_DMALLOC_H
 /* Define to 1 if you have the <errno.h> header file. */

 @@ -42,30 +42,26 @@
 #include "packet.h"
 #include "packet-parse.h"
 #include "keyring.h"
 #include "errors.h"
 #include "packet-show.h"
 #include "create.h"
 #include "netpgpsdk.h"
 #include "memory.h"
 #include "validate.h"
 #include "readerwriter.h"
 #include "netpgpdefs.h"
 #include "parse_local.h"
 #ifdef HAVE_ASSERT_H
 #include <assert.h>
 #endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
 #include <regex.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif

 @@ -29,30 +29,26 @@
 #endif
 #include "packet.h"
 #include "packet-parse.h"
 #include "keyring.h"
 #include "errors.h"
 #include "packet-show.h"
 #include "create.h"
 #include "readerwriter.h"
 #include "netpgpdefs.h"
 #include "parse_local.h"
 #ifdef HAVE_ASSERT_H
 #include <assert.h>
 #endif
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 #include <errno.h>
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif

 @@ -27,30 +27,26 @@
 #include "netpgpsdk.h"
 #include "readerwriter.h"
 #include "netpgpdefs.h"
 #include "memory.h"
 #include "keyring_local.h"
 #include "parse_local.h"
 #include "validate.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #ifdef HAVE_ASSERT_H
 #include <assert.h>
 #endif
 #include <string.h>
 #include <stdio.h>
 /* Does the signed hash match the given hash? */
 static          bool
 check_binary_signature(const unsigned len,
 		       const unsigned char *data,
 		       const __ops_signature_t * sig,
 		    const __ops_public_key_t * signer __attribute__((unused)))
+{
 	unsigned char   hashout[OPS_MAX_HASH_SIZE];
 	unsigned char   trailer[6];