See ChangeLog: Sun May 23 14:20:22 CEST 1999 Werner Koch

ChangeLog

@@ -1,3 +1,8 @@
+Sun May 23 14:20:22 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
+
+	* acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): assume yes when
+	cross-compiling.
+
 Mon May 17 21:54:43 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
 	* configure.in (socket): Fix for Unisys by Katsuhiro Kondou.

acinclude.m4

@@ -553,9 +553,14 @@ AC_CHECK_TOOL(AS, as, false)
 ])
 
 # GNUPG_SYS_SYMBOL_UNDERSCORE - does the compiler prefix global symbols
-#                            with an underscore?
+#                              with an underscore?
 AC_DEFUN(GNUPG_SYS_SYMBOL_UNDERSCORE,
-[AC_REQUIRE([GNUPG_PROG_NM])dnl
+[if test "$cross_compiling" = yes; then
+    AC_MSG_CHECKING([for _ prefix in compiled symbols])
+    ac_cv_sys_symbol_underscore=yes
+    AC_MSG_RESULT(assume yes)
+else
+AC_REQUIRE([GNUPG_PROG_NM])dnl
 AC_REQUIRE([GNUPG_SYS_NM_PARSE])dnl
 AC_MSG_CHECKING([for _ prefix in compiled symbols])
 AC_CACHE_VAL(ac_cv_sys_symbol_underscore,
@@ -588,6 +593,7 @@ fi
 rm -rf conftest*
 ])
 AC_MSG_RESULT($ac_cv_sys_symbol_underscore)
+fi
 if test x$ac_cv_sys_symbol_underscore = xyes; then
   AC_DEFINE(WITH_SYMBOL_UNDERSCORE,1,
   [define if compiled symbols have a leading underscore])

cipher/ChangeLog

@@ -1,3 +1,9 @@
+Sun May 23 14:20:22 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
+
+	* cipher.c (setup_cipher_table): Enable Twofish
+
+	* random.c (fast_random_poll): Disable use of times() for mingw32.
+
 Mon May 17 21:54:43 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
 	* dynload.c (register_internal_cipher_extension): Minor init fix.

cipher/cipher.c

@@ -83,7 +83,6 @@ setup_cipher_table(void)
     int i;
 
     i = 0;
-  if( getenv("GNUPG_ENABLE_TWOFISH") ) {
     cipher_table[i].algo = CIPHER_ALGO_TWOFISH;
     cipher_table[i].name = twofish_get_info( cipher_table[i].algo,
 					 &cipher_table[i].keylen,
@@ -95,7 +94,6 @@ setup_cipher_table(void)
     if( !cipher_table[i].name )
 	BUG();
     i++;
-  }
     cipher_table[i].algo = CIPHER_ALGO_BLOWFISH;
     cipher_table[i].name = blowfish_get_info( cipher_table[i].algo,
 					 &cipher_table[i].keylen,

cipher/random.c

@@ -360,10 +360,12 @@ fast_random_poll()
 	add_randomness( &tv.tv_usec, sizeof(tv.tv_usec), 1 );
     }
   #else /* use times */
+    #ifndef HAVE_DOSISH_SYSTEM
     {	struct tms buf;
 	times( &buf );
 	add_randomness( &buf, sizeof buf, 1 );
     }
+    #endif
   #endif
   #ifdef HAVE_GETRUSAGE
     {	struct rusage buf;

configure.in

@@ -217,6 +217,11 @@ dnl Checks for libraries.
 
 if test "$try_gettext" = yes; then
 AM_GNU_GETTEXT
+else
+USE_NLS=no
+USE_INCLUDED_LIBINTL=no
+AC_SUBST(USE_NLS)
+AC_SUBST(USE_INCLUDED_LIBINTL)
 fi
 
 if test "$try_gdbm" = yes; then

g10/ChangeLog

@@ -1,3 +1,15 @@
+Sun May 23 14:20:22 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
+
+	* pkclist.c (check_signatures_trust): Print a warning and return
+	immediateley if opt.always_trust is true.
+
+	* g10.c (main): Corrected handling of no-default-keyring
+
+	* pkclist.c (algo_available): Disable Twofish until we have settled
+	how to do the MDC.
+
+	* hkp.c: Disable everything for mingw32
+
 Sat May 22 22:47:26 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
 	* mainproc.c (check_sig_and_print): Add sig creation time to the

g10/g10.c

@@ -849,11 +849,11 @@ main( int argc, char **argv )
     if( cmd != aDeArmor && cmd != aEnArmor
 	&& !(cmd == aKMode && argc == 2 ) ) {
 
-	if( !sec_nrings || default_keyring )  /* add default secret rings */
+	if( !sec_nrings && default_keyring )  /* add default secret rings */
 	    add_keyblock_resource("secring.gpg", 0, 1);
 	for(sl = sec_nrings; sl; sl = sl->next )
 	    add_keyblock_resource( sl->d, 0, 1 );
-	if( !nrings || default_keyring )  /* add default ring */
+	if( !nrings && default_keyring )  /* add default ring */
 	    add_keyblock_resource("pubring.gpg", 0, 0);
 	for(sl = nrings; sl; sl = sl->next )
 	    add_keyblock_resource( sl->d, 0, 0 );

g10/hkp.c

@@ -49,6 +49,9 @@ static int urlencode_filter( void *opaque, int control,
 int
 hkp_ask_import( u32 *keyid )
 {
+  #ifdef HAVE_DOSISH_SYSTEM
+    return -1;
+  #else
     struct http_context hd;
     char *request;
     int rc;
@@ -75,6 +78,7 @@ hkp_ask_import( u32 *keyid )
 
     m_free( request );
     return rc;
+  #endif
 }
 
 
@@ -82,6 +86,9 @@ hkp_ask_import( u32 *keyid )
 int
 hkp_import( STRLIST users )
 {
+  #ifdef HAVE_DOSISH_SYSTEM
+    return -1;
+  #else
     if( !opt.keyserver_name ) {
 	log_error("no keyserver known (use option --keyserver)\n");
 	return -1;
@@ -97,12 +104,16 @@ hkp_import( STRLIST users )
 	hkp_ask_import( kid );
     }
     return 0;
+  #endif
 }
 
 
 int
 hkp_export( STRLIST users )
 {
+  #ifdef HAVE_DOSISH_SYSTEM
+    return -1;
+  #else
     int rc;
     armor_filter_context_t afx;
     IOBUF temp = iobuf_temp();
@@ -177,6 +188,7 @@ hkp_export( STRLIST users )
     }
     http_close( &hd );
     return rc;
+  #endif
 }
 
 static int

g10/openfile.c

@@ -101,7 +101,7 @@ open_outfile( const char *iname, int mode, IOBUF *a )
 	    name = opt.outfile;
 	else {
 	  #ifdef USE_ONLY_8DOT3
-	    #error please implement this
+	    #warning please implement 8.3 files
 	  #endif
 	    buf = m_alloc(strlen(iname)+4+1);
 	    strcpy(stpcpy(buf,iname), mode==1 ? ".asc" :
@@ -135,7 +135,7 @@ open_sigfile( const char *iname )
     size_t len;
 
   #ifdef USE_ONLY_8DOT3
-    #error please implement this
+    #warning please implement 8.3 files
   #endif
     if( iname && !(*iname == '-' && !iname[1]) ) {
 	len = strlen(iname);

g10/pkclist.c

@@ -428,6 +428,13 @@ check_signatures_trust( PKT_signature *sig )
     int did_add = 0;
     int rc=0;
 
+
+    if( opt.always_trust ) {
+	log_info(_("WARNING: Using untrusted key!\n"));
+	return 0;
+    }
+
+
     rc = get_pubkey( pk, sig->keyid );
     if( rc ) { /* this should not happen */
 	log_error("Ooops; the key vanished  - can't check the trust\n");
@@ -686,6 +693,8 @@ static int
 algo_available( int preftype, int algo )
 {
     if( preftype == PREFTYPE_SYM ) {
+	if( algo == CIPHER_ALGO_TWOFISH )
+	    return 0;  /* we don't want to generate Twofish messages for now*/
 	return algo && !check_cipher_algo( algo );
     }
     else if( preftype == PREFTYPE_HASH ) {

mpi/ChangeLog

@@ -1,3 +1,7 @@
+Sun May 23 14:20:22 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
+
+	* config.links (sysdep.h): Not any more conditionally created.
+
 Tue May  4 15:47:53 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
 	* mpiutil.c (mpi_alloc_like): New.

util/ChangeLog

@@ -1,3 +1,8 @@
+Sun May 23 14:20:22 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
+
+	* dotlock.c: Tweaked to make it compile under mingw32
+	* http.c: Disabled for mingw32.
+
 Sat May 22 22:47:26 CEST 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
 	* logger.c (log_set_logfile): New.

util/dotlock.c

@@ -25,7 +25,9 @@
 #include <ctype.h>
 #include <errno.h>
 #include <unistd.h>
+#ifndef  HAVE_DOSISH_SYSTEM
 #include <sys/utsname.h>
+#endif
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
@@ -71,7 +73,9 @@ create_dotlock( const char *file_to_lock )
     DOTLOCK h;
     int  fd = -1;
     char pidstr[16];
+  #ifndef  HAVE_DOSISH_SYSTEM
     struct utsname uts;
+  #endif
     const char *nodename;
     const char *dirpart;
     int dirpartlen;

util/http.c

@@ -25,6 +25,9 @@
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
+
+#ifndef HAVE_DOSISH_SYSTEM
+
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -685,6 +688,7 @@ write_server( int sock, const char *data, size_t length )
     return 0;
 }
 
+#endif /* HAVE_DOSISH_SYSTEM */
 
 /**** Test code ****/
 #ifdef TEST