patch release 0.1.1

Makefile.am

@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 SUBDIRS =  util mpi cipher tools g10
-EXTRA_DIST =
+EXTRA_DIST = VERSION
 
 
 

Makefile.in

@@ -39,7 +39,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
 SUBDIRS =  util mpi cipher tools g10
-EXTRA_DIST =
+EXTRA_DIST = VERSION
 ACCONFIG = acconfig.h
 CONFIG_HEADER_IN = config.h.in
 mkinstalldirs = $(top_srcdir)/scripts/mkinstalldirs

VERSION

@@ -0,0 +1 @@
+0.1.1

cipher/Makefile.am

@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES = -I$(top_srcdir)/include
+EXTRA_DIST = @CIPHER_EXTRA_DIST@
 
 noinst_LIBRARIES = cipher
 
@@ -21,9 +22,9 @@ cipher_SOURCES = blowfish.c	\
 		 sha1.c 	\
 		 dsa.h		\
 		 dsa.c		\
-		 rsa.c		\
-		 rsa.h		\
 		 md.c		\
 		 smallprime.c
 
+cipher_LIBADD = @CIPHER_EXTRA_OBJS@
+
 

cipher/Makefile.in

@@ -39,6 +39,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
 
 INCLUDES = -I$(top_srcdir)/include
+EXTRA_DIST = @CIPHER_EXTRA_DIST@
 
 noinst_LIBRARIES = cipher
 
@@ -58,10 +59,10 @@ cipher_SOURCES = blowfish.c	\
 		 sha1.c 	\
 		 dsa.h		\
 		 dsa.c		\
-		 rsa.c		\
-		 rsa.h		\
 		 md.c		\
 		 smallprime.c
+
+cipher_LIBADD = @CIPHER_EXTRA_OBJS@
 mkinstalldirs = $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = ../config.h
 LIBRARIES = $(noinst_LIBRARIES)
@@ -80,9 +81,8 @@ LIBS = @LIBS@
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 LINK = $(CC) $(LDFLAGS) -o $@
-cipher_LIBADD =
 cipher_OBJECTS = blowfish.o elgamal.o gost.o md5.o primegen.o random.o \
-rmd160.o sha1.o dsa.o rsa.o md.o smallprime.o
+rmd160.o sha1.o dsa.o md.o smallprime.o
 EXTRA_cipher_SOURCES =
 LIBFILES =  libcipher.a
 AR = ar
@@ -102,7 +102,7 @@ TAR = tar
 DEP_FILES = $(srcdir)/.deps/blowfish.P $(srcdir)/.deps/dsa.P \
 $(srcdir)/.deps/elgamal.P $(srcdir)/.deps/gost.P $(srcdir)/.deps/md.P \
 $(srcdir)/.deps/md5.P $(srcdir)/.deps/primegen.P \
-$(srcdir)/.deps/random.P $(srcdir)/.deps/rmd160.P $(srcdir)/.deps/rsa.P \
+$(srcdir)/.deps/random.P $(srcdir)/.deps/rmd160.P \
 $(srcdir)/.deps/sha1.P $(srcdir)/.deps/smallprime.P
 SOURCES = $(cipher_SOURCES)
 OBJECTS = $(cipher_OBJECTS)

cipher/rmd160.c

@@ -224,7 +224,7 @@ transform( RMDHANDLE hd, byte *data )
       }
     }
   #else
-    x = data;
+    x = (u32*)data;
   #endif
 
     a = aa = hd->h0;

configure.in

@@ -8,7 +8,7 @@ AC_CONFIG_AUX_DIR(scripts)
 AC_CONFIG_HEADER(config.h)
 
 
-VERSION=0.1.0
+VERSION=`cat ./VERSION`
 PACKAGE=g10
 AC_SUBST(VERSION)
 AC_SUBST(PACKAGE)
@@ -24,6 +24,10 @@ fi
 
 dnl some additional macros
 
+dnl WK_MSG_PRINT(STRING)
+define(WK_MSG_PRINT,
+[echo $ac_n "$1"" $ac_c" 1>&AC_FD_MSG ])
+
 dnl WK_CHECK_TYPEDEF(TYPE, HAVE_NAME)
 AC_DEFUN(WK_CHECK_TYPEDEF,
 [AC_MSG_CHECKING(for $1 typedef)
@@ -163,7 +167,7 @@ fi
 
 
 dnl setup assembler stuff
-AC_MSG_CHECKING(configure mpi)
+AC_MSG_CHECKING(for mpi assembler functions)
 mpi_config_done="no"
 AC_CACHE_VAL(ac_cv_mpi_config_done,
 	     [ ac_cv_mpi_config_done="$mpi_config_done" ])
@@ -173,6 +177,7 @@ else
 ac_cv_mpi_config_done=""
 if test -f ./mpi/config.links ; then
     . ./mpi/config.links
+    ac_cv_mpi_extra_asm_modules="$mpi_extra_modules"
     AC_LINK_FILES( ${mpi_ln_src}, ${mpi_ln_dst} )
     ac_cv_mpi_config_done="yes"
     AC_MSG_RESULT(done)
@@ -181,18 +186,31 @@ else
     AC_MSG_ERROR([mpi/config.links missing!])
 fi
 fi
+MPI_EXTRA_ASM_OBJS=""
+if test "$ac_cv_mpi_extra_asm_modules" != ""; then
+WK_MSG_PRINT([mpi extra asm functions:])
+for i in $ac_cv_mpi_extra_asm_modules; do
+    WK_MSG_PRINT([$i])
+    MPI_EXTRA_ASM_OBJS="$MPI_EXTRA_ASM_OBJS $i.o"
+done
+AC_MSG_RESULT()
+fi
+AC_SUBST(MPI_EXTRA_ASM_OBJS)
 
 
-dnl checking whether we have the RSA source
+dnl checking whether we have other cipher source files
-dnl Add stuff to insert this into the makefile
+CIPHER_EXTRA_OBJS=""
-dnl AC_SUBST(add_cipher_SOURCES)
+CIPHER_EXTRA_DIST=""
-AC_CACHE_CHECK(for rsa source, ac_cv_have_rsa_cipher,
+AC_CACHE_CHECK(for extra cipher modules, ac_cv_have_rsa_cipher,
 [if test -f cipher/rsa.c && test -f cipher/rsa.h; then
   ac_cv_have_rsa_cipher=yes; else ac_cv_have_rsa_cipher=no; fi])
 if test $ac_cv_have_rsa_cipher = yes; then
     AC_DEFINE(HAVE_RSA_CIPHER)
+    CIPHER_EXTRA_OBJS="rsa.o"
+    CIPHER_EXTRA_DIST="rsa.c rsa.h"
 fi
-
+AC_SUBST(CIPHER_EXTRA_OBJS)
+AC_SUBST(CIPHER_EXTRA_DIST)
 
 AC_OUTPUT([ Makefile	\
 	    util/Makefile    \

mpi/Makefile.am

@@ -36,16 +36,6 @@ mpi_LIBADD =  mpih-mul1.o    \
 	      mpih-mul3.o    \
 	      mpih-add1.o    \
 	      mpih-sub1.o    \
-	      mpih-shift.o
+	      mpih-shift.o  @MPI_EXTRA_ASM_OBJS@
-
-#mpi_DEPENDENCIES = mpih-mul1.S    \
-#		    mpih-mul2.S    \
-#		    mpih-mul3.S    \
-#		    mpih-add1.S    \
-#		    mpih-sub1.S    \
-#		    mpih-shift.S
-#
-
-##DISTCLEANFILES = @MPI_DISTCLEANFILES@
 
 

mpi/Makefile.in

@@ -72,7 +72,7 @@ mpi_LIBADD =  mpih-mul1.o    \
 	      mpih-mul3.o    \
 	      mpih-add1.o    \
 	      mpih-sub1.o    \
-	      mpih-shift.o
+	      mpih-shift.o  @MPI_EXTRA_ASM_OBJS@
 mkinstalldirs = $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = ../config.h
 LIBRARIES = $(noinst_LIBRARIES)
@@ -273,14 +273,6 @@ mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 CFLAGS += -O2
-
-#mpi_DEPENDENCIES = mpih-mul1.S    \
-#		    mpih-mul2.S    \
-#		    mpih-mul3.S    \
-#		    mpih-add1.S    \
-#		    mpih-sub1.S    \
-#		    mpih-shift.S
-#
 .SUFFIXES:
 .SUFFIXES: .c .o $(SUFFIXES)
 

mpi/hppa/mpih-add1.S

@@ -44,8 +44,8 @@
  */
 
 	.code
-	.export 	__mpihelp_add_n
+	.export 	mpihelp_add_n
-__mpihelp_add_n
+mpihelp_add_n
 	.proc
 	.callinfo	frame=0,no_calls
 	.entry