diff --git a/INSTALL b/INSTALL index 2099840..6e90e07 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, @@ -12,8 +12,8 @@ without warranty of any kind. Basic Installation ================== - Briefly, the shell command `./configure && make && make install' -should configure, build, and install this package. The following + Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. Some packages provide this `INSTALL' file but do not implement all of the features documented diff --git a/include/pcp/config.h.in b/include/pcp/config.h.in deleted file mode 100644 index b53de92..0000000 --- a/include/pcp/config.h.in +++ /dev/null @@ -1,191 +0,0 @@ -/* include/pcp/config.h.in. Generated from configure.ac by autoheader. */ - -/* Define to 1 if you have the `arc4random' function. */ -#undef HAVE_ARC4RANDOM - -/* Define to 1 if you have the `arc4random_buf' function. */ -#undef HAVE_ARC4RANDOM_BUF - -/* Define to 1 if you have the header file. */ -#undef HAVE_ARPA_INET_H - -/* Define if be32toh() is available */ -#undef HAVE_BE32TOH - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_ENDIAN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_ERRNO_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_ERR_H - -/* Define to 1 if you have the `fopen' function. */ -#undef HAVE_FOPEN - -/* Define to 1 if you have the `fprintf' function. */ -#undef HAVE_FPRINTF - -/* Define to 1 if you have the `fread' function. */ -#undef HAVE_FREAD - -/* Define to 1 if you have the `free' function. */ -#undef HAVE_FREE - -/* Define to 1 if you have the `fseek' function. */ -#undef HAVE_FSEEK - -/* Define to 1 if you have the `ftruncate' function. */ -#undef HAVE_FTRUNCATE - -/* Define to 1 if you have the `fwrite' function. */ -#undef HAVE_FWRITE - -/* Define to 1 if you have the header file. */ -#undef HAVE_GETOPT_H - -/* Define to 1 if you have the `getopt_long' function. */ -#undef HAVE_GETOPT_LONG - -/* Define if htobe32() is available */ -#undef HAVE_HTOBE32 - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the `isatty' function. */ -#undef HAVE_ISATTY - -/* Define to 1 if you have the `sodium' library (-lsodium). */ -#undef HAVE_LIBSODIUM - -/* Define to 1 if you have the header file. */ -#undef HAVE_LIMITS_H - -/* Define to 1 if you have the `malloc' function. */ -#undef HAVE_MALLOC - -/* Define to 1 if you have the `memcpy' function. */ -#undef HAVE_MEMCPY - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the `memset' function. */ -#undef HAVE_MEMSET - -/* Define to 1 if you have the `mmap' function. */ -#undef HAVE_MMAP - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETINET_IN_H - -/* Define to 1 if you have the `perror' function. */ -#undef HAVE_PERROR - -/* Define to 1 if you have the `posix_memalign' function. */ -#undef HAVE_POSIX_MEMALIGN - -/* Define to 1 if you have the `setrlimit' function. */ -#undef HAVE_SETRLIMIT - -/* Define to 1 if you have the `sizeof' function. */ -#undef HAVE_SIZEOF - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDDEF_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDIO_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the `strlen' function. */ -#undef HAVE_STRLEN - -/* Define to 1 if you have the `strnlen' function. */ -#undef HAVE_STRNLEN - -/* Define to 1 if you have the `strnstr' function. */ -#undef HAVE_STRNSTR - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_ENDIAN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the `tcgetattr' function. */ -#undef HAVE_TCGETATTR - -/* Define to 1 if you have the header file. */ -#undef HAVE_TERMIOS_H - -/* Define to 1 if you have the `towlower' function. */ -#undef HAVE_TOWLOWER - -/* Define to 1 if you have the `umask' function. */ -#undef HAVE_UMASK - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to 1 if you have the `vasprintf' function. */ -#undef HAVE_VASPRINTF - -/* Define to 1 if you have the header file. */ -#undef HAVE_WCTYPE_H - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Version number of package */ -#undef VERSION - -/* Define to `unsigned int' if does not define. */ -#undef size_t diff --git a/tests/invalidkeys.c b/tests/invalidkeys.c index 6088834..112ee8a 100644 --- a/tests/invalidkeys.c +++ b/tests/invalidkeys.c @@ -24,7 +24,7 @@ int main() { mkinvalid_secret(ptx, key, i); for(i=0; i<4; i++) - mkinvalid_public(key, i); + mkinvalid_public(ptx, key, i); mkinvv(ptx, "testvault-invalidheader", 0); mkinvv(ptx, "testvault-invalidversion", 1); @@ -102,7 +102,7 @@ void mkinvv(PCPCTX *ptx, const char *name, int type) { fclose(v->fd); } -void mkinvalid_public(pcp_key_t *k, int type) { +void mkinvalid_public(PCPCTX *ptx, pcp_key_t *k, int type) { pcp_key_t *key = ucmalloc(sizeof(pcp_key_t)); memcpy(key, k, sizeof(pcp_key_t)); FILE *fd = NULL; @@ -127,7 +127,7 @@ void mkinvalid_public(pcp_key_t *k, int type) { } if(fd != NULL) { - Buffer *b = pcp_export_rfc_pub(key); + Buffer *b = pcp_export_rfc_pub(ptx, key); fwrite(buffer_get(b), 1, buffer_size(b), fd); fclose(fd); } diff --git a/tests/invalidkeys.h b/tests/invalidkeys.h index ddba086..eb1e4f9 100644 --- a/tests/invalidkeys.h +++ b/tests/invalidkeys.h @@ -11,7 +11,7 @@ #include "vault.h" void mkinvalid_secret(PCPCTX *ptx, pcp_key_t *k, int type); -void mkinvalid_public(pcp_key_t *k, int type); +void mkinvalid_public(PCPCTX *ptx, pcp_key_t *k, int type); void mkinvv(PCPCTX *ptx, const char *name, int type); FILE *F(char *filename);