distributed version 0.1.0V0-1-0

5 files changed, 19 insertions, 13 deletions

diff --git a/cipher/Makefile.am b/cipher/Makefile.am
index 40b131dd9..17952852f 100644
--- a/cipher/Makefile.am
+++ b/cipher/Makefile.am
@@ -21,9 +21,9 @@ cipher_SOURCES = blowfish.c	\
 		 sha1.c 	\
 		 dsa.h		\
 		 dsa.c		\
+		 rsa.c		\
+		 rsa.h		\
 		 md.c		\
 		 smallprime.c
 
-cipher_LIBADD = rsa.o
-
 
diff --git a/cipher/Makefile.in b/cipher/Makefile.in
index 8391d9e9c..f9beb30b9 100644
--- a/cipher/Makefile.in
+++ b/cipher/Makefile.in
@@ -58,10 +58,10 @@ cipher_SOURCES = blowfish.c	\
 		 sha1.c 	\
 		 dsa.h		\
 		 dsa.c		\
+		 rsa.c		\
+		 rsa.h		\
 		 md.c		\
 		 smallprime.c
-
-cipher_LIBADD = rsa.o
 mkinstalldirs = $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = ../config.h
 LIBRARIES = $(noinst_LIBRARIES)
@@ -80,8 +80,9 @@ 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 md.o smallprime.o
+rmd160.o sha1.o dsa.o rsa.o md.o smallprime.o
 EXTRA_cipher_SOURCES =
 LIBFILES =  libcipher.a
 AR = ar
@@ -101,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/random.P $(srcdir)/.deps/rmd160.P $(srcdir)/.deps/rsa.P \
 $(srcdir)/.deps/sha1.P $(srcdir)/.deps/smallprime.P
 SOURCES = $(cipher_SOURCES)
 OBJECTS = $(cipher_OBJECTS)
diff --git a/configure.in b/configure.in
index a7406f76b..13ae37b23 100644
--- a/configure.in
+++ b/configure.in
@@ -19,6 +19,7 @@ AC_ARG_ENABLE(m-debug,
 [  --enable-m-debug    Enable debugging of memory allocation])
 if test "$enableval" = y || test "$enableval" = yes; then
     AC_DEFINE(M_DEBUG)
+    CFLAGS=-g
 fi
 
 dnl some additional macros
@@ -141,9 +142,9 @@ WK_CHECK_TYPEDEF(ulong, HAVE_ULONG_TYPEDEF)
 WK_CHECK_TYPEDEF(u16, HAVE_U16_TYPEDEF)
 WK_CHECK_TYPEDEF(u32, HAVE_U32_TYPEDEF)
 
-AC_CHECK_SIZEOF(unsigned short, 16)
-AC_CHECK_SIZEOF(unsigned int, 32)
-AC_CHECK_SIZEOF(unsigned long, 32)
+AC_CHECK_SIZEOF(unsigned short, 2)
+AC_CHECK_SIZEOF(unsigned int, 4)
+AC_CHECK_SIZEOF(unsigned long, 4)
 
 
 
diff --git a/include/types.h b/include/types.h
index be217df69..0a2d8752f 100644
--- a/include/types.h
+++ b/include/types.h
@@ -44,9 +44,9 @@
 
 #ifndef HAVE_U16_TYPEDEF
   #undef u16	    /* maybe there is a macro with this name */
-  #if SIZEOF_UNSIGNED_INT == 16
+  #if SIZEOF_UNSIGNED_INT == 2
     typedef unsigned int   u16;
-  #elif SIZEOF_UNSIGNED_SHORT == 16
+  #elif SIZEOF_UNSIGNED_SHORT == 2
     typedef unsigned short u16;
   #else
     #error no typedef for u16
@@ -56,9 +56,9 @@
 
 #ifndef HAVE_U32_TYPEDEF
   #undef u32	    /* maybe there is a macro with this name */
-  #if SIZEOF_UNSIGNED_INT == 32
+  #if SIZEOF_UNSIGNED_INT == 4
     typedef unsigned long u32;
-  #elif SIZEOF_UNSIGNED_LONG == 32
+  #elif SIZEOF_UNSIGNED_LONG == 4
     typedef unsigned int u32;
   #else
     #error no typedef for u32
diff --git a/util/ttyio.c b/util/ttyio.c
index 08ed41c4d..2cb52448c 100644
--- a/util/ttyio.c
+++ b/util/ttyio.c
@@ -41,7 +41,11 @@ init_ttyfp()
     if( ttyfp )
 	return;
 
+  #if defined(__MINGW32__)
+    ttyfp = stderr; /* fixme */
+  #else
     ttyfp = fopen("/dev/tty", "r+");
+  #endif
     if( !ttyfp )
 	log_fatal("cannot open /dev/tty: %s\n", strerror(errno) );
 }