modifications to match recent changes. that's just preparation of more changes towards PBP-Compatibility. Current state is UNSTABLE. See TODO for details whats left to do.

2025-12-17 12:00:56 +01:00 · 2014-01-19 23:58:53 +01:00
parent e20a0683c6
commit 05db2f1204
35 changed files with 1034 additions and 1843 deletions
--- a/26
+++ b/26
@@ -1,3 +1,29 @@
+0.2.0	ED25519 and Curve25519 keys are now generated
+	separately (previously they were generated from
+	one random seed, the curve had been derived from
+	the ed key).
+
+	To encrypt the secret keys, we're now using a key
+	derived from the user passphrase generated using
+	the scrypt() function, incorporated from tarsnap
+	via scrypt-1.1.6.
+
+	The "derived pcp key" feature has been dropped.
+
+	Encrypted file format/scheme changed. Previously
+	I included the sender's key-id with the encrypted
+	cipher as a hash. Now the sender's public key will
+	be included directly. This way I don't have to reveal
+	key-ids (which is bad) and people can encrypt for
+	others without a full key exchange first.
+
+	Also I'm no more using the primary secret (or any
+	other secret in the vault) for encryption. Instead
+	every time a user encrypts a file, a new keypair
+	will be generated. That way the file can only be
+	decrypted by the recipient (which public key have
+	been used) and no one else, not even the sender.
+
 0.1.5   Fixed a segmentation fault when using pcp1 -t on a
 	public key. I added a double free() there by purpose
 	to test segfault catching I added in unittest.pl
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.12.4 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994-2012 Free Software Foundation, Inc.
--- a/25
+++ b/25
@@ -1,5 +1,3 @@
-aix works now so far, but -R doesnt work - now it does but decryption fails for some unknown reason.
-
 libpcp/z85.c:148 free(z85) leads to coredump on aix sometimes

 add more abstract en+de-cryption() functions to libpcp/crypto, which
@@ -9,4 +7,25 @@ Bug: pcp_z85_decode() segfaults at z85.c:83 if input consists of "-----" only.

 Bug: pcp_z85_decode() fails if after end marker follows something, even whitespaces

-key++: normalize id and lc()
+key++: normalize id and lc()
+
+
+
+allow signing using an alternate secret key, like in pcpdecrypt()
+
+use recipient in encryption to lookup public key in the vault, if id not given
+
+change encrypted file format to the one of pbp, following it:
+   - support multiple recipients
+   - encrypt 32k blockwise using crypto_secretbox() using
+     a random key, encrypt that key for each recipient with
+     pk using crypto_box()
+   - base85 <=> z85? maybe make us base85 tolerant while still
+     preferring z85? I dunno...
+
+support export/import from/to pbp
+
+remove key-id from stored signatures, maybe add the file content again
+(by default a signature consists of the file+sig, but I sometime decided
+to detach the sig and only write this to the signature file, at least pbp
+stores the full stuff, so I shall do it as well).
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.12.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.4 -*- Autoconf -*-

 # Copyright (C) 1996-2012 Free Software Foundation, Inc.

@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.12'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.12.6], [],
+m4_if([$1], [1.12.4], [],
      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])

@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.12.6])dnl
+[AM_AUTOMAKE_VERSION([1.12.4])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
--- a/bindings/cpp/Makefile.in
+++ b/bindings/cpp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.12.4 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994-2012 Free Software Foundation, Inc.
--- a/config/compile
+++ b/config/compile
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.

-scriptversion=2012-10-14.11; # UTC
+scriptversion=2012-03-05.13; # UTC

 # Copyright (C) 1999-2012 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
@@ -112,11 +112,6 @@ func_cl_dashl ()
      lib=$dir/$lib.lib
      break
    fi
-    if test -f "$dir/lib$lib.a"; then
-      found=yes
-      lib=$dir/lib$lib.a
-      break
-    fi
  done
  IFS=$save_IFS

--- a/config/config.guess
+++ b/config/config.guess
--- a/config/config.sub
+++ b/config/config.sub
@@ -1,40 +1,42 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.

-timestamp='2013-04-24'
+timestamp='2003-07-04'

-# This file 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 3 of the License, or
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine.  It does not imply ALL GNU software can.
+#
+# This file 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.
+# 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.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
+# the same distribution terms that you use for the rest of that program.

-
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.  Submit a context
+# diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.

-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -68,7 +70,8 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)

-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.

 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -80,11 +83,11 @@ Try \`$me --help' for more information."
 while test $# -gt 0 ; do
  case $1 in
    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
+       echo "$timestamp" ; exit 0 ;;
    --version | -v )
-       echo "$version" ; exit ;;
+       echo "$version" ; exit 0 ;;
    --help | --h* | -h )
-       echo "$usage"; exit ;;
+       echo "$usage"; exit 0 ;;
    -- )     # Stop option processing
       shift; break ;;
    - )	# Use stdin as input.
@@ -96,7 +99,7 @@ while test $# -gt 0 ; do
    *local*)
       # First pass through any local machine types.
       echo $1
-       exit ;;
+       exit 0;;

    * )
       break ;;
@@ -115,18 +118,10 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
-  android-linux)
-    os=-linux-android
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-    ;;
  *)
    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
    if [ $basic_machine != $1 ]
@@ -149,13 +144,10 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze*)
+	-apple | -axis)
 		os=
 		basic_machine=$1
 		;;
-	-bluegene*)
-		os=-cnk
-		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -170,17 +162,13 @@ case $os in
 		os=-chorusos
 		basic_machine=$1
 		;;
-	-chorusrdb)
-		os=-chorusrdb
+ 	-chorusrdb)
+ 		os=-chorusrdb
 		basic_machine=$1
-		;;
+ 		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -197,10 +185,6 @@ case $os in
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -218,12 +202,6 @@ case $os in
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
-	-lynx*178)
-		os=-lynxos178
-		;;
-	-lynx*5)
-		os=-lynxos5
-		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -248,106 +226,55 @@ case $basic_machine in
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
-	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arceb \
-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-	| avr | avr32 \
-	| be32 | be64 \
-	| bfin \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
-	| fido | fr30 | frv \
+	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| hexagon \
 	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| le32 | le64 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+	| ip2k \
+	| m32r | m68000 | m68k | m88k | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
 	| mips64vr | mips64vrel \
+	| mips64orion | mips64orionel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
 	| msp430 \
-	| nds32 | nds32le | nds32be \
-	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
-	| open8 \
-	| or1k | or32 \
+	| openrisc | or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| rl78 | rx \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu \
-	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-	| ubicom32 \
-	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+	| strongarm \
+	| tahoe | thumb | tic4x | tic80 | tron \
+	| v850 | v850e \
 	| we32k \
-	| x86 | xc16x | xstormy16 | xtensa \
-	| z8k | z80)
+	| x86 | xscale | xstormy16 | xtensa \
+	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
-	c54x)
-		basic_machine=tic54x-unknown
-		;;
-	c55x)
-		basic_machine=tic55x-unknown
-		;;
-	c6x)
-		basic_machine=tic6x-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12)
+		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	strongarm | thumb | xscale)
-		basic_machine=arm-unknown
-		;;
-	xgate)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	xscaleeb)
-		basic_machine=armeb-unknown
-		;;
-
-	xscaleel)
-		basic_machine=armel-unknown
-		;;

 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@@ -363,82 +290,58 @@ case $basic_machine in
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
-	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | amd64-* | arc-* | arceb-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | amd64-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| be32-* | be64-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
+	| avr-* \
+	| bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| clipper-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| le32-* | le64-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
+	| ip2k-* \
+	| m32r-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-	| microblaze-* | microblazeel-* \
+	| m88110-* | m88k-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
 	| mips64vr-* | mips64vrel-* \
+	| mips64orion-* | mips64orionel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
 	| msp430-* \
-	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* | nios2eb-* | nios2el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| open8-* \
+	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| rl78-* | romp-* | rs6000-* | rx-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| romp-* | rs6000-* \
+	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-	| tahoe-* \
+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile*-* \
 	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-	| vax-* \
+	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* \
-	| xstormy16-* | xtensa*-* \
+	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+	| xtensa-* \
 	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
+	| z8k-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -456,9 +359,6 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-	abacus)
-		basic_machine=abacus-unknown
-		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
@@ -473,6 +373,9 @@ case $basic_machine in
 		basic_machine=a29k-none
 		os=-bsd
 		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
@@ -496,10 +399,6 @@ case $basic_machine in
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -508,35 +407,10 @@ case $basic_machine in
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	bluegene*)
-		basic_machine=powerpc-ibm
-		os=-cnk
-		;;
-	c54x-*)
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c55x-*)
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c6x-*)
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-	cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -561,27 +435,12 @@ case $basic_machine in
 		basic_machine=j90-cray
 		os=-unicos
 		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16 | cr16-*)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
@@ -604,14 +463,6 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
@@ -723,6 +574,7 @@ case $basic_machine in
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -761,14 +613,6 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -780,21 +624,10 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-	microblaze*)
-		basic_machine=microblaze-xilinx
-		;;
-	mingw64)
-		basic_machine=x86_64-pc
-		os=-mingw64
-		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
 		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
@@ -808,6 +641,10 @@ case $basic_machine in
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
+	mmix*)
+		basic_machine=mmix-knuth
+		os=-mmixware
+		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -820,21 +657,10 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-msdos
 		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	msys)
-		basic_machine=i386-pc
-		os=-msys
-		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
-	nacl)
-		basic_machine=le32-unknown
-		os=-nacl
-		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -899,11 +725,9 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
-	neo-tandem)
-		basic_machine=neo-tandem
-		;;
-	nse-tandem)
-		basic_machine=nse-tandem
+	nv1)
+		basic_machine=nv1-cray
+		os=-unicosmp
 		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
@@ -912,12 +736,9 @@ case $basic_machine in
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
-	openrisc | openrisc-*)
+	or32 | or32-*)
 		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
+		os=-coff
 		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
@@ -935,14 +756,6 @@ case $basic_machine in
 		basic_machine=i860-intel
 		os=-osf
 		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -952,12 +765,6 @@ case $basic_machine in
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@@ -987,10 +794,9 @@ case $basic_machine in
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc | ppcbe)	basic_machine=powerpc-unknown
+	ppc)	basic_machine=powerpc-unknown
 		;;
-	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@@ -1015,14 +821,6 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos | rdos64)
-		basic_machine=x86_64-pc
-		os=-rdos
-		;;
-	rdos32)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -1049,10 +847,6 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -1064,9 +858,6 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
@@ -1088,9 +879,6 @@ case $basic_machine in
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
-	strongarm-* | thumb-*)
-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -1147,9 +935,17 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tile*)
-		basic_machine=$basic_machine-unknown
-		os=-linux-gnu
+	tic54x | c54x*)
+		basic_machine=tic54x-unknown
+		os=-coff
+		;;
+	tic55x | c55x*)
+		basic_machine=tic55x-unknown
+		os=-coff
+		;;
+	tic6x | c6x*)
+		basic_machine=tic6x-unknown
+		os=-coff
 		;;
 	tx39)
 		basic_machine=mipstx39-unknown
@@ -1164,10 +960,6 @@ case $basic_machine in
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
@@ -1211,16 +1003,9 @@ case $basic_machine in
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
-	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@@ -1229,10 +1014,6 @@ case $basic_machine in
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
-		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1252,9 +1033,6 @@ case $basic_machine in
 	romp)
 		basic_machine=romp-ibm
 		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
 	rs6000)
 		basic_machine=rs6000-ibm
 		;;
@@ -1271,10 +1049,13 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparc | sparcv9 | sparcv9b)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1318,12 +1099,9 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
+        # First match some system type aliases
+        # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
-	-auroraux)
-		os=-auroraux
-		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1344,31 +1122,25 @@ case $os in
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* | -plan9* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
+	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
+	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -chorusos* | -chorusrdb* \
+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1386,15 +1158,12 @@ case $os in
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -1407,9 +1176,6 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-	-os400*)
-		os=-os400
-		;;
 	-wince*)
 		os=-wince
 		;;
@@ -1431,9 +1197,6 @@ case $os in
 	-atheos*)
 		os=-atheos
 		;;
-	-syllable*)
-		os=-syllable
-		;;
 	-386bsd)
 		os=-bsd
 		;;
@@ -1456,9 +1219,6 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-	-tpf*)
-		os=-tpf
-		;;
 	-triton*)
 		os=-sysv3
 		;;
@@ -1492,13 +1252,8 @@ case $os in
 	-aros*)
 		os=-aros
 		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-dicos*)
-		os=-dicos
-		;;
-	-nacl*)
+	-kaos*)
+		os=-kaos
 		;;
 	-none)
 		;;
@@ -1522,12 +1277,6 @@ else
 # system, and we'll never get to this point.

 case $basic_machine in
-	score-*)
-		os=-elf
-		;;
-	spu-*)
-		os=-elf
-		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1537,21 +1286,9 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-	c4x-* | tic4x-*)
-		os=-coff
-		;;
-	hexagon-*)
-		os=-elf
-		;;
-	tic54x-*)
-		os=-coff
-		;;
-	tic55x-*)
-		os=-coff
-		;;
-	tic6x-*)
-		os=-coff
-		;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
@@ -1570,22 +1307,19 @@ case $basic_machine in
 		;;
 	m68000-sun)
 		os=-sunos3
+		# This also exists in the configure program, but was not the
+		# default.
+		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
 		;;
-	mep-*)
-		os=-elf
-		;;
 	mips*-cisco)
 		os=-elf
 		;;
 	mips*-*)
 		os=-elf
 		;;
-	or1k-*)
-		os=-elf
-		;;
 	or32-*)
 		os=-coff
 		;;
@@ -1598,15 +1332,9 @@ case $basic_machine in
 	*-be)
 		os=-beos
 		;;
-	*-haiku)
-		os=-haiku
-		;;
 	*-ibm)
 		os=-aix
 		;;
-	*-knuth)
-		os=-mmixware
-		;;
 	*-wec)
 		os=-proelf
 		;;
@@ -1709,7 +1437,7 @@ case $basic_machine in
 			-sunos*)
 				vendor=sun
 				;;
-			-cnk*|-aix*)
+			-aix*)
 				vendor=ibm
 				;;
 			-beos*)
@@ -1739,15 +1467,9 @@ case $basic_machine in
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
-			-os400*)
-				vendor=ibm
-				;;
 			-ptx*)
 				vendor=sequent
 				;;
-			-tpf*)
-				vendor=ibm
-				;;
 			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
@@ -1772,7 +1494,7 @@ case $basic_machine in
 esac

 echo $basic_machine$os
-exit
+exit 0

 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
--- a/config/depcomp
+++ b/config/depcomp
@@ -74,9 +74,6 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}

 rm -f "$tmpdepfile"

-# Avoid interferences from the environment.
-gccflag= dashmflag=
-
 # Some modes work just like other modes, but use different flags.  We
 # parameterize here, but still list the modes in the big case below,
 # to make depend.m4 easier to write.  Note that we *cannot* use a case
@@ -111,7 +108,7 @@ if test "$depmode" = msvc7msys; then
 fi

 if test "$depmode" = xlc; then
-   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
   gccflag=-qmakedep=gcc,-MF
   depmode=gcc
 fi
@@ -145,17 +142,13 @@ gcc3)
  ;;

 gcc)
-## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
-## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
-## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc.  Here's
 ## why we pick this rather obscure method:
 ## - Don't want to use -MD because we'd like the dependencies to end
 ##   up in a subdir.  Having to rename by hand is ugly.
 ##   (We might end up doing this anyway to support other compilers.)
 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).  Also, it might not be
-##   supported by the other compilers which use the 'gcc' depmode.
+##   -MM, not -M (despite what the docs say).
 ## - Using -M directly means running the compiler twice (even worse
 ##   than renaming).
  if test -z "$gccflag"; then
--- a/config/libtool.m4
+++ b/config/libtool.m4
@@ -1,8 +1,8 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+#                 Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -11,8 +11,8 @@

 m4_define([_LT_COPYING], [dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+#                 Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -146,8 +146,6 @@ AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
 AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl

-_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
-dnl
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -639,7 +637,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.

-Copyright (C) 2011 Free Software Foundation, Inc.
+Copyright (C) 2010 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."

@@ -803,7 +801,6 @@ AC_DEFUN([LT_LANG],
 m4_case([$1],
  [C],			[_LT_LANG(C)],
  [C++],		[_LT_LANG(CXX)],
-  [Go],			[_LT_LANG(GO)],
  [Java],		[_LT_LANG(GCJ)],
  [Fortran 77],		[_LT_LANG(F77)],
  [Fortran],		[_LT_LANG(FC)],
@@ -825,31 +822,6 @@ m4_defun([_LT_LANG],
 ])# _LT_LANG


-m4_ifndef([AC_PROG_GO], [
-############################################################
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-############################################################
-m4_defun([AC_PROG_GO],
-[AC_LANG_PUSH(Go)dnl
-AC_ARG_VAR([GOC],     [Go compiler command])dnl
-AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
-_AC_ARG_VAR_LDFLAGS()dnl
-AC_CHECK_TOOL(GOC, gccgo)
-if test -z "$GOC"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
-  fi
-fi
-if test -z "$GOC"; then
-  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
-fi
-])#m4_defun
-])#m4_ifndef
-
-
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -880,10 +852,6 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
       m4_ifdef([LT_PROG_GCJ],
 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])

-AC_PROVIDE_IFELSE([AC_PROG_GO],
-  [LT_LANG(GO)],
-  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
-
 AC_PROVIDE_IFELSE([LT_PROG_RC],
  [LT_LANG(RC)],
  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -986,13 +954,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
        _lt_result=$?
-	# If there is a non-empty error log, and "single_module"
-	# appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	# Otherwise, if the output was created with a 0 exit code from
-	# the compiler, it worked.
-	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1000,7 +962,6 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
      fi])
-
    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
      [lt_cv_ld_exported_symbols_list],
      [lt_cv_ld_exported_symbols_list=no
@@ -1012,7 +973,6 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
 	[lt_cv_ld_exported_symbols_list=no])
 	LDFLAGS="$save_LDFLAGS"
    ])
-
    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
      [lt_cv_ld_force_load=no
      cat > conftest.c << _LT_EOF
@@ -1030,9 +990,7 @@ _LT_EOF
      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
      _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
 	lt_cv_ld_force_load=yes
      else
 	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1077,8 +1035,8 @@ _LT_EOF
 ])


-# _LT_DARWIN_LINKER_FEATURES([TAG])
-# ---------------------------------
+# _LT_DARWIN_LINKER_FEATURES
+# --------------------------
 # Checks for linker and compiler features on darwin
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
 [
@@ -1089,8 +1047,6 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
  if test "$lt_cv_ld_force_load" = "yes"; then
    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
-                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
  else
    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
  fi
@@ -1374,27 +1330,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
    CFLAGS="$SAVE_CFLAGS"
  fi
  ;;
-*-*solaris*)
+sparc*-*solaris*)
  # Find out which ABI we are using.
  echo 'int i;' > conftest.$ac_ext
  if AC_TRY_EVAL(ac_compile); then
    case `/usr/bin/file conftest.o` in
    *64-bit*)
      case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD="${LD-ld}_sol2"
-        fi
-        ;;
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
      *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -1471,13 +1414,13 @@ old_postuninstall_cmds=
 if test -n "$RANLIB"; then
  case $host_os in
  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
    ;;
  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
    ;;
  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi

 case $host_os in
@@ -1657,11 +1600,6 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
    lt_cv_sys_max_cmd_len=196608
    ;;

-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
  osf*)
    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -1701,7 +1639,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
      # If test is not a shell built-in, we'll probably end up computing a
      # maximum length that is only half of the actual maximum length, but
      # we can't tell.
-      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
      do
@@ -2247,7 +2185,7 @@ need_version=unknown

 case $host_os in
 aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
  shlibpath_var=LIBPATH

@@ -2256,7 +2194,7 @@ aix3*)
  ;;

 aix[[4-9]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_lib_prefix=no
  need_version=no
  hardcode_into_libs=yes
@@ -2321,7 +2259,7 @@ beos*)
  ;;

 bsdi[[45]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
  soname_spec='${libname}${release}${shared_ext}$major'
@@ -2460,7 +2398,7 @@ m4_if([$1], [],[
  ;;

 dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_lib_prefix=no
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -2513,18 +2451,17 @@ freebsd* | dragonfly*)
  ;;

 gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_lib_prefix=no
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
  soname_spec='${libname}${release}${shared_ext}$major'
  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
  hardcode_into_libs=yes
  ;;

 haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_lib_prefix=no
  need_version=no
  dynamic_linker="$host_os runtime_loader"
@@ -2585,7 +2522,7 @@ hpux9* | hpux10* | hpux11*)
  ;;

 interix[[3-9]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_lib_prefix=no
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -2601,7 +2538,7 @@ irix5* | irix6* | nonstopux*)
    nonstopux*) version_type=nonstopux ;;
    *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
+		version_type=linux
 	else
 		version_type=irix
 	fi ;;
@@ -2638,9 +2575,9 @@ linux*oldld* | linux*aout* | linux*coff*)
  dynamic_linker=no
  ;;

-# This must be glibc/ELF.
+# This must be Linux ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_lib_prefix=no
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2703,7 +2640,7 @@ netbsd*)
  ;;

 newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
  shlibpath_var=LD_LIBRARY_PATH
  shlibpath_overrides_runpath=yes
@@ -2772,7 +2709,7 @@ rdos*)
  ;;

 solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_lib_prefix=no
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2797,7 +2734,7 @@ sunos4*)
  ;;

 sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
  soname_spec='${libname}${release}${shared_ext}$major'
  shlibpath_var=LD_LIBRARY_PATH
@@ -2821,7 +2758,7 @@ sysv4 | sysv4.3*)

 sysv4*MP*)
  if test -d /usr/nec ;then
-    version_type=linux # correct to gnu/linux during the next big refactor
+    version_type=linux
    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
    soname_spec='$libname${shared_ext}.$major'
    shlibpath_var=LD_LIBRARY_PATH
@@ -2852,7 +2789,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)

 tpf*)
  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_lib_prefix=no
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2862,7 +2799,7 @@ tpf*)
  ;;

 uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
  soname_spec='${libname}${release}${shared_ext}$major'
  shlibpath_var=LD_LIBRARY_PATH
@@ -3284,7 +3221,7 @@ irix5* | irix6* | nonstopux*)
  lt_cv_deplibs_check_method=pass_all
  ;;

-# This must be glibc/ELF.
+# This must be Linux ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
  lt_cv_deplibs_check_method=pass_all
  ;;
@@ -3704,7 +3641,6 @@ for ac_symprfx in "" "_"; do
    # which start with @ or ?.
    lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -4289,9 +4225,7 @@ m4_if([$1], [CXX], [
    case $cc_basename in
    nvcc*) # Cuda Compiler Driver 2.2
      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
-      fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
      ;;
    esac
  else
@@ -4383,33 +4317,18 @@ m4_if([$1], [CXX], [
 	;;
      *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+	*Sun\ F* | *Sun*Fortran*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
-        *Intel*\ [[CF]]*Compiler*)
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	  ;;
-	*Portland\ Group*)
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  ;;
 	esac
 	;;
      esac
@@ -4569,9 +4488,7 @@ m4_if([$1], [CXX], [
    ;;
  cygwin* | mingw* | cegcc*)
    case $cc_basename in
-    cl*)
-      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-      ;;
+    cl*) ;;
    *)
      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
@@ -4596,6 +4513,7 @@ m4_if([$1], [CXX], [
  _LT_TAGVAR(hardcode_direct, $1)=no
  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
  _LT_TAGVAR(hardcode_libdir_separator, $1)=
  _LT_TAGVAR(hardcode_minus_L, $1)=no
  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -4846,7 +4764,8 @@ _LT_EOF
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
 	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -5141,7 +5060,6 @@ _LT_EOF
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -5239,6 +5157,7 @@ _LT_EOF
      fi
      if test "$with_gnu_ld" = no; then
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -5680,6 +5599,9 @@ _LT_TAGDECL([], [no_undefined_flag], [1],
 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
    [Flag to hardcode $libdir into a binary during linking.
    This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
+    [[If ld is used when linking, flag to hardcode $libdir into a binary
+    during linking.  This must work even if $libdir does not exist]])
 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
    [Whether we need a single "-rpath" flag with a separated argument])
 _LT_TAGDECL([], [hardcode_direct], [0],
@@ -5837,6 +5759,7 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -6967,18 +6890,12 @@ public class foo {
  }
 };
 _LT_EOF
-], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
-package foo
-func foo() {
-}
-_LT_EOF
 ])

 _lt_libdeps_save_CFLAGS=$CFLAGS
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac

 dnl Parse the compiler output and extract the necessary
@@ -7175,6 +7092,7 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7307,6 +7225,7 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7493,77 +7412,6 @@ CFLAGS=$lt_save_CFLAGS
 ])# _LT_LANG_GCJ_CONFIG


-# _LT_LANG_GO_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Go compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GO_CONFIG],
-[AC_REQUIRE([LT_PROG_GO])dnl
-AC_LANG_SAVE
-
-# Source file extension for Go test sources.
-ac_ext=go
-
-# Object file extension for compiled Go test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="package main; func main() { }"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='package main; func main() { }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GOC-"gccgo"}
-CFLAGS=$GOFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# Go did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GO_CONFIG
-
-
 # _LT_LANG_RC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
@@ -7633,13 +7481,6 @@ dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])


-# LT_PROG_GO
-# ----------
-AC_DEFUN([LT_PROG_GO],
-[AC_CHECK_TOOL(GOC, gccgo,)
-])
-
-
 # LT_PROG_RC
 # ----------
 AC_DEFUN([LT_PROG_RC],
--- a/config/ltmain.sh
+++ b/config/ltmain.sh
@@ -1,9 +1,9 @@

-# libtool (GNU libtool) 2.4.2
+# libtool (GNU libtool) 2.4
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996

 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

@@ -41,7 +41,6 @@
 #       --quiet, --silent    don't print informational messages
 #       --no-quiet, --no-silent
 #                            print informational messages (default)
-#       --no-warn            don't display warning messages
 #       --tag=TAG            use configuration variables from tag TAG
 #   -v, --verbose            print more informational messages than default
 #       --no-verbose         don't print the extra informational messages
@@ -70,7 +69,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4.2
+#         $progname:	(GNU libtool) 2.4
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -80,9 +79,9 @@

 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.4.2
+VERSION=2.4
 TIMESTAMP=""
-package_revision=1.3337
+package_revision=1.3293

 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -137,10 +136,15 @@ progpath="$0"

 : ${CP="cp -f"}
 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${EGREP="grep -E"}
+: ${FGREP="grep -F"}
+: ${GREP="grep"}
+: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
+: ${SED="sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}

@@ -383,7 +387,7 @@ case $progpath in
     ;;
  *)
     save_IFS="$IFS"
-     IFS=${PATH_SEPARATOR-:}
+     IFS=:
     for progdir in $PATH; do
       IFS="$save_IFS"
       test -x "$progdir/$progname" && break
@@ -767,8 +771,8 @@ func_help ()
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
 	p
 	d
     }
@@ -1048,7 +1052,6 @@ opt_finish=false
 opt_help=false
 opt_help_all=false
 opt_silent=:
-opt_warning=:
 opt_verbose=:
 opt_silent=false
 opt_verbose=false
@@ -1115,10 +1118,6 @@ esac
 			;;
      --no-silent|--no-quiet)
 			opt_silent=false
-func_append preserve_args " $opt"
-			;;
-      --no-warning|--no-warn)
-			opt_warning=false
 func_append preserve_args " $opt"
 			;;
      --no-verbose)
@@ -2090,7 +2089,7 @@ func_mode_compile ()
    *.[cCFSifmso] | \
    *.ada | *.adb | *.ads | *.asm | \
    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
+    *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
      func_xform "$libobj"
      libobj=$func_xform_result
      ;;
@@ -3232,13 +3231,11 @@ func_mode_install ()

      # Set up the ranlib parameters.
      oldlib="$destdir/$name"
-      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
-      tool_oldlib=$func_to_tool_file_result

      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'

      if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
+	func_show_eval "$old_striplib $oldlib" 'exit $?'
      fi

      # Do each command in the postinstall commands.
@@ -3503,7 +3500,7 @@ static const void *lt_preloaded_setup() {
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
@@ -4018,17 +4015,14 @@ func_exec_program_core ()
 # launches target application with the remaining arguments.
 func_exec_program ()
 {
-  case \" \$* \" in
-  *\\ --lt-*)
-    for lt_wr_arg
-    do
-      case \$lt_wr_arg in
-      --lt-*) ;;
-      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-      esac
-      shift
-    done ;;
-  esac
+  for lt_wr_arg
+  do
+    case \$lt_wr_arg in
+    --lt-*) ;;
+    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+    esac
+    shift
+  done
  func_exec_program_core \${1+\"\$@\"}
 }

@@ -5096,15 +5090,9 @@ void lt_dump_script (FILE* f)
 {
 EOF
 	    func_emit_wrapper yes |
-	      $SED -n -e '
-s/^\(.\{79\}\)\(..*\)/\1\
-\2/
-h
-s/\([\\"]\)/\\\1/g
-s/$/\\n/
-s/\([^\n]*\).*/  fputs ("\1", f);/p
-g
-D'
+              $SED -e 's/\([\\"]\)/\\\1/g' \
+	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
+
            cat <<"EOF"
 }
 EOF
@@ -5689,8 +5677,7 @@ func_mode_link ()
 	continue
 	;;

-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -6194,8 +6181,7 @@ func_mode_link ()
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -6896,7 +6882,7 @@ func_mode_link ()
 	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$absdir"
+		add_dir="-L$dir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
@@ -7381,7 +7367,6 @@ func_mode_link ()
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
-	  # correct linux to gnu/linux during the next big refactor
 	  darwin|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
@@ -7498,7 +7483,7 @@ func_mode_link ()
 	  versuffix="$major.$revision"
 	  ;;

-	linux) # correct to gnu/linux during the next big refactor
+	linux)
 	  func_arith $current - $age
 	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
@@ -8086,11 +8071,6 @@ EOF

      # Test again, we may have decided not to build it any more
      if test "$build_libtool_libs" = yes; then
-	# Remove ${wl} instances when linking with ld.
-	# FIXME: should test the right _cmds variable.
-	case $archive_cmds in
-	  *\$LD\ *) wl= ;;
-        esac
 	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
@@ -8121,7 +8101,7 @@ EOF
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) func_append perm_rpath " $libdir" ;;
+	      *) func_apped perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -8129,7 +8109,11 @@ EOF
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
+	    if test -n "$hardcode_libdir_flag_spec_ld"; then
+	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+	    else
+	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+	    fi
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
@@ -9219,8 +9203,6 @@ EOF
 	    esac
 	  done
 	fi
-	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
-	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"

 	func_len " $cmds"
@@ -9330,8 +9312,7 @@ EOF
 	      *.la)
 		func_basename "$deplib"
 		name="$func_basename_result"
-		func_resolve_sysroot "$deplib"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
 		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
--- a/config/ltoptions.m4
+++ b/config/ltoptions.m4
@@ -326,24 +326,9 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
 # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+    [AS_HELP_STRING([--with-pic],
 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for lt_pkg in $withval; do
-	IFS="$lt_save_ifs"
-	if test "X$lt_pkg" = "X$lt_p"; then
-	  pic_mode=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
+    [pic_mode="$withval"],
    [pic_mode=default])

 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
--- a/config/ltversion.m4
+++ b/config/ltversion.m4
@@ -9,15 +9,15 @@

 # @configure_input@

-# serial 3337 ltversion.m4
+# serial 3293 ltversion.m4
 # This file is part of GNU Libtool

-m4_define([LT_PACKAGE_VERSION], [2.4.2])
-m4_define([LT_PACKAGE_REVISION], [1.3337])
+m4_define([LT_PACKAGE_VERSION], [2.4])
+m4_define([LT_PACKAGE_REVISION], [1.3293])

 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.2'
-macro_revision='1.3337'
+[macro_version='2.4'
+macro_revision='1.3293'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
--- a/205
+++ b/205
@@ -1409,7 +1409,7 @@ Optional Features:
 Optional Packages:
  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
+  --with-pic              try to use only PIC/non-PIC objects [default=use
                          both]
  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
  --with-sysroot=DIR Search for dependent libraries within DIR
@@ -2972,8 +2972,8 @@ esac



-macro_version='2.4.2'
-macro_revision='1.3337'
+macro_version='2.4'
+macro_revision='1.3293'



@@ -4798,11 +4798,6 @@ else
    lt_cv_sys_max_cmd_len=196608
    ;;

-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
  osf*)
    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -4842,7 +4837,7 @@ else
      # If test is not a shell built-in, we'll probably end up computing a
      # maximum length that is only half of the actual maximum length, but
      # we can't tell.
-      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
      do
@@ -5271,7 +5266,7 @@ irix5* | irix6* | nonstopux*)
  lt_cv_deplibs_check_method=pass_all
  ;;

-# This must be glibc/ELF.
+# This must be Linux ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
  lt_cv_deplibs_check_method=pass_all
  ;;
@@ -5912,13 +5907,13 @@ old_postuninstall_cmds=
 if test -n "$RANLIB"; then
  case $host_os in
  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
    ;;
  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
    ;;
  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi

 case $host_os in
@@ -6065,7 +6060,6 @@ for ac_symprfx in "" "_"; do
    # which start with @ or ?.
    lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -6454,7 +6448,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
    CFLAGS="$SAVE_CFLAGS"
  fi
  ;;
-*-*solaris*)
+sparc*-*solaris*)
  # Find out which ABI we are using.
  echo 'int i;' > conftest.$ac_ext
  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -6465,20 +6459,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
    case `/usr/bin/file conftest.o` in
    *64-bit*)
      case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD="${LD-ld}_sol2"
-        fi
-        ;;
+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
      *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -7118,13 +7099,7 @@ else
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
        _lt_result=$?
-	# If there is a non-empty error log, and "single_module"
-	# appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-	  cat conftest.err >&5
-	# Otherwise, if the output was created with a 0 exit code from
-	# the compiler, it worked.
-	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -7135,7 +7110,6 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if ${lt_cv_ld_exported_symbols_list+:} false; then :
@@ -7168,7 +7142,6 @@ rm -f core conftest.err conftest.$ac_objext \
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 $as_echo_n "checking for -force_load linker flag... " >&6; }
 if ${lt_cv_ld_force_load+:} false; then :
@@ -7190,9 +7163,7 @@ _LT_EOF
      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
      _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-	cat conftest.err >&5
-      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
 	lt_cv_ld_force_load=yes
      else
 	cat conftest.err >&5
@@ -7597,22 +7568,7 @@ fi

 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
-  withval=$with_pic; lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for lt_pkg in $withval; do
-	IFS="$lt_save_ifs"
-	if test "X$lt_pkg" = "X$lt_p"; then
-	  pic_mode=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
+  withval=$with_pic; pic_mode="$withval"
 else
  pic_mode=default
 fi
@@ -7685,10 +7641,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'



-
-
-
-



@@ -8153,9 +8105,7 @@ lt_prog_compiler_static=
    case $cc_basename in
    nvcc*) # Cuda Compiler Driver 2.2
      lt_prog_compiler_wl='-Xlinker '
-      if test -n "$lt_prog_compiler_pic"; then
-        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
-      fi
+      lt_prog_compiler_pic='-Xcompiler -fPIC'
      ;;
    esac
  else
@@ -8246,33 +8196,18 @@ lt_prog_compiler_static=
 	;;
      *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+	*Sun\ F* | *Sun*Fortran*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl=''
 	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Qoption ld '
-	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
-        *Intel*\ [CF]*Compiler*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fPIC'
-	  lt_prog_compiler_static='-static'
-	  ;;
-	*Portland\ Group*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fpic'
-	  lt_prog_compiler_static='-Bstatic'
-	  ;;
 	esac
 	;;
      esac
@@ -8634,6 +8569,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
  hardcode_direct=no
  hardcode_direct_absolute=no
  hardcode_libdir_flag_spec=
+  hardcode_libdir_flag_spec_ld=
  hardcode_libdir_separator=
  hardcode_minus_L=no
  hardcode_shlibpath_var=unsupported
@@ -8883,7 +8819,8 @@ _LT_EOF
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+	  hardcode_libdir_flag_spec=
+	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -9262,7 +9199,6 @@ fi
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
 	enable_shared_with_static_runtimes=yes
-	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	old_postinstall_cmds='chmod 644 $oldlib'
@@ -9308,7 +9244,6 @@ fi
  hardcode_shlibpath_var=unsupported
  if test "$lt_cv_ld_force_load" = "yes"; then
    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-
  else
    whole_archive_flag_spec=''
  fi
@@ -9388,6 +9323,7 @@ fi
      fi
      if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -10005,6 +9941,11 @@ esac



+
+
+
+
+



@@ -10100,7 +10041,7 @@ need_version=unknown

 case $host_os in
 aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
  shlibpath_var=LIBPATH

@@ -10109,7 +10050,7 @@ aix3*)
  ;;

 aix[4-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_lib_prefix=no
  need_version=no
  hardcode_into_libs=yes
@@ -10174,7 +10115,7 @@ beos*)
  ;;

 bsdi[45]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
  soname_spec='${libname}${release}${shared_ext}$major'
@@ -10313,7 +10254,7 @@ darwin* | rhapsody*)
  ;;

 dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_lib_prefix=no
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -10366,18 +10307,17 @@ freebsd* | dragonfly*)
  ;;

 gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_lib_prefix=no
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
  soname_spec='${libname}${release}${shared_ext}$major'
  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
  hardcode_into_libs=yes
  ;;

 haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_lib_prefix=no
  need_version=no
  dynamic_linker="$host_os runtime_loader"
@@ -10438,7 +10378,7 @@ hpux9* | hpux10* | hpux11*)
  ;;

 interix[3-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_lib_prefix=no
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -10454,7 +10394,7 @@ irix5* | irix6* | nonstopux*)
    nonstopux*) version_type=nonstopux ;;
    *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
+		version_type=linux
 	else
 		version_type=irix
 	fi ;;
@@ -10491,9 +10431,9 @@ linux*oldld* | linux*aout* | linux*coff*)
  dynamic_linker=no
  ;;

-# This must be glibc/ELF.
+# This must be Linux ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_lib_prefix=no
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10575,7 +10515,7 @@ netbsd*)
  ;;

 newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
  shlibpath_var=LD_LIBRARY_PATH
  shlibpath_overrides_runpath=yes
@@ -10644,7 +10584,7 @@ rdos*)
  ;;

 solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_lib_prefix=no
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10669,7 +10609,7 @@ sunos4*)
  ;;

 sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
  soname_spec='${libname}${release}${shared_ext}$major'
  shlibpath_var=LD_LIBRARY_PATH
@@ -10693,7 +10633,7 @@ sysv4 | sysv4.3*)

 sysv4*MP*)
  if test -d /usr/nec ;then
-    version_type=linux # correct to gnu/linux during the next big refactor
+    version_type=linux
    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
    soname_spec='$libname${shared_ext}.$major'
    shlibpath_var=LD_LIBRARY_PATH
@@ -10724,7 +10664,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)

 tpf*)
  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_lib_prefix=no
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10734,7 +10674,7 @@ tpf*)
  ;;

 uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
  soname_spec='${libname}${release}${shared_ext}$major'
  shlibpath_var=LD_LIBRARY_PATH
@@ -11516,8 +11456,6 @@ CC="$lt_save_CC"



-
-
        ac_config_commands="$ac_config_commands libtool"


@@ -12080,6 +12018,7 @@ export_dynamic_flag_spec_CXX=
 hardcode_direct_CXX=no
 hardcode_direct_absolute_CXX=no
 hardcode_libdir_flag_spec_CXX=
+hardcode_libdir_flag_spec_ld_CXX=
 hardcode_libdir_separator_CXX=
 hardcode_minus_L_CXX=no
 hardcode_shlibpath_var_CXX=unsupported
@@ -12663,7 +12602,6 @@ fi
  hardcode_shlibpath_var_CXX=unsupported
  if test "$lt_cv_ld_force_load" = "yes"; then
    whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-
  else
    whole_archive_flag_spec_CXX=''
  fi
@@ -13384,7 +13322,6 @@ _lt_libdeps_save_CFLAGS=$CFLAGS
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac

 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -14174,9 +14111,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
    ;;
  cygwin* | mingw* | cegcc*)
    case $cc_basename in
-    cl*)
-      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-      ;;
+    cl*) ;;
    *)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
      exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
@@ -14326,6 +14261,8 @@ esac



+
+



@@ -14354,7 +14291,7 @@ need_version=unknown

 case $host_os in
 aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
  shlibpath_var=LIBPATH

@@ -14363,7 +14300,7 @@ aix3*)
  ;;

 aix[4-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_lib_prefix=no
  need_version=no
  hardcode_into_libs=yes
@@ -14428,7 +14365,7 @@ beos*)
  ;;

 bsdi[45]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
  soname_spec='${libname}${release}${shared_ext}$major'
@@ -14565,7 +14502,7 @@ darwin* | rhapsody*)
  ;;

 dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_lib_prefix=no
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -14618,18 +14555,17 @@ freebsd* | dragonfly*)
  ;;

 gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_lib_prefix=no
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
  soname_spec='${libname}${release}${shared_ext}$major'
  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
  hardcode_into_libs=yes
  ;;

 haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_lib_prefix=no
  need_version=no
  dynamic_linker="$host_os runtime_loader"
@@ -14690,7 +14626,7 @@ hpux9* | hpux10* | hpux11*)
  ;;

 interix[3-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_lib_prefix=no
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -14706,7 +14642,7 @@ irix5* | irix6* | nonstopux*)
    nonstopux*) version_type=nonstopux ;;
    *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
+		version_type=linux
 	else
 		version_type=irix
 	fi ;;
@@ -14743,9 +14679,9 @@ linux*oldld* | linux*aout* | linux*coff*)
  dynamic_linker=no
  ;;

-# This must be glibc/ELF.
+# This must be Linux ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_lib_prefix=no
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -14827,7 +14763,7 @@ netbsd*)
  ;;

 newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
  shlibpath_var=LD_LIBRARY_PATH
  shlibpath_overrides_runpath=yes
@@ -14896,7 +14832,7 @@ rdos*)
  ;;

 solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_lib_prefix=no
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -14921,7 +14857,7 @@ sunos4*)
  ;;

 sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
  soname_spec='${libname}${release}${shared_ext}$major'
  shlibpath_var=LD_LIBRARY_PATH
@@ -14945,7 +14881,7 @@ sysv4 | sysv4.3*)

 sysv4*MP*)
  if test -d /usr/nec ;then
-    version_type=linux # correct to gnu/linux during the next big refactor
+    version_type=linux
    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
    soname_spec='$libname${shared_ext}.$major'
    shlibpath_var=LD_LIBRARY_PATH
@@ -14976,7 +14912,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)

 tpf*)
  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  need_lib_prefix=no
  need_version=no
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -14986,7 +14922,7 @@ tpf*)
  ;;

 uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
+  version_type=linux
  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
  soname_spec='${libname}${release}${shared_ext}$major'
  shlibpath_var=LD_LIBRARY_PATH
@@ -17469,7 +17405,6 @@ pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
-PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
 host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
 host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
 host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
@@ -17552,6 +17487,7 @@ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
 allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
 hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
@@ -17623,6 +17559,7 @@ with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
 allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
@@ -17661,7 +17598,6 @@ _LTECHO_EOF'
 # Quote evaled strings.
 for var in SHELL \
 ECHO \
-PATH_SEPARATOR \
 SED \
 GREP \
 EGREP \
@@ -17712,6 +17648,7 @@ with_gnu_ld \
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
+hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
 exclude_expsyms \
 include_expsyms \
@@ -17745,6 +17682,7 @@ with_gnu_ld_CXX \
 allow_undefined_flag_CXX \
 no_undefined_flag_CXX \
 hardcode_libdir_flag_spec_CXX \
+hardcode_libdir_flag_spec_ld_CXX \
 hardcode_libdir_separator_CXX \
 exclude_expsyms_CXX \
 include_expsyms_CXX \
@@ -18556,8 +18494,8 @@ $as_echo X"$file" |
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+#                 Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -18611,9 +18549,6 @@ SHELL=$lt_SHELL
 # An echo program that protects backslashes.
 ECHO=$lt_ECHO

-# The PATH separator for the build system.
-PATH_SEPARATOR=$lt_PATH_SEPARATOR
-
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -18915,6 +18850,10 @@ no_undefined_flag=$lt_no_undefined_flag
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec

+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking.  This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
+
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator

@@ -19257,6 +19196,10 @@ no_undefined_flag=$lt_no_undefined_flag_CXX
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX

+# If ld is used when linking, flag to hardcode \$libdir into a binary
+# during linking.  This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
+
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX

--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.12.4 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994-2012 Free Software Foundation, Inc.
--- a/libpcp/Makefile.in
+++ b/libpcp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.12.4 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994-2012 Free Software Foundation, Inc.
--- a/12
+++ b/12
@@ -2,7 +2,7 @@

 # libtool - Provide generalized library-building support services.
 # Generated automatically by config.status (pcp) 0.1.5
-# Libtool was configured on host r4:
+# Libtool was configured on host io:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -66,13 +66,13 @@ PATH_SEPARATOR=":"

 # The host system.
 host_alias=
-host=amd64-unknown-freebsd9.1
-host_os=freebsd9.1
+host=amd64-unknown-freebsd9.0
+host_os=freebsd9.0

 # The build system.
 build_alias=
-build=amd64-unknown-freebsd9.1
-build_os=freebsd9.1
+build=amd64-unknown-freebsd9.0
+build_os=freebsd9.0

 # A sed program that does not truncate output.
 SED="/usr/bin/sed"
@@ -164,7 +164,7 @@ lock_old_archive_extraction=no
 LTCC="gcc"

 # LTCC compiler flags.
-LTCFLAGS="-g -O2 -I/usr/local/include"
+LTCFLAGS="-I/usr/local/include   -I/usr/local/include"

 # Take the output of nm and produce a listing of raw symbols and C names.
 global_symbol_pipe="sed -n -e 's/^.*[	 ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[	 ][	 ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p' | sed '/ __gnu_lto/d'"
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.12.4 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994-2012 Free Software Foundation, Inc.
--- a/man/details.pod
+++ b/man/details.pod
@@ -21,48 +21,24 @@ Each key can be identified using its B<keyid> which looks like this:
 0xD49119E85266509F

 A public key exported from a secret key will have the same keyid
-as the secret key. When using for encryption, the keyid will be
-added to the message so that the receiver knows who was the
-sender of the message (B<This might change in the future. As of
-this writing I'm not sure if this was a good idea>).
+as the secret key.

 If you just want to know details about a key or the vault, use the
 B<-t> option.

-=head2 Derived Public Keys
-
-In the real world you would not use your primary key to encrypt
-messages, because this would require to send the public key part
-to your recipient in one way or another. The much better and more
-secure way is to use a B<Derived Public Key>:
-
-Such a key will be dynamically generated from a hash of your
-primary secret key and the recipient (an email address, name or key id).
-The public part of this dynamic key will be exported and sent to
-the recipient. A public key generated this way will only be usable
-by the recipient (and yourself) and each recipient will have a different
-public key from you (and vice versa).
-
 =head1 ENCRYPTION

-There are 3 modi for encryption available in pcp1:
+There are 2 modes of encryption available in pcp1:

 =over

 =item B<Standard public key encryption>

 In this mode, which is the default, a public key as specified
-with B<-i> and the primary secret key will be used for encryption.
-The public key in question maybe a derived public key, which
-is transparent for the sender however.
-
-If you don't use derived keys, you will have to transfer
-the public key part of your primary keypair to the recipient,
-which is considered insecure if the transfer channel itself
-uses untrusted transports or if the transferred public key
-ends up on a public system (a shared server, a workstation
-at your employer or the like). You should avoid this encryption
-mode in such cases and use derived keys instead.
+with B<-i> and a dynamically generated secret key will be used
+for encryption. The public part of the generated sender key
+will be included with the encrypted file, which the recipient
+can use to decrypt it.

 Example command:

@@ -71,27 +47,6 @@ Example command:
 Here we didn't specify a recipient. Therefore the public
 key given with -i will be used directly.

-=item B<Derived public key encryption>
-
-Derived keys will be generated dynamically at runtime
-(see B<Derived Public Keys> above). Therefore an exported
-derived public key is unique for the sender AND recipient.
-
-This mode can be considered the most secure. If such a key
-gets lost (or into the wrong hands), only this specific
-communication channel will be compromised.
-
-Example command:
-
- pcp1 -e -r bobby@local -I message.txt -O cipher.z85
-
-We specified a recipient. pcp1 searches the vault for a
-matching public key and generates a derived keypair for
-encryption. You need to have a public key installed from
-the recipient anyway, it won't work without one. You may
-also specify a key id (-i) as well to make sure, the right
-key will be used for derivation.
-
 =item B<Self encryption mode>

 Pretty Curved Privacy doesn't provide symetric file encryption.
@@ -290,7 +245,9 @@ format:
 +---------------------------------------------------------+
 | Field         Size      Description                     |
 +-------------+--------+----------------------------------+
- | Hash        |     32 | Hash of the sender key id        |
+ | Pubkey      |     32 | Publix key of the sender         |
+ +-------------|--------|----------------------------------+
+ | Nonce       |     24 | Random Nonce                     |
 +-------------|--------|----------------------------------+
 | Encrypted   |      ~ | The actual encrypted data        |
 +-------------|--------|----------------------------------+
--- a/man/pcp1.1
+++ b/man/pcp1.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
+.\" Automatically generated by Pod::Man 2.23 (Pod::Simple 3.14)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "PCP1 1"
-.TH PCP1 1 "2014-01-16" "PCP 0.1.5" "USER CONTRIBUTED DOCUMENTATION"
+.TH PCP1 1 "2014-01-19" "PCP 0.1.5" "USER CONTRIBUTED DOCUMENTATION"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -332,43 +332,20 @@ Each key can be identified using its \fBkeyid\fR which looks like this:
 .Ve
 .PP
 A public key exported from a secret key will have the same keyid
-as the secret key. When using for encryption, the keyid will be
-added to the message so that the receiver knows who was the
-sender of the message (\fBThis might change in the future. As of
-this writing I'm not sure if this was a good idea\fR).
+as the secret key.
 .PP
 If you just want to know details about a key or the vault, use the
 \&\fB\-t\fR option.
-.SS "Derived Public Keys"
-.IX Subsection "Derived Public Keys"
-In the real world you would not use your primary key to encrypt
-messages, because this would require to send the public key part
-to your recipient in one way or another. The much better and more
-secure way is to use a \fBDerived Public Key\fR:
-.PP
-Such a key will be dynamically generated from a hash of your
-primary secret key and the recipient (an email address, name or key id).
-The public part of this dynamic key will be exported and sent to
-the recipient. A public key generated this way will only be usable
-by the recipient (and yourself) and each recipient will have a different
-public key from you (and vice versa).
 .SH "ENCRYPTION"
 .IX Header "ENCRYPTION"
-There are 3 modi for encryption available in pcp1:
+There are 2 modes of encryption available in pcp1:
 .IP "\fBStandard public key encryption\fR" 4
 .IX Item "Standard public key encryption"
 In this mode, which is the default, a public key as specified
-with \fB\-i\fR and the primary secret key will be used for encryption.
-The public key in question maybe a derived public key, which
-is transparent for the sender however.
-.Sp
-If you don't use derived keys, you will have to transfer
-the public key part of your primary keypair to the recipient,
-which is considered insecure if the transfer channel itself
-uses untrusted transports or if the transferred public key
-ends up on a public system (a shared server, a workstation
-at your employer or the like). You should avoid this encryption
-mode in such cases and use derived keys instead.
+with \fB\-i\fR and a dynamically generated secret key will be used
+for encryption. The public part of the generated sender key
+will be included with the encrypted file, which the recipient
+can use to decrypt it.
 .Sp
 Example command:
 .Sp
@@ -378,28 +355,6 @@ Example command:
 .Sp
 Here we didn't specify a recipient. Therefore the public
 key given with \-i will be used directly.
-.IP "\fBDerived public key encryption\fR" 4
-.IX Item "Derived public key encryption"
-Derived keys will be generated dynamically at runtime
-(see \fBDerived Public Keys\fR above). Therefore an exported
-derived public key is unique for the sender \s-1AND\s0 recipient.
-.Sp
-This mode can be considered the most secure. If such a key
-gets lost (or into the wrong hands), only this specific
-communication channel will be compromised.
-.Sp
-Example command:
-.Sp
-.Vb 1
-\& pcp1 \-e \-r bobby@local \-I message.txt \-O cipher.z85
-.Ve
-.Sp
-We specified a recipient. pcp1 searches the vault for a
-matching public key and generates a derived keypair for
-encryption. You need to have a public key installed from
-the recipient anyway, it won't work without one. You may
-also specify a key id (\-i) as well to make sure, the right
-key will be used for derivation.
 .IP "\fBSelf encryption mode\fR" 4
 .IX Item "Self encryption mode"
 Pretty Curved Privacy doesn't provide symetric file encryption.
@@ -577,11 +532,13 @@ Take a look at the function \fB\f(BIpcp_keypairs()\fB\fR for details.
 Encrypted output will always be Z85 encoded and has the following
 format:
 .PP
-.Vb 7
+.Vb 9
 \& +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
 \& | Field         Size      Description                     |
 \& +\-\-\-\-\-\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
-\& | Hash        |     32 | Hash of the sender key id        |
+\& | Pubkey      |     32 | Publix key of the sender         |
+\& +\-\-\-\-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
+\& | Nonce       |     24 | Random Nonce                     |
 \& +\-\-\-\-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
 \& | Encrypted   |      ~ | The actual encrypted data        |
 \& +\-\-\-\-\-\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-|\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
--- a/man/pcp1.pod
+++ b/man/pcp1.pod
@@ -196,48 +196,24 @@ Each key can be identified using its B<keyid> which looks like this:
 0xD49119E85266509F

 A public key exported from a secret key will have the same keyid
-as the secret key. When using for encryption, the keyid will be
-added to the message so that the receiver knows who was the
-sender of the message (B<This might change in the future. As of
-this writing I'm not sure if this was a good idea>).
+as the secret key.

 If you just want to know details about a key or the vault, use the
 B<-t> option.

-=head2 Derived Public Keys
-
-In the real world you would not use your primary key to encrypt
-messages, because this would require to send the public key part
-to your recipient in one way or another. The much better and more
-secure way is to use a B<Derived Public Key>:
-
-Such a key will be dynamically generated from a hash of your
-primary secret key and the recipient (an email address, name or key id).
-The public part of this dynamic key will be exported and sent to
-the recipient. A public key generated this way will only be usable
-by the recipient (and yourself) and each recipient will have a different
-public key from you (and vice versa).
-
 =head1 ENCRYPTION

-There are 3 modi for encryption available in pcp1:
+There are 2 modes of encryption available in pcp1:

 =over

 =item B<Standard public key encryption>

 In this mode, which is the default, a public key as specified
-with B<-i> and the primary secret key will be used for encryption.
-The public key in question maybe a derived public key, which
-is transparent for the sender however.
-
-If you don't use derived keys, you will have to transfer
-the public key part of your primary keypair to the recipient,
-which is considered insecure if the transfer channel itself
-uses untrusted transports or if the transferred public key
-ends up on a public system (a shared server, a workstation
-at your employer or the like). You should avoid this encryption
-mode in such cases and use derived keys instead.
+with B<-i> and a dynamically generated secret key will be used
+for encryption. The public part of the generated sender key
+will be included with the encrypted file, which the recipient
+can use to decrypt it.

 Example command:

@@ -246,27 +222,6 @@ Example command:
 Here we didn't specify a recipient. Therefore the public
 key given with -i will be used directly.

-=item B<Derived public key encryption>
-
-Derived keys will be generated dynamically at runtime
-(see B<Derived Public Keys> above). Therefore an exported
-derived public key is unique for the sender AND recipient.
-
-This mode can be considered the most secure. If such a key
-gets lost (or into the wrong hands), only this specific
-communication channel will be compromised.
-
-Example command:
-
- pcp1 -e -r bobby@local -I message.txt -O cipher.z85
-
-We specified a recipient. pcp1 searches the vault for a
-matching public key and generates a derived keypair for
-encryption. You need to have a public key installed from
-the recipient anyway, it won't work without one. You may
-also specify a key id (-i) as well to make sure, the right
-key will be used for derivation.
-
 =item B<Self encryption mode>

 Pretty Curved Privacy doesn't provide symetric file encryption.
@@ -465,7 +420,9 @@ format:
 +---------------------------------------------------------+
 | Field         Size      Description                     |
 +-------------+--------+----------------------------------+
- | Hash        |     32 | Hash of the sender key id        |
+ | Pubkey      |     32 | Publix key of the sender         |
+ +-------------|--------|----------------------------------+
+ | Nonce       |     24 | Random Nonce                     |
 +-------------|--------|----------------------------------+
 | Encrypted   |      ~ | The actual encrypted data        |
 +-------------|--------|----------------------------------+
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.12.4 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994-2012 Free Software Foundation, Inc.
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
+# Makefile.in generated by automake 1.12.4 from Makefile.am.
 # @configure_input@

 # Copyright (C) 1994-2012 Free Software Foundation, Inc.
--- a/tests/bart.pub
+++ b/tests/bart.pub
@@ -3,33 +3,33 @@
        Cipher: CURVE25519-ED25519-SALSA20-POLY1305
         Owner: Bart
          Mail: bart@local
-        Key-ID: 0xC8F4F6CD7CA2E952
-    Public-Key: 0$E&2YLiH[z:PMtYIbvdU-$NKXb1&w(x#NxV2^/OzVx+q
- Creation Time: 2014-01-16T15:23:18
-      Checksum: 5B:FC:E9:D2:0E:6E:FB:84:8A:99:12:47:FA:03:F2:8A
-                AE:53:C1:53:C8:72:14:67:94:62:E5:74:4B:A2:D5:8D
- Serial Number: 0xA106090E
-   Key Version: 0x00000004
+        Key-ID: 0x45AE802C2C338179
+    Public-Key: 1aoiXG/sSsaV]E-WH/#GVl*Jh79V.&=rXRqkI05DzVx+q
+ Creation Time: 2014-01-19T19:23:33
+      Checksum: 1F:CC:95:EB:21:AD:44:9B:F2:5C:69:79:4D:C8:15:5E
+                FD:30:52:81:07:91:A8:1A:A1:3A:C5:DF:FE:E5:B4:20
+ Serial Number: 0x7F7EF76B
+   Key Version: 0x00000005
 Random Art ID: +----------------+
+                |      . +=.     |
+                |       .o++     |
+                |        ...o.   |
+                |       .   +    |
+                |        o . .   |
+                |         .      |
+                |                |
                |                |
-                |         o      |
-                |        =       |
-                |     . = .      |
-                |      * o o     |
-                |       B .      |
-                |      + .       |
-                |     .          |
                +----------------+

-0$E&2YLiH[z:PMtYIbvdU-$NKXb1&w(x#NxV2^/Oz^1n/BwNkv=*4z7QuGvvK{n*i>D=+in
-V8Enhd=ll{+s5Bo4PJ>E0gi*mD%z182VHzP>abuT=DNmVn3}L9Am#uS*46f5%d2S*gU?qk
-nv1C+k-+.#oc4-.K]z!d^xJeflt{Wzd/T()R^Xxi#YrK3^V@gUY>0<3yM&wyy!sq/N=D<K^
-7DrolX!PfT%4DsG48*iU7niLHTq71U=rV1a>Ppa2OhKqNIlgtB={n0TiN>z9/U0VSM/lu5=
-Zx)xGG.u>%IdCgpe>zpl]o*{Jy9twHqeeY:]PfQ2[I][p=0(05Q-<QMkxm(^{Da?CFB4fcb
-W)Qx*u)-8E>6GQTD?[qBXK3(E+Xpno1O6B6qk#ZkZfq:0vQTq0kX$vGvqC]]Rj-vK]h${+q
-%JFk{mfDHPv>*6}Kl9:hK-=OC7*(O3+(4x:w%D=mTLVl}CoQOYWi&sJ=/z}PSLM>&u4sO-j
-X8o-LyX!dlLRG*2+Trjywulk!0jsUgkucG}.u=TfJvv?FR.BG[ef/!Xe16NnXs8BNJV]!HX
-9pYT1AxBs[^=e(o7Duaf-@T%}&L3#fPqL8wNT7WU$sb/I}Vc!(kiW/EgOtKk=(}GqAxM{=q
-(Irvm[!YdZUd*Dx=[7^(JKl+}=Pn{0Uw5yU]*?MWu{ra.!K:6X3Ks.kB9?Yt*bX<-Y.-A.^
-OnMv>(f4[gi7t.]hBx>>lQrE@iw&L(0@@r308?CmrSAa11FD2a4GDFe
+1aoiXG/sSsaV]E-WH/#GVl*Jh79V.&=rXRqkI05Dz.ocVE}GuwKiCaY.FgW>a^1jBkLk!$S
+59:?6wqSA.A}WKBo4I-labfz?:bQ{Xo!NL6Z7tG/VWl0RuqnXn8JMO-?*q2cpK9Js:-Suoy
+4-lIi=B+y](bA0Jhd#4<</wSh<STTtlA4!-8U(o8g@M[.4UG?$OAG-epcCJcZmR5>[rlyvL
+A.Eo7)h>87eXC*WnPnq+sdYkvArnnKn[Z41{K>N#hvk#dFzzX:<M-5Q0kgX1n#>D1j(3=Xg
+e5dm.erB?!a)hbD7LQ7W7^KWuj/N-!u0K?FJs13#qsG.fdh4{N^A7UjZ/<FYBv{N0X7@8[p
+Yb@y/jH9qYEZ(K3PD!o-(:OS&]mjOz{+mVskifkWwCg=fvQTq0kX$vGvqC{4Dy$C3boBn80
+FflSbT=}szGExYLdEl8@e3G!s6RL)GSFgB&!m2P/T:a5UE0w:akZyskX>6pm.%tDa[Hu[!F
+Qgmf.%uzUT]doM3u+Rrku+ruq=VOHos/Dpdzv=Kf+<9ztlR8hwei{0q3WCMDTbkl0-c-xCU
+uk/a}6X<>CYLhz1#g5Ho2f[W<Cu3b%F[+0LT#h&0zvV>x{}L.CNdR$yyF^jSotPS@D.A&Y]
+@cq/t=y/(Q1>9bd7/P4a0Pe{s@4KxYc&48rN5=cz:b6B1^2=/DTigC4=MZipgg/qk<KUyy]
+3.6mBa=&JTh9<U<fFV0JlO*ITf/I8)0@@r308?O?b(^]B1+h0}yxatm
 ------ END PCP PUBLICKEY ------
--- a/tests/key-alicia-pub
+++ b/tests/key-alicia-pub
@@ -3,33 +3,33 @@
        Cipher: CURVE25519-ED25519-SALSA20-POLY1305
         Owner: Alicia
          Mail: alicia@local
-        Key-ID: 0xD65571D97AD62340
-    Public-Key: 1l04k^wOno{Gb/vuQ@vq^q=3h<mkwPg6au>[0lL#CMmZz
- Creation Time: 2014-01-16T15:23:17
-      Checksum: 74:02:7B:F0:14:A6:05:D4:01:C2:B1:65:8B:5A:97:97
-                CD:B6:8A:8F:32:A4:8C:40:B7:0C:28:C6:87:8D:28:F4
- Serial Number: 0x8F3E4F43
-   Key Version: 0x00000004
+        Key-ID: 0x7A96E7F11E3A92FC
+    Public-Key: 1n[zBNEfpry!7cdZ.k&Pv6[iPY=n94&{yiWjsb8Vg5}pO
+ Creation Time: 2014-01-19T19:23:31
+      Checksum: AD:C5:D4:D0:ED:4A:74:B3:C5:0D:3F:A3:F1:7F:41:38
+                07:FE:91:41:D0:43:29:89:E6:23:42:9D:FD:3F:E0:0B
+ Serial Number: 0xCCFEA718
+   Key Version: 0x00000005
 Random Art ID: +----------------+
                |                |
                |                |
-                |        .       |
-                | .     + .      |
-                |. . . o + .     |
-                |.  . o o +      |
-                |. . . o . .     |
-                | . .            |
+                |            .   |
+                |       .   + +  |
+                |        o o + . |
+                |         o   .  |
+                |       .. ..  . |
+                |       .o...o.  |
                +----------------+

-1l04k^wOno{Gb/vuQ@vq^q=3h<mkwPg6au>[0lL#C*QCMc(0^V-{1V339HHb]:?T-F)}&&A
-n::om#4.IaWG{Uv}/uKG.c8VB$!TzGR$o(cxJ{Wd[.in&DkPZwBPVu>Yt>Q?TU0jq1P&y-K
-t/R).!(vf5jS6&8Vlf6*p7rKi767MvB=*-:sDy+NxI}(gG2=]pCV%d1$n.lFFa]t7J9PQ{3
->nZHNW0l(Srib%(INR!w.l^?}r=cq3DHlTj-FmkGd67@S@!41d^bV1OE}FbEfz/@?r3-@.4
-=YJ!]6Tf6Vu@bJ{c@zCJje:(y<ZEZb7a@NQ+u]}5Ra?Ju]c&4F2&:wwK+J8nJB9jxeltbaO
-GdZ]3(nlOZHdz9(T6(c:qo*#Tptw}.g5vBdWEL^W!2TDGvqGT/x<<nyz!0i(05/!N67=rFb
-2b<&j{YVd=aOHgnOC:.>0a+@pZ{MOW<nj?(nu=<hYeeSCYhp7mC#a@omS.>[-CpCHShNBOA
-:PxEvD^xauUrzZ9QvB7Fl2OM1h&FzWJ9m&S$7!eNnfJO2>oBH7iua7k@EZ=.RqE3HV9BAc9
-v+0{hpfRAA8@K]nwPMhI}eVPa(fRtZ@3?ugeUfyRd]^bYQ[?n>HxuuKLJTVrxpuf*ARnTLd
-Zj[O(>.7/g*mhTAqV-waQ8OG*?xR7W#/-SU=Zr$E>R:!c%8i2qF0>k>:E{Pb1ekc3ABHu0q
-xN3y9/NdE5hz)uJf*[2Xk$0Q^gC*==0@@r308?Cmrr9101DL-xlJv8^
+1n[zBNEfpry!7cdZ.k&Pv6[iPY=n94&{yiWjsb8VgdNhhTxXVw5cnTb]M0-6nTf^K.(d@!n
+TVN6*2tAUi6?v{v}/uK5^*HKF)IKEgT+S>q0W]YxirTdE=?ii@{0![FQdK%A+>?P+iClzgO
+<.SQvl%)J?Q2e1re#c}=S$5d+fWWaSH=q{6GZ1RO}4Hctjh1!2FCHPJ<&C/K5{OUI6q6mFf
+0EGB:2Ga5fG[y^]7+!cTG9SX:AWy326yHW>Dn?U0(C:y$VPS8Da=&mMR?g#009J7GM/D*3M
+O>zfA2hXl1E-40VfMaKi@Z{x[@?Yjd)e[GEfWH{L!G.9YNmLi=Gxrpf@DqWT(@72t?EH+A1
+xL354SJYBI255Srl.e@r*6[2v]4)p:7NQNyd&Ne<s/)V0vqGT/x<<nyz!0i(0l&]nLf][7D
+jCE<)<us83^Tdlelq8k1mI=yV=sjNA+GorXg5jc)UV{MLO1T{Ek&b^Yo7tCeHhfU?>/#l>O
+pWn5D0HM&LLtadF#m2ohYM4QvHu/3oKBRPbv/W>Pc@7uiqgtV&vry9yj!<N)U!jUgo{}oV4
+(O=PayFEu[Q4Ml9%J[BaLUrJl)I=4f<bwFWzyd[j?*A{J5@W]0=.zA0:zn>O(V=r(>02Hb7
+0m=jGmNwwn]8H.V+LOqg.SJNHxy4tJuP>I^<u^ht[IoJRH-9ayjfP7d4Fux%d0q.BwXAJ(u
+Q^]5Isb.hVk@*?(h+2IRmkEj&gdBRh0@@r308?O?bldYz1<D$z7YTKo
 ------ END PCP PUBLICKEY ------
--- a/tests/key-alicia-sec
+++ b/tests/key-alicia-sec
@@ -1,24 +1,24 @@
 ----- BEGIN PCP SECRET KEY -----
  Generated by: Pretty Curved Privacy Version 0.1.5
        Cipher: CURVE25519-ED25519-SALSA20-POLY1305
-        Key-ID: 0xD65571D97AD62340
- Creation Time: 2014-01-16T15:23:17
- Serial Number: 0x8F3E4F43
-   Key Version: 0x00000004
+        Key-ID: 0x7A96E7F11E3A92FC
+ Creation Time: 2014-01-19T19:23:31
+ Serial Number: 0xCCFEA718
+   Key Version: 0x00000005

-1l04k^wOno{Gb/vuQ@vq^q=3h<mkwPg6au>[0lL#CMuQ#cM6#o=Cetrqd&M@k[wLIgQ)#yy
-FdX9Mt2yIHTy3-c(0^V-{1V339HHb]:?T-F)}&&An::om#4.IaPQR]MAb/t+lzt.C!%=x:4
-mxD:gyP!x4DGUAM%4iVFMT@n/4W77]e0FJ3hgYClFiapHmY.NuDkO2*G3jIi2mlIj]]%ePl
-9#>r&w-u2Z@vA@C*hWyx16^t6JYORCl>hxTtsE(}ze>:.bxI0ybM]Klcam&uV0QLrJfBPB?
-0cQx<ArcEhY=G$Z7j//$N3S.H$0%fA4-7!fgcd8LsD]i}?7Eq>Kv}/uKG.c8VB$!TzGR$o(
-cxJ{Wd[.in&DkPZwBPVu>Yt>Q?TU0jq1P&y-Kt/R).!(vf5jS6&8Vlf6*p7rKi767MvB=*-
-:sDy+NxI}(gG2=]pCV%d1$n.lFFa]t7J9PQ{3>nZHNW0l(Srib%(INR!w.l^?}r=cq3DHlT
-j-FmkGd67@S@!41d^bV1OE}FbEfz/@?r3-@.4=YJ!]6Tf6Vu@bJ{c@zCJje:(y<ZEZb7a@N
-Q+u]}5Ra?Ju]c&4F2&:wwK+J8nJB9jxeltbaOGdZ]3(nlOZHdz9(T6(c:qo*#Tptw}.g5vB
-dWEL^W!2TDGvqGT/x<<nyz!0i(05/!N67=rFb2b<&j{YVd=aOHgnOC:.>0a+@pZ{MOW<nj?
-(nu=<hYeeSCYhp7mC#a@omS.>[-CpCHShNBOA:PxEvD^xauUrzZ9QvB7Fl2OM1h&FzWJ9m&
-S$7!eNnfJO2>oBH7iua7k@EZ=.RqE3HV9BAc9v+0{hpfRAA8@K]nwPMhI}eVPa(fRtZ@3?u
-geUfyRd]^bYQ[?n>HxuuKLJTVrxpuf*ARnTLdZj[O(>.7/g*mhTAqV-waQ8OG*?xR7W#/-S
-U=Zr$E>R:!c%8i2qF0>k>:E{Pb1ekc3ABHu0qxN3y9/NdE5hz)uJf*[2Xk$0Q^gC*==0rr9
-108?Cmrr9101DL-xlJv8^
+1n[zBNEfpry!7cdZ.k&Pv6[iPY=n94&{yiWjsb8Vg5$AFEex!FCg:*!MZM2:]1?OT=rLN0B
+QjDJl0STiIBSJkTxXVw5cnTb]M0-6nTf^K.(d@!nTVN6*2tAUh#]W0HJSi([7./}.>l)wiv
+yjfR#pMyTD><L}{!X[s*R2^OvdYBGxYT07YW9dHY<YQfu[#c/>k+T:j>J4xnmv]<v*t-@Yk
+)S9#FUZEhaVJi&!Ps3Rt^UuVjN.o)m6#3=1hrRjyw:+qrJ%[BFCUx$c3#}kuL#.:Mx[?NaV
+W..rw??4ZP>OLCX+7Yyz6qs^3mOnOcC83p#Ku+R(JuN?P!poAGy1sfhser2olC!Oz]}VRz9
+zWroSz-IE!wxavQ*^b:<v}/uK5^*HKF)IKEgT+S>q0W]YxirTdE=?ii@{0![FQdK%A+>?P+
+iClzgO<.SQvl%)J?Q2e1re#c}=S$5d+fWWaSH=q{6GZ1RO}4Hctjh1!2FCHPJ<&C/K5{OUI
+6q6mFf0EGB:2Ga5fG[y^]7+!cTG9SX:AWy326yHW>Dn?U0(C:y$VPS8Da=&mMR?g#009J7G
+M/D*3MO>zfA2hXl1E-40VfMaKi@Z{x[@?Yjd)e[GEfWH{L!G.9YNmLi=Gxrpf@DqWT(@72t
+?EH+A1xL354SJYBI255Srl.e@r*6[2v]4)p:7NQNyd&Ne<s/)V0vqGT/x<<nyz!0i(0l&]n
+Lf][7DjCE<)<us83^Tdlelq8k1mI=yV=sjNA+GorXg5jc)UV{MLO1T{Ek&b^Yo7tCeHhfU?
+>/#l>OpWn5D0HM&LLtadF#m2ohYM4QvHu/3oKBRPbv/W>Pc@7uiqgtV&vry9yj!<N)U!jUg
+o{}oV4(O=PayFEu[Q4Ml9%J[BaLUrJl)I=4f<bwFWzyd[j?*A{J5@W]0=.zA0:zn>O(V=r(
+>02Hb70m=jGmNwwn]8H.V+LOqg.SJNHxy4tJuP>I^<u^ht[IoJRH-9ayjfP7d4Fux%d0q.B
+wXAJ(uQ^]5Isb.hVk@*?(h+2IRmkEj&gdBRh0rr9108?O?bldYz1<D$z7YTKo
 ------ END PCP SECRET KEY ------
--- a/tests/key-bobby-pub
+++ b/tests/key-bobby-pub
@@ -3,33 +3,33 @@
        Cipher: CURVE25519-ED25519-SALSA20-POLY1305
         Owner: Bobby
          Mail: bobby@local
-        Key-ID: 0x7B8D298F82FE30FB
-    Public-Key: 1kwx=)3f<[z$G%dAyqGMDHiU1fk1E?ff{Beb>:DK0@@r3
- Creation Time: 2014-01-16T15:23:17
-      Checksum: 55:8C:D5:F8:E2:AD:BE:10:AA:AC:AD:21:DA:7D:57:37
-                49:82:60:BC:8E:9F:D5:E0:89:4E:E7:75:D7:9A:9F:A8
- Serial Number: 0x3B7D8E3F
-   Key Version: 0x00000004
+        Key-ID: 0x78FBD073AC12DDDC
+    Public-Key: 1b<gU0**5$gt!t!wgWFdf&M^*>a4nW:2}m/2#.BaEGfuF
+ Creation Time: 2014-01-19T19:23:32
+      Checksum: 0C:49:17:C1:B7:E5:85:C0:17:C5:00:93:8F:8F:62:D9
+                DF:3A:25:00:3D:75:53:30:F7:61:77:D8:04:75:95:79
+ Serial Number: 0xE7096F3B
+   Key Version: 0x00000005
 Random Art ID: +----------------+
-                |       .+       |
-                |       . o      |
-                |        . o     |
-                |     . o =      |
-                |      o * .     |
-                |     . . o .    |
-                |      . . .     |
                |                |
+                |                |
+                |                |
+                |   .            |
+                |. o     .       |
+                |=+     . .      |
+                |=...  . .       |
+                |+oo...          |
                +----------------+

-1kwx=)3f<[z$G%dAyqGMDHiU1fk1E?ff{Beb>:DK15!qzj6cEirtl35VdQ}BQhLydYBFCg*
-#GBSMN^epAyaOMvTd%73M89n2/5.rZOH7OF@!B{[Jb@BvX9w*a<MkU-TQO>XO/{9s?exp-9
-OzK-yHrV<xc@&<i{{35Qnvr8>dU?%8AT#AQ^rrh*C95bQ[AVPDXrRKO=lpG(SdPX4:a{h5o
-*t:0(Gnp4^NPQd6QJL*lV1JESB]mgmgjUi:gUSAndW+#$<8LRXs@n%fl1nXS7:<9lA[CG@S
-gBsXD%RxN*D(Dr$rfC04o[.X+I2SIUYl%%Tt2]JE0ZL]?@-#H/*<1}ryDnAy$JOg*f)W@NG
-DmA}6k-4cY}iV.V@P2.>=z=!c@Yx1Y9Ua75=N/U$SCJrYvSbZ+C%Dg:v{%fN4P)[jlU-gmX
-{OJIYv^N*?%t%}/[3PE.FX*H(VIo?}PJcq+QieKd38Gs0L90V3?TsI*Wu!-OQTI6D!t%^/z
-Zv8hJb.:E9F0/waiAxn{hxN=?k)Ou:$<()SO<0O=*!S^[3tZF7l=s(JrG0Xr@?f]vPHci&s
-YGbjDjhoA[4yT/8NtGhdbw]Nvv1<J(69h[5L[!9!O6I>G66F-n/5=Rom.{Ks00<+F:U!q&4
-RFG*{^Hc}Luey1Cm4uI[UO9&%0NkoMzQ4%71!!>CMCzF}l=JeKCt]aL=tFsqLC2?+1K8le8
-F/MEHJxk6rlo4v*ixfF/gdBX*fH!we0@@r308?Cmrr9101uR3(kl7V-
+1b<gU0**5$gt!t!wgWFdf&M^*>a4nW:2}m/2#.BaEXyru9j:4^XIqQxg=Tm&LeTZ(51V}<D
+6nXr@XUjc@x+BivTd}YxlZ{L5%Y!Fn<Iy5OKr2ggb$c{o6m?&kjX/+ej2:[Ue.DyXcS([71
+8.mK53+.U2@qG^Orz=[ia6/@ZnbZw.3dc*}O?#c$}1Hbz6GWlS2Pi1n!A}cN90gr%x)PTAG
+H<?0r]XroN}2DZ1}Sy{Iq4-EZ#!!m7qP6eVoR5]uFuvdN-JF[yKQmel=WwP={k3M9ld0-Jw
+^qOi/7D}j0OdjWoP&+!AxX/WvAH/@E==o=eGGFbZ{2]6@:l-7x!3<#DBN@H:+f&k[k]xUWQ
+c>oDChh8:)f3u=mfllncCgQVts^T51hI^npVwG2}7<6=wvSbZ+C%Dg:v{%fNmL[ll:HHLoy
+6A1]YW7%}EOh30uA/cj>>B!@sJJQAvfLr&FS)5oP6^Y7-m1Bb.&y>([?Hjnj9wR7{5<-TN<
+[L{&wnaea#]IvQH=jlAbwqgDDo(W3Z{w/Rp:F3e?/IJ5fAqrtBPxnD%nt<]ciz1QxqVyE}G
+}Dde)ZodMjXJm8SDdf^Pbl=HEtlWvjRbSUv%w=&wD1xwMZOZO0[jcOL!FQS94:YV4bDp+h{
+iy[iM)e4pz44wWZbma:{HVATQ<MZulGZ/-u#?bBEJzJ55ohjGeb7uAGhh*.cTmy/kY5VL%:
+kice&G$6Mgi7uk5fGg^NlOQt:l{%xx0@@r308?O?bME/A1)lhgi@/lX
 ------ END PCP PUBLICKEY ------
--- a/tests/key-bobby-sec
+++ b/tests/key-bobby-sec
@@ -1,24 +1,24 @@
 ----- BEGIN PCP SECRET KEY -----
  Generated by: Pretty Curved Privacy Version 0.1.5
        Cipher: CURVE25519-ED25519-SALSA20-POLY1305
-        Key-ID: 0x7B8D298F82FE30FB
- Creation Time: 2014-01-16T15:23:17
- Serial Number: 0x3B7D8E3F
-   Key Version: 0x00000004
+        Key-ID: 0x78FBD073AC12DDDC
+ Creation Time: 2014-01-19T19:23:32
+ Serial Number: 0xE7096F3B
+   Key Version: 0x00000005

-1kwx=)3f<[z$G%dAyqGMDHiU1fk1E?ff{Beb>:DK0%0RsA}*LOS&hj!ynJ^EAY<xad!haKo
-%$Eca%S{rvP8wJj6cEirtl35VdQ}BQhLydYBFCg*#GBSMN^epAr9{wwvYK0DpU.5D6qH[(L
-ZQ-/e>yY=DvfJIg<b3w*Xw$*)&j3+3Y?KFXrk+u?Dwe!8c8R)a}<#BGMP%JXC=Co9n1?=h=
-0TgVTk8fz5(b25jFQPIF/F%mYpe@%e#U7JFmq6?MS!Kqh?+y8nyYnlv/PZp5NF]KiQueJn?
-.[STEe)1kJhbqY-=FlSV>g<Sc6BE%dl}Lwc(SuadkpClna{D&!cvTd%73M89n2/5.rZOH7O
-F@!B{[Jb@BvX9w*a<MkU-TQO>XO/{9s?exp-9OzK-yHrV<xc@&<i{{35Qnvr8>dU?%8AT#A
-Q^rrh*C95bQ[AVPDXrRKO=lpG(SdPX4:a{h5o*t:0(Gnp4^NPQd6QJL*lV1JESB]mgmgjUi
-:gUSAndW+#$<8LRXs@n%fl1nXS7:<9lA[CG@SgBsXD%RxN*D(Dr$rfC04o[.X+I2SIUYl%%
-Tt2]JE0ZL]?@-#H/*<1}ryDnAy$JOg*f)W@NGDmA}6k-4cY}iV.V@P2.>=z=!c@Yx1Y9Ua7
-5=N/U$SCJrYvSbZ+C%Dg:v{%fN4P)[jlU-gmX{OJIYv^N*?%t%}/[3PE.FX*H(VIo?}PJcq
-+QieKd38Gs0L90V3?TsI*Wu!-OQTI6D!t%^/zZv8hJb.:E9F0/waiAxn{hxN=?k)Ou:$<()
-SO<0O=*!S^[3tZF7l=s(JrG0Xr@?f]vPHci&sYGbjDjhoA[4yT/8NtGhdbw]Nvv1<J(69h[
-5L[!9!O6I>G66F-n/5=Rom.{Ks00<+F:U!q&4RFG*{^Hc}Luey1Cm4uI[UO9&%0NkoMzQ4%
-71!!>CMCzF}l=JeKCt]aL=tFsqLC2?+1K8le8F/MEHJxk6rlo4v*ixfF/gdBX*fH!we0SSi
-208?Cmrr9101uR3(kl7V-
+1b<gU0**5$gt!t!wgWFdf&M^*>a4nW:2}m/2#.BaEGl0DiD2X?@5RUgq-[h9CpS]OkY15{-
+5#<Mnw^-S[1BpW9j:4^XIqQxg=Tm&LeTZ(51V}<D6nXr@XUjc@qYw%6C!y/4+iAwyE/VA3Q
+kc%[OHQ8e]b9PlrMvO{galf[8)XHJjReb?3Y*9r<^.VT4MsfGAX6$rW/^]m=n?LN{?EiJ1-
+9&K5&{HDl/zf5qWq<A{j}@b=:dg80t804D!z>NM>dr-nYl0ARaDKhcHl(Uq&=.p]3Epnib6
+/Y8qz[2B{)W>M<o{)GgM6ywEt!M*3E9)=XPd79YW(]:6FG4ysL7QWQ:ARZKd*5@O}Uhf1*J
+Y/}b.LB!!=+D.*kcphSWvTd}YxlZ{L5%Y!Fn<Iy5OKr2ggb$c{o6m?&kjX/+ej2:[Ue.DyX
+cS([718.mK53+.U2@qG^Orz=[ia6/@ZnbZw.3dc*}O?#c$}1Hbz6GWlS2Pi1n!A}cN90gr%
+x)PTAGH<?0r]XroN}2DZ1}Sy{Iq4-EZ#!!m7qP6eVoR5]uFuvdN-JF[yKQmel=WwP={k3M9
+ld0-Jw^qOi/7D}j0OdjWoP&+!AxX/WvAH/@E==o=eGGFbZ{2]6@:l-7x!3<#DBN@H:+f&k[
+k]xUWQc>oDChh8:)f3u=mfllncCgQVts^T51hI^npVwG2}7<6=wvSbZ+C%Dg:v{%fNmL[ll
+:HHLoy6A1]YW7%}EOh30uA/cj>>B!@sJJQAvfLr&FS)5oP6^Y7-m1Bb.&y>([?Hjnj9wR7{
+5<-TN<[L{&wnaea#]IvQH=jlAbwqgDDo(W3Z{w/Rp:F3e?/IJ5fAqrtBPxnD%nt<]ciz1Qx
+qVyE}G}Dde)ZodMjXJm8SDdf^Pbl=HEtlWvjRbSUv%w=&wD1xwMZOZO0[jcOL!FQS94:YV4
+bDp+h{iy[iM)e4pz44wWZbma:{HVATQ<MZulGZ/-u#?bBEJzJ55ohjGeb7uAGhh*.cTmy/k
+Y5VL%:kice&G$6Mgi7uk5fGg^NlOQt:l{%xx0SSi208?O?bME/A1)lhgi@/lX
 ------ END PCP SECRET KEY ------
--- a/tests/keys.cfg
+++ b/tests/keys.cfg
@@ -1,6 +1,6 @@
-bartid = 0xC8F4F6CD7CA2E952
-bartserial = 0xA106090E
-idbobby  = 0x7B8D298F82FE30FB
-idalicia = 0xD65571D97AD62340
+bartid = 0x45AE802C2C338179
+bartserial = 0x7F7EF76B
+idbobby  = 0x78FBD073AC12DDDC
+idalicia = 0x7A96E7F11E3A92FC
 mailbobby = bobby@local
 mailalicia = alicia@local
--- a/tests/static.h
+++ b/tests/static.h
@@ -1,33 +1,33 @@
 size_t secret_a_len = 32;
 unsigned char secret_a[32] = {
-0x90, 0x14, 0xe7, 0xb5, 0x90, 0x04, 0x4f, 0xc0, 
-0xc6, 0xdf, 0x87, 0xe6, 0xbd, 0x87, 0xc8, 0x56, 
-0x64, 0x07, 0xfb, 0xb3, 0x3a, 0x25, 0x7c, 0xb9, 
-0x3f, 0xbc, 0x04, 0xd1, 0xd2, 0x2a, 0x56, 0x4e
+0x28, 0xad, 0x6c, 0x7d, 0x37, 0x6b, 0xf9, 0x83, 
+0x9f, 0x0b, 0x95, 0xff, 0xd5, 0xbc, 0x56, 0x7e, 
+0x81, 0xa3, 0x11, 0x75, 0x3f, 0x94, 0x31, 0xb9, 
+0x98, 0x04, 0x81, 0xe3, 0xa4, 0xfd, 0xdb, 0x55
 };

 size_t public_a_len = 32;
 unsigned char public_a[32] = {
-0x55, 0xfd, 0x89, 0xe6, 0xbd, 0x57, 0x49, 0x4b, 
-0x24, 0xaf, 0x07, 0x07, 0x81, 0xd7, 0x82, 0x8b, 
-0x33, 0x80, 0x60, 0x08, 0xf9, 0x56, 0xe2, 0x04, 
-0xe3, 0x1c, 0xf7, 0x5b, 0x1e, 0x1c, 0x74, 0x3d
+0x0c, 0x32, 0x80, 0xd9, 0xc5, 0x72, 0xd5, 0x3d, 
+0x22, 0x25, 0x92, 0x8a, 0x46, 0xab, 0xe3, 0x88, 
+0x71, 0x30, 0x48, 0x1a, 0xa1, 0x47, 0x36, 0xe9, 
+0xba, 0x7f, 0x58, 0x97, 0x7c, 0x69, 0xe3, 0x72
 };

 size_t secret_b_len = 32;
 unsigned char secret_b[32] = {
-0x30, 0x4c, 0xaf, 0xb4, 0x6f, 0x09, 0x17, 0xa7, 
-0x9a, 0x2d, 0xe3, 0xa8, 0x56, 0xff, 0x13, 0xac, 
-0xbc, 0xc7, 0xa2, 0x56, 0x5d, 0xfd, 0x39, 0x88, 
-0x1b, 0xe0, 0xaa, 0x85, 0xfe, 0x15, 0xba, 0x40
+0x50, 0xf3, 0xa8, 0xb4, 0x3b, 0xbb, 0x83, 0x75, 
+0x81, 0x50, 0xb2, 0x51, 0x2b, 0xcd, 0xce, 0x63, 
+0x96, 0x6e, 0xbe, 0x6a, 0x91, 0x39, 0xf2, 0x3f, 
+0x70, 0xe1, 0x72, 0xdf, 0xac, 0xf4, 0xe7, 0x61
 };

 size_t public_b_len = 32;
 unsigned char public_b[32] = {
-0xcb, 0x8b, 0x3e, 0x3f, 0xca, 0xff, 0x0d, 0xdd, 
-0x6c, 0xe3, 0xc9, 0x28, 0x2c, 0xe8, 0x06, 0x94, 
-0xc5, 0x63, 0x63, 0xa0, 0x66, 0x85, 0x28, 0x72, 
-0x5a, 0x5b, 0xff, 0x5f, 0x06, 0xa1, 0xa4, 0x69
+0x4e, 0x47, 0x89, 0x91, 0x2f, 0x69, 0x30, 0x6c, 
+0x0f, 0x0d, 0xf3, 0xb6, 0xa5, 0x52, 0xe1, 0xff, 
+0x55, 0x8d, 0x2e, 0x52, 0x88, 0x58, 0x60, 0x6a, 
+0x0f, 0x19, 0x40, 0xf1, 0x0d, 0xa1, 0xe9, 0x30
 };

 size_t message_len = 12;
@@ -38,16 +38,16 @@ unsigned char message[12] = {

 size_t nonce_len = 24;
 unsigned char nonce[24] = {
-0xa9, 0x22, 0x83, 0x39, 0x47, 0x80, 0x30, 0x04, 
-0x37, 0x38, 0xd0, 0x34, 0x97, 0x6c, 0x52, 0x8e, 
-0x6a, 0xe3, 0xcd, 0x4c, 0x8d, 0xdd, 0x74, 0x5a
+0xc6, 0x26, 0x8c, 0xa8, 0x17, 0xb3, 0xb4, 0x99, 
+0x14, 0x12, 0x30, 0xd1, 0x11, 0x93, 0x36, 0x09, 
+0xe0, 0xb7, 0x3f, 0x16, 0xe0, 0xd1, 0x0c, 0x0d
 };

 size_t cipher_len = 28;
 unsigned char cipher[28] = {
-0x2a, 0x93, 0x39, 0x8d, 0x84, 0x69, 0x99, 0x5d, 
-0x61, 0x9c, 0x19, 0x80, 0x2f, 0x18, 0x16, 0x38, 
-0x5c, 0x1d, 0x08, 0x5e, 0xcc, 0xed, 0xed, 0x48, 
-0xe8, 0x0d, 0x47, 0x92
+0x90, 0x9d, 0x75, 0xfb, 0xb2, 0xb1, 0x8b, 0x3e, 
+0x39, 0x56, 0xd3, 0x4a, 0x69, 0x52, 0xf8, 0x2f, 
+0x12, 0xb2, 0x4e, 0x32, 0x3f, 0x4e, 0xa4, 0x45, 
+0xb6, 0x5d, 0x16, 0x80
 };

--- a/tests/unittests.cfg
+++ b/tests/unittests.cfg
@@ -174,7 +174,7 @@ dxmorg@florida.cops.gov

  <test check-crypto-bobby-decrypt>
    cmd = $pcp -V vb -d -O testdecrypted -I testencrypted -x b
-    expect = /from ${idalicia} successfully/
+    expect = /successfully/
  </test>

  <test check-crypto-alicia-encrypted-file>
@@ -183,51 +183,6 @@ dxmorg@florida.cops.gov
  </test>
 </test>

-#
-# same, now with derived keys, keypairs:
-# alicia                       bobby
-# secret: derived for bobby    secret:primary
-# bobby's public: primary      alicia's public: derived for him
-#
-# derived by name
-<test check-dcrypto-init>
-  <test check-dcrypto-alicia-export-derived-byname>
-    cmd = $pcp -V va -p -r Bobby -x a -O testpub-forbobby-name
-    expect-file = testpub-forbobby-name
-  </test>
-  <test check-dcrypto-bobby-import-byname>
-    cmd = $pcp -V vb -P -I testpub-forbobby-name
-    expect = /added/
-  </test>
-  <test check-dcrypto-bobby-encrypt-byname>
-    id = grep Key-ID testpub-forbobby-name | sed 's/^        //g' | cut -d' ' -f2
-    cmd = $pcp -V vb -e -i %{id} -I testmessage -O testencrypted-name -x b
-    expect = /success/
-  </test>
-  <test check-dcrypto-alicia-decrypt-byname>
-    cmd = $pcp -V va -d -I testencrypted-name -x a
-    expect = /success/
-  </test>
-
-  # repeat, but now use derived keys in both directions
-  <test check-dcrypto-bobby-export-derived-byname>
-    cmd = $pcp -V vb -p -r Alicia -x b -O testpub-foralicia-name
-    expect-file = testpub-foralicia-name
-  </test>
-  <test check-dcrypto-alicia-import-byname>
-    cmd = $pcp -V va -P -I testpub-foralicia-name
-    expect = /added/
-  </test>
-  <test check-dcrypto-bobby-encrypt-byname-both>
-    id = grep Key-ID testpub-forbobby-name | sed 's/^        //g' | cut -d' ' -f2
-    cmd = $pcp -V vb -e -i %{id} -I testmessage -O testencrypted-name -x b -r Alicia
-    expect = /success/
-  </test>
-  <test check-dcrypto-alicia-decrypt-byname-both>
-    cmd = $pcp -V va -d -I testencrypted-name -x a
-    expect = /success/
-  </test>
-</test>

 #
 # check usage of unencrypted secret key
--- a/tests/unknown1
+++ b/tests/unknown1
@@ -1,11 +1,11 @@
-0#B%]Dwej74e/:?9?y.aITSgR{crR@K+V$MjQlZ966qVbxJ8Iq6t9[)!LtTh+=iGlR$sQ=Z
-V)5}WAU!I+Uz>-zddr)0i.<!3HpEIvt9mNUT?dI(<H1RnUCQ&cAE=r(z3I6!KACU=pKmGT8
-4})FO7^FOnvE=D%4cSfRQlO@)]JUn#sMKF*t3w0hk0P^2iZc=8+poK^woRlu#P#C=T:sjT8
-rKmSx6SBHzL3a]eC$ec&J3Pr){EZI!Tjc$z@CrPpph+ZeI0n?xKH2e2ZOschWU!FiN}VQg-
-RfeA&V*NZmYNC7q(0yl)vI&NYdMyi@20?E{i(FCmO^:sQqJJ)e2GiY/!0G5u.a/ct#dCa2%
-?ZNTaM1f>k7kjJ$d)?6#]Xt<g[BXJxw{p$z0JB)<M!tSmzFrW0vqYQvy&r/(yYC}?6Ng#3[
-{6!c{4A1>S?0Jg5kMaRF+3lq!^9Ta&N=m9WBqzPbMS?V0(38RI&lUz3>u=Ex97bV1>GG?:]
-}!Wbl7/[QLx>d}1abB&&<Q<.*>28d>en{+a9]MVP5&$R)a[q]H1V[aamjBARL>^13Q1[*sT
-3bj+$9qrZc5cp0v}XUdX1TNw*M$^N%(+=4mG7OSBdo>[jq$-VH24T20B-k1ASX]0jm{@U}p
-BI^@GeGfA.-HM9MR4ruqFJsMZEL7bb9&:gSmzqX*L4WF-rq=Iad-2%lN1iG3ZRmi>Z?+/2
-}euk/J3OA.lp0vXl]WK[g=mlLi5Aq?0@@r308?CmrSAa11w$96fAq7M
+1fqYjUMAgr%2@iuii(D6ORTB?v(#o}0-]/?noP(Cu>@:wrG!(hj%NXd(>&p{kTvPy:Fh%J[
+4Qog7Dc3!/Ilc(zddr)0l]IzRC9e9N-I-cH2Pvg5=xGaV%0x0Jm=?KlJ/IxMB/fJxxlCJ}*
+E@rCfTDUlX0SE:-<h?T@fBHl5:O?2-B#/!pxanEZI2l9@mW{.!HQVD7C5$SMnz#zWkeg0J$
+pDyz^Oa1^3(z{leQP+SXJC+]:[3O}-<B0jI7nm$yVh=:ch/mT1Q[DP]PqHoXE)xzaB[UyQH
+tsI*%r^uK5<<A@#dTA&8Frn+CY/w*qVBJH1qnn6Tv7PP%$c{EET!0jh^dUJp@Syoyk^uzaR
+*Q9SWY^*H@X*=em^I^5uulJ#)M&z4)?syLpdN#S0f2wq}zFrW0vqYQvy&r/(yYF@:7$[by]
+rf[{>97Lcp2dWcQ5@<OmWCOpm@M.hB}zmanaJj27V<TilxIgH{#Vc:YsP.-{d3Fp!?>U?0c
+9@rbY)(/I.=TH5d178sKFH7UvFpIhwP8w?UHM21-uxbJ}I45(zIN=kdftEhh#lzq@!#X/YQ
+LJyRVsb8Zg7oTfPe0e1cEX?cPLOo:Kb}NtGC0ZYypu:[=ft37EcvY1FiOJW3wKzefr6QtC3
+.rpBO?&I!F+z10[hcITb9i]DgWegaluND+y1ZOwbuK^^C@pgqBu+>o5un3/]FT/+O:p&xz}
+5}{ooTKsQFh9<R/mkm7%gCy^Rmme)i0@@r308?O?cia2C1-7F)/z>)K
--- a/tests/unknown2
+++ b/tests/unknown2
@@ -1,15 +1,15 @@
-0#B%]Dwej74e/:?9?y.aITSgR{crR@K+V$MjQlZ95=?<i*oFB8f9yBYg-?8mKwjQXxBo)CF
-iV0]r<^JNSPDV[xJ8Iq6t9[)!LtTh+=iGlR$sQ=ZV)5}WAU!I+M6SKV?c:3JEK.G/JUkr9z
-tpfp6[rQo##w^BMRG.i%s{z.!8aU]^h&n!$pBg6O71S>FMZ@3N)}@q>9*ti}7y<iyZR)CL4
-BO?IlYCy:k!k:rV.*7Z<WVxGyTvoD92W8<!3fo+>O=(48NJgpb^7t>]C/O9l9K7+lS%&5j1
-7EG+Z*vWp*Do[aBBeI$J6H%TH(EfMJ#bxiKf-rZE1qlEpQ98piVzddr)0i.<!3HpEIvt9mN
-UT?dI(<H1RnUCQ&cAE=r(z3I6!KACU=pKmGT84})FO7^FOnvE=D%4cSfRQlO@)]JUn#sMKF
-*t3w0hk0P^2iZc=8+poK^woRlu#P#C=T:sjT8rKmSx6SBHzL3a]eC$ec&J3Pr){EZI!Tjc$
-z@CrPpph+ZeI0n?xKH2e2ZOschWU!FiN}VQg-RfeA&V*NZmYNC7q(0yl)vI&NYdMyi@20?E
-{i(FCmO^:sQqJJ)e2GiY/!0G5u.a/ct#dCa2%?ZNTaM1f>k7kjJ$d)?6#]Xt<g[BXJxw{p$
-z0JB)<M!tSmzFrW0vqYQvy&r/(yYC}?6Ng#3[{6!c{4A1>S?0Jg5kMaRF+3lq!^9Ta&N=m9
-WBqzPbMS?V0(38RI&lUz3>u=Ex97bV1>GG?:]}!Wbl7/[QLx>d}1abB&&<Q<.*>28d>en{+
-a9]MVP5&$R)a[q]H1V[aamjBARL>^13Q1[*sT3bj+$9qrZc5cp0v}XUdX1TNw*M$^N%(+=4
-mG7OSBdo>[jq$-VH24T20B-k1ASX]0jm{@U}p-BI^@GeGfA.-HM9MR4ruqFJsMZEL7bb9&:
-gSmzqX*L4WF-rq=Iad-2%lN1iG3ZRmi>Z?+/2}euk/J3OA.lp0vXl]WK[g=mlLi5Aq?0SSi
-208?CmrSAa11w$96fAq7M
+1fqYjUMAgr%2@iuii(D6ORTB?v(#o}0-]/?noP(Cu&XQ9^]ZWVx6Hboz[dH2uO)*O]&N5cU
+FTgW})(0pJ$}.{rG!(hj%NXd(>&p{kTvPy:Fh%J[4Qog7Dc3!/z{/w2TCh)S[He(iY/Nfh%
+S{()cl$-Ow[Z[3-+em.6>}}q><V}p}Ng4-YCR4B>NhMgSL}3keiBukDeZ<tJ!}tP2Bhol/U
+fvwwz81xGv{jmMKRDO]?[mzZiwlJ7Z!fNW[e5fu+CipqLv7w!M.oeyC5^j-wU)Z)DlZ:MhJ
+MRH@QzEj+srpMkHKHA2{-7BgCn/j2U-4OE+&t8Jc^U3WR7%8eUqg[r>rvN^1lw#:/mef/*U
+70xuz:pg%TxfGJ9O>:0hzddr)0l]IzRC9e9N-I-cH2Pvg5=xGaV%0x0Jm=?KlJ/IxMB/fJx
+xlCJ}*E@rCfTDUlX0SE:-<h?T@fBHl5:O?2-B#/!pxanEZI2l9@mW{.!HQVD7C5$SMnz#zW
+keg0J$pDyz^Oa1^3(z{leQP+SXJC+]:[3O}-<B0jI7nm$yVh=:ch/mT1Q[DP]PqHoXE)xza
+B[UyQHtsI*%r^uK5<<A@#dTA&8Frn+CY/w*qVBJH1qnn6Tv7PP%$c{EET!0jh^dUJp@Syoy
+k^uzaR*Q9SWY^*H@X*=em^I^5uulJ#)M&z4)?syLpdN#S0f2wq}zFrW0vqYQvy&r/(yYF@:
+7$[by]rf[{>97Lcp2dWcQ5@<OmWCOpm@M.hB}zmanaJj27V<TilxIgH{#Vc:YsP.-{d3Fp!
+?>U?0c9@rbY)(/I.=TH5d178sKFH7UvFpIhwP8w?UHM21-uxbJ}I45(zIN=kdftEhh#lzq@
+!#X/YQLJyRVsb8Zg7oTfPe0e1cEX?cPLOo:Kb}NtGC0ZYypu:[=ft37EcvY1FiOJW3wKzef
+r6QtC3.rpBO?&I!F+z10[hcITb9i]DgWegaluND+y1ZOwbuK^^C@pgqBu+>o5un3/]FT/+O
+:p&xz}5}{ooTKsQFh9<R/mkm7%gCy^Rmme)i0SSi208?O?cia2C1-7F)/z>)K
--- a/tests/unknown4
+++ b/tests/unknown4
@@ -1,2 +1,2 @@
-0w</Ehs1#BA3k=>/-oUq9GivcM)-GCF]mc8k*mvSJ2zoa}UiF3VD[>Tqb+M7Jq#o!uC9?4q
-n%aBuKb{ex.8-j9^T611j!.plUbqXG]Gl&P@L#d5cgteSu}?wC*rH/X@3GX0qgslBm+B(
+0Ji3}dGK/Q*@=EAXCkzw)M9pdfSm9+xZZX]Bt9K$%cTFQ8EUj3pK(}T6aYdesz#XiCvFwdj
+M0N)yB]@2g)T-EmJZ10wjEkV>u&/v
--- a/tests/unknown5
+++ b/tests/unknown5
@@ -1,2 +1,2 @@
-1f{Fy[cZFK+pp.B7>.v5Wen(2]6hjnTVi!yM&0jWr9@fI&@<90-GudZ]zJl%DITeE}LSTwz
-G4fdyX#cd1W>mah8^lTix6k(hzN6BfAq7M000000000008?Cmr@-j20SSi200000
+15H8sSn+vmg.g0JlKFtJg%P3OYMOCt7NAgDR%zP]xY33$zKh$mqrCsdce)7NO[+60NK:^OW
+$G-:j&Cwk3o7mhhBPL]f!(9Mk@*X&lJv8^000000000008?O?c&:kE0SSi200000