gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r417 - GNUnet GNUnet/m4 GNUnet/src/applications/fs/ecrs GNU


From: grothoff
Subject: [GNUnet-SVN] r417 - GNUnet GNUnet/m4 GNUnet/src/applications/fs/ecrs GNUnet/src/util GNUnet-docs/WWW branches/GNUnet06/src/server
Date: Tue, 8 Mar 2005 11:58:09 -0800 (PST)

Author: grothoff
Date: 2005-03-08 11:58:07 -0800 (Tue, 08 Mar 2005)
New Revision: 417

Modified:
   GNUnet-docs/WWW/download.php3
   GNUnet/ChangeLog
   GNUnet/Makefile.am
   GNUnet/README
   GNUnet/configure.ac
   GNUnet/m4/Makefile.in
   GNUnet/src/applications/fs/ecrs/keyspace.c
   GNUnet/src/applications/fs/ecrs/searchtest.c
   GNUnet/src/applications/fs/ecrs/uritest.c
   GNUnet/src/util/Makefile.am
   GNUnet/src/util/hashingtest.c
   GNUnet/src/util/hostkey_openssl.c
   GNUnet/src/util/hostkeytest.c
   GNUnet/src/util/initialize.c
   GNUnet/src/util/kblockkey_test.c
   GNUnet/src/util/locking_gcrypt.h
   GNUnet/src/util/random_openssl.c
   GNUnet/src/util/symciphertest.c
   GNUnet/src/util/weakkeytest.c
   branches/GNUnet06/src/server/connection.c
Log:
removing troublesome openssl

Modified: GNUnet/ChangeLog
===================================================================
--- GNUnet/ChangeLog    2005-03-08 15:56:11 UTC (rev 416)
+++ GNUnet/ChangeLog    2005-03-08 19:58:07 UTC (rev 417)
@@ -1,3 +1,8 @@
+Tue Mar  8 14:45:55 EST 2005
+       OpenSSL cannot fully support SHA-512.  Eliminated as an
+       option (not necessary, GPL incompatible, trouble, work
+       to maintain -- in summary: not worth it).
+
 Sat Mar  5 00:33:51 EST 2005
        Changing hash algorithm to SHA-512. 
        Changing symcipher algorithm to AES-256.

Modified: GNUnet/Makefile.am
===================================================================
--- GNUnet/Makefile.am  2005-03-08 15:56:11 UTC (rev 416)
+++ GNUnet/Makefile.am  2005-03-08 19:58:07 UTC (rev 417)
@@ -1,13 +1,6 @@
 INCLUDES = -I$(top_srcdir)/src/include
 SUBDIRS  = m4 po libltdl src doc contrib
 
-if USE_GCRYPT
-  DISTCHECK_CONFIGURE_FLAGS=--with-gcrypt
-endif
-if USE_OPENSSL
-  DISTCHECK_CONFIGURE_FLAGS=--with-crypto
-endif
-
 EXTRA_DIST = \
  ABOUT-NLS \
  config.rpath  \

Modified: GNUnet/README
===================================================================
--- GNUnet/README       2005-03-08 15:56:11 UTC (rev 416)
+++ GNUnet/README       2005-03-08 19:58:07 UTC (rev 417)
@@ -45,9 +45,8 @@
 general information about the GNU build process read the INSTALL file.
 
 GNUnet requires the GNU MP library (http://www.gnu.org/software/gmp/)
-and either libgcrypt or OpenSSL.  You can specify the path to 
-libgcrypt using "--with-gcrypt=PATH".  Similarly, the path to 
-OpenSSL can be specified using "--with-crypto=PATH".
+and libgcrypt.  You can specify the path to 
+libgcrypt using "--with-gcrypt=PATH". 
 
 If you are compiling the CVS version, you have to run ". bootstrap"
 before ./configure.  If you receive an error during the running of

Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2005-03-08 15:56:11 UTC (rev 416)
+++ GNUnet/configure.ac 2005-03-08 19:58:07 UTC (rev 417)
@@ -154,70 +154,17 @@
   [Define if you have a post 11/2004 pthread library]), , [#include 
<pthread.h>])
 
 
-# We have two choices for the crypto stuff.  
-# 1) By default we use whatever is present (OpenSSL or gcrypt)
-# 2) If both are present, we default to libgcrypt
-# 3) If both are present and --with-openssl=PFX is given,
-#    we use OpenSSL
-
-# gcrypt
+# libgcrypt
 gcrypt=0
 AC_MSG_CHECKING(for libgcrypt) 
 AM_PATH_LIBGCRYPT(1.2.0, gcrypt=1)
 
-# openssl
-if test "$build_target" = "mingw"
-then
-  openssl_libs="-lgdi32"
-fi
-
-openssl=0
-AC_ARG_WITH(crypto,
-  [  --with-crypto=PFX        Base of OpenSSL installation],
-  [AC_MSG_RESULT("$with_crypto")
-   case $with_crypto in
-   no) openssl=0
-       ;;
-   yes) AC_CHECK_LIB([crypto], [RSA_generate_key],
-         [AC_CHECK_HEADERS([openssl/rsa.h openssl/blowfish.h],
-          openssl=1;gcrypt=0)], ,["$openssl_libs"])
-       ;;
-   *) LDFLAGS="$LDFLAGS -L$with_crypto/lib"
-      CPPFLAGS="$CPPFLAGS -I$with_crypto/include"
-      AC_CHECK_LIB([crypto], [RSA_generate_key],
-       [AC_CHECK_HEADERS([openssl/rsa.h openssl/blowfish.h], 
-         openssl=1;gcrypt=0)], , ["$openssl_libs"])
-       ;;
-   esac],
-   [AC_CHECK_LIB([crypto], [RSA_generate_key],
-     [AC_CHECK_HEADERS([openssl/rsa.h openssl/blowfish.h],
-      openssl=1)], , ["$openssl_libs"])])
-
-if test $openssl = 0 
-then
 if test $gcrypt = 0
 then
-  AC_MSG_ERROR([GNUnet needs libgcrypt or OpenSSL])
+  AC_MSG_ERROR([GNUnet needs libgcrypt])
 fi
-fi
 
-# Given the choice, the preference is libgcrypt
-if test $openssl = 1
-then
-if test $gcrypt = 1
-then
-openssl=0
-fi
-fi
 
-AM_CONDITIONAL(USE_GCRYPT, test x$gcrypt = x1)
-AC_DEFINE_UNQUOTED(USE_GCRYPT, $gcrypt, [gcrypt available])
-
-AM_CONDITIONAL(USE_OPENSSL, test x$openssl = x1)
-AC_DEFINE_UNQUOTED(USE_OPENSSL, $openssl, [openssl available])
-
-
-
 # test for kvm and kstat (for CPU stats under BSD/Solaris)
 AC_CHECK_LIB([kvm],[kvm_open])
 AC_CHECK_LIB([kstat],[kstat_open])
@@ -606,13 +553,3 @@
 #fi
 
 AC_MSG_NOTICE([NOTICE: Database support is set to MySQL: $mysql, SQLite: 
$sqlite])
-
-if test $openssl = 1
-then
-  AC_MSG_NOTICE([NOTICE: Using OpenSSL for cryptographic primitives.])
-fi
-
-if test $gcrypt = 1
-then
-  AC_MSG_NOTICE([NOTICE: Using libgcrypt for cryptographic primitives.])
-fi

Modified: GNUnet/m4/Makefile.in
===================================================================
--- GNUnet/m4/Makefile.in       2005-03-08 15:56:11 UTC (rev 416)
+++ GNUnet/m4/Makefile.in       2005-03-08 19:58:07 UTC (rev 417)
@@ -154,11 +154,7 @@
 SQLITE_CPPFLAGS = @SQLITE_CPPFLAGS@
 SQLITE_LDFLAGS = @SQLITE_LDFLAGS@
 STRIP = @STRIP@
-USE_GCRYPT_FALSE = @USE_GCRYPT_FALSE@
-USE_GCRYPT_TRUE = @USE_GCRYPT_TRUE@
 USE_NLS = @USE_NLS@
-USE_OPENSSL_FALSE = @USE_OPENSSL_FALSE@
-USE_OPENSSL_TRUE = @USE_OPENSSL_TRUE@
 VERSION = @VERSION@
 XGETTEXT = @XGETTEXT@
 ac_ct_AR = @ac_ct_AR@

Modified: GNUnet/src/applications/fs/ecrs/keyspace.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/keyspace.c  2005-03-08 15:56:11 UTC (rev 
416)
+++ GNUnet/src/applications/fs/ecrs/keyspace.c  2005-03-08 19:58:07 UTC (rev 
417)
@@ -143,7 +143,6 @@
     GNUNET_ASSERT(OK == getQueryFor(size,
                                    (DBlock*) kb,
                                    &hc));
-
     freePrivateKey(pk);
     if (OK != FS_insert(sock, value))
       ret = SYSERR;

Modified: GNUnet/src/applications/fs/ecrs/searchtest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/searchtest.c        2005-03-08 15:56:11 UTC 
(rev 416)
+++ GNUnet/src/applications/fs/ecrs/searchtest.c        2005-03-08 19:58:07 UTC 
(rev 417)
@@ -75,7 +75,7 @@
                      int resultCount) {
   ECRS_search(uri,
              0,
-             15 * cronSECONDS,
+             60 * 15 * cronSECONDS,
              &searchCB,
              &resultCount,
              &testTerminate,
@@ -96,7 +96,7 @@
   struct ECRS_URI * key;
   const char * keywords[6];
 
-  daemon = fork();
+  daemon = -1; // fork();
   if (daemon == 0) {
     if (0 != execlp("gnunetd", /* what binary to execute, must be in $PATH! */
                    "gnunetd", /* arg0, path to gnunet binary */
@@ -119,8 +119,36 @@
   CHECK(sock != NULL);
   
   /* ACTUAL TEST CODE */
+#if 1
 
+
   /* first, simple insertion => one result */
+  /* inserting another URI under the 'XXtest' keyword and under 'binary'
+     should give both URIs since ECRS knows nothing about 'AND'ing: */
+  printf("Testing search for 'binary' with one result.\n");
+  uri = 
ECRS_stringToUri("gnunet://ecrs/sks/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820/test-different");
+  meta = ECRS_createMetaData();
+  keywords[0] = "binary";
+  keywords[1] = NULL;
+  key = ECRS_keywordsToUri(keywords);
+  CHECK(OK == ECRS_addToKeyspace(key,
+                                0,
+                                0,
+                                cronTime(NULL) + 10 * cronMINUTES, /* expire */
+                                uri,
+                                meta));
+  CHECK(OK == searchFile(key,
+                        1));
+  ECRS_freeUri(key);
+  ECRS_freeUri(uri);
+  ECRS_freeMetaData(meta);
+
+
+#else
+
+
+
+  /* first, simple insertion => one result */
   printf("Testing search for 'XXtest' with one result.\n");
   uri = 
ECRS_stringToUri("gnunet://ecrs/sks/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820/test");
   meta = ECRS_createMetaData();
@@ -166,9 +194,8 @@
                         2));
   ECRS_freeUri(key);
   
+#endif
 
-
-  ECRS_freeUri(key);
   /* END OF TEST CODE */
  FAILURE:
   if (sock != NULL)

Modified: GNUnet/src/applications/fs/ecrs/uritest.c
===================================================================
--- GNUnet/src/applications/fs/ecrs/uritest.c   2005-03-08 15:56:11 UTC (rev 
416)
+++ GNUnet/src/applications/fs/ecrs/uritest.c   2005-03-08 19:58:07 UTC (rev 
417)
@@ -65,7 +65,7 @@
   if (NULL != 
ECRS_stringToUri("gnunet://ecrs/sks/D1KJS9H2A82Q65VKQ0ML3RFU6U1D3V/test"))
     ABORT();
   if (NULL != ECRS_stringToUri("gnunet://ecrs/sks/test"))
-    ABORT();
+     ABORT();
   ret = 
ECRS_stringToUri("gnunet://ecrs/sks/C282GG70GKK41O4551011DO413KFBVTVMQG1OG30I0K4045N0G41HAPB82G680A02JRVVFO8URVRU2F159011DO41000000022RG820/test");
   if (ret == NULL)
     ABORT();

Modified: GNUnet/src/util/Makefile.am
===================================================================
--- GNUnet/src/util/Makefile.am 2005-03-08 15:56:11 UTC (rev 416)
+++ GNUnet/src/util/Makefile.am 2005-03-08 19:58:07 UTC (rev 417)
@@ -28,31 +28,16 @@
 
 lib_LTLIBRARIES = libgnunetutil.la
 
-if USE_OPENSSL
- cryptofiles = hostkey_openssl.c symcipher_openssl.c random_openssl.c
- CRYPTLIB = -lcrypto
-else
- cryptofiles = hostkey_gcrypt.c symcipher_gcrypt.c locking_gcrypt.c 
locking_gcrypt.h random_gcrypt.c
- CRYPTLIB = $(LIBGCRYPT_LIBS)
- AM_CPPFLAGS = $(LIBGCRYPT_CFLAGS)
-endif
+AM_CPPFLAGS = $(LIBGCRYPT_CFLAGS)
 
 libgnunetutil_la_LIBADD = $(GCLIBADD) $(CYGLIBADD) $(WINLIBADD)
 SUBDIRS = $(WINSUBDIRS) $(CYGSUBDIRS) .
 
 EXTRA_DIST = generate \
-  testconfig.conf\
-  hostkey_gcrypt.c \
-  hostkey_openssl.c \
-  symcipher_gcrypt.c \
-  symcipher_openssl.c \
-  locking_gcrypt.c \
-  locking_gcrypt.h \
-  random_gcrypt.c \
-  random_openssl.c
+  testconfig.conf
 
 libgnunetutil_la_LDFLAGS = \
- -export-dynamic $(LIBLTDL) $(CRYPTLIB) $(SOLFLAGS) $(WINFLAGS) $(LIBS) -lgmp \
+ -export-dynamic $(LIBLTDL) $(LIBGCRYPT_LIBS) $(CRYPTLIB) $(SOLFLAGS) 
$(WINFLAGS) $(LIBS) -lgmp \
  -version-info 1:0:0
 
 generate_gnunetd_conf.c: generate
@@ -79,20 +64,24 @@
  generate_gnunetd_conf.c \
  generate_gnunet_conf.c \
  hashing.c \
- $(cryptofiles) \
+ hostkey_gcrypt.c \
  identity.c \
  initialize.c \
  io.c \
  ipcheck.c \
  kblockkey.c \
+ locking_gcrypt.c \
+ locking_gcrypt.h \
  logging.c \
  printhelp.c \
  port.c \
+ random_gcrypt.c \
  semaphore.c \
  shutdown.c \
  state.c \
  statuscalls.c \
  storage.c \
+ symcipher_gcrypt.c \
  tcp_return.c \
  tcpio.c \
  timer.c \

Modified: GNUnet/src/util/hashingtest.c
===================================================================
--- GNUnet/src/util/hashingtest.c       2005-03-08 15:56:11 UTC (rev 416)
+++ GNUnet/src/util/hashingtest.c       2005-03-08 19:58:07 UTC (rev 417)
@@ -4,14 +4,10 @@
  * @file util/hashingtest.c
  */
 
-#include "gnunet_util.h"
 #include "platform.h"
+#include "gnunet_util.h"
+#include "locking_gcrypt.h"
 
-#if ! USE_OPENSSL
-void initLockingGcrypt();
-void doneLockingGcrypt();
-#endif
-
 static int test(int number) {
   HashCode512 h1;
   HashCode512 h2;
@@ -41,13 +37,9 @@
 int main(int argc, char * argv[]) {
   int failureCount = 0;
 
-#if ! USE_OPENSSL
   initLockingGcrypt();
-#endif
   failureCount += testEncoding();
-#if ! USE_OPENSSL
   doneLockingGcrypt();
-#endif
   if (failureCount == 0)
     return 0;
   else 

Modified: GNUnet/src/util/hostkey_openssl.c
===================================================================
--- GNUnet/src/util/hostkey_openssl.c   2005-03-08 15:56:11 UTC (rev 416)
+++ GNUnet/src/util/hostkey_openssl.c   2005-03-08 19:58:07 UTC (rev 417)
@@ -431,7 +431,7 @@
   hash(block, 
        size,
        &hc);
-  if (1 != RSA_sign(NID_ripemd160,
+  if (1 != RSA_sign(NID_undef,
                    (unsigned char*)&hc,
                    sizeof(HashCode512),
                    &sig->sig[0],

Modified: GNUnet/src/util/hostkeytest.c
===================================================================
--- GNUnet/src/util/hostkeytest.c       2005-03-08 15:56:11 UTC (rev 416)
+++ GNUnet/src/util/hostkeytest.c       2005-03-08 19:58:07 UTC (rev 417)
@@ -5,6 +5,7 @@
  */
 
 #include "gnunet_util.h"
+#include "locking_gcrypt.h"
 #include "platform.h"
 
 #define TESTSTRING "Hello World\0"
@@ -228,17 +229,10 @@
 
 void initRAND(); /* hostkey_* */
 
-#if ! USE_OPENSSL
-void initLockingGcrypt();
-void doneLockingGcrypt();
-#endif
-
 int main(int argc, char * argv[]) {
   int failureCount = 0;
 
-#if USE_GCRYPT
   initLockingGcrypt();
-#endif
   initRAND();  
   if (OK != testEncryptDecryptSK())
      failureCount++;
@@ -248,9 +242,7 @@
     failureCount++;       
   if (OK != testPrivateKeyEncoding()) 
     failureCount++;
-#if USE_GCRYPT
   doneLockingGcrypt();
-#endif
 
   if (failureCount == 0)
     return 0;

Modified: GNUnet/src/util/initialize.c
===================================================================
--- GNUnet/src/util/initialize.c        2005-03-08 15:56:11 UTC (rev 416)
+++ GNUnet/src/util/initialize.c        2005-03-08 19:58:07 UTC (rev 417)
@@ -26,6 +26,7 @@
 
 #include "platform.h"
 #include "gnunet_util.h"
+#include "locking_gcrypt.h"
 
 /* internal prototypes... */
 void initXmalloc();
@@ -93,11 +94,6 @@
 void gnunet_util_initIO();
 void gnunet_util_doneIO();
 
-#if ! USE_OPENSSL
-void initLockingGcrypt();
-void doneLockingGcrypt();
-#endif
-
 /**
  * Initialize controlThread.
  */
@@ -123,9 +119,7 @@
   textdomain (PACKAGE);
 
   gnunet_util_initIO();
-#if ! USE_OPENSSL
   initLockingGcrypt();
-#endif
   initRAND();
   initXmalloc();
 #ifdef MINGW
@@ -171,9 +165,7 @@
 #ifdef MINGW
   ShutdownWinEnv();
 #endif
-#if ! USE_OPENSSL 
   doneLockingGcrypt();
-#endif
   doneXmalloc();
   gnunet_util_doneIO();
 }

Modified: GNUnet/src/util/kblockkey_test.c
===================================================================
--- GNUnet/src/util/kblockkey_test.c    2005-03-08 15:56:11 UTC (rev 416)
+++ GNUnet/src/util/kblockkey_test.c    2005-03-08 19:58:07 UTC (rev 417)
@@ -6,8 +6,8 @@
 
 #include "platform.h"
 #include "gnunet_util.h"
+#include "locking_gcrypt.h"
 
-
 #define TESTSTRING "Hello World\0"
 #define MAX_TESTVAL 20
 #define ITER 10
@@ -206,20 +206,13 @@
 
 void initRAND(); /* hostkey_* */
 
-#if ! USE_OPENSSL
-void initLockingGcrypt();
-void doneLockingGcrypt();
-#endif
 
-
 int main(int argc, char * argv[]) {
   int failureCount = 0;
   HashCode512 in;
   struct PrivateKey * hostkey;
 
-#if USE_GCRYPT
   initLockingGcrypt();
-#endif
   initRAND();  
   makeRandomId(&in);
 
@@ -240,9 +233,7 @@
   if (OK != testPrivateKeyEncoding(hostkey)) 
     failureCount++;
   freePrivateKey(hostkey);
-#if USE_GCRYPT
   doneLockingGcrypt();
-#endif
 
   if (failureCount == 0) {
     return 0;

Modified: GNUnet/src/util/locking_gcrypt.h
===================================================================
--- GNUnet/src/util/locking_gcrypt.h    2005-03-08 15:56:11 UTC (rev 416)
+++ GNUnet/src/util/locking_gcrypt.h    2005-03-08 19:58:07 UTC (rev 417)
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2001, 2002, 2003, 2004 Christian Grothoff (and other contributing 
authors)
+     (C) 2001, 2002, 2003, 2004, 2005 Christian Grothoff (and other 
contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -22,6 +22,10 @@
 #ifndef LOCKING_GCRYPT_H
 #define LOCKING_GCRYPT_H
 
+void initLockingGcrypt();
+
+void doneLockingGcrypt();
+
 void lockGcrypt();
 
 void unlockGcrypt();

Modified: GNUnet/src/util/random_openssl.c
===================================================================
--- GNUnet/src/util/random_openssl.c    2005-03-08 15:56:11 UTC (rev 416)
+++ GNUnet/src/util/random_openssl.c    2005-03-08 19:58:07 UTC (rev 417)
@@ -43,8 +43,8 @@
   unsigned int ret;
 
   GNUNET_ASSERT(i > 0);
-  ret = rand(); /* in case RAND_bytes fails, we got at least something! */
-  RAND_bytes((unsigned char*)&ret, sizeof(unsigned int));
+  if (1 != RAND_bytes((unsigned char*)&ret, sizeof(unsigned int)))
+    ret = rand(); /* in case RAND_bytes fails, we got at least something! */
   ret = ret % i;
   GNUNET_ASSERT((ret >= 0) && (ret < i));
   return ret;

Modified: GNUnet/src/util/symciphertest.c
===================================================================
--- GNUnet/src/util/symciphertest.c     2005-03-08 15:56:11 UTC (rev 416)
+++ GNUnet/src/util/symciphertest.c     2005-03-08 19:58:07 UTC (rev 417)
@@ -4,8 +4,9 @@
  * @file util/symciphertest.c
  */
 
-#include "gnunet_util.h"
 #include "platform.h"
+#include "gnunet_util.h"
+#include "locking_gcrypt.h"
 
 #define TESTSTRING "Hello World!"
 #define INITVALUE "InitializationVectorValue"
@@ -46,22 +47,13 @@
     return 0;
 }
 
-#if ! USE_OPENSSL
-void initLockingGcrypt();
-void doneLockingGcrypt();
-#endif
-
 int main(int argc, char * argv[]) {
   int failureCount = 0;
   
   GNUNET_ASSERT(strlen(INITVALUE) > sizeof(INITVECTOR));
-#if ! USE_OPENSSL
   initLockingGcrypt();
-#endif
   failureCount += testSymcipher();
-#if ! USE_OPENSSL
   doneLockingGcrypt();
-#endif
 
   if (failureCount == 0)
     return 0;

Modified: GNUnet/src/util/weakkeytest.c
===================================================================
--- GNUnet/src/util/weakkeytest.c       2005-03-08 15:56:11 UTC (rev 416)
+++ GNUnet/src/util/weakkeytest.c       2005-03-08 19:58:07 UTC (rev 417)
@@ -5,26 +5,21 @@
  * @file test/weakkeytest.c
  */
 
-#if USE_GCRYPT
-  #include <gcrypt.h>
-#endif
-
+#include "platform.h"
 #include "gnunet_util.h"
 
 #define MAX_WEAK_KEY_TRIALS 10000
 #define GENERATE_WEAK_KEYS 0
 #define WEAK_KEY_TESTSTRING "I hate weak keys."
 
-#if USE_GCRYPT
-void printWeakKey(SESSIONKEY* key) {
-    int i;
-    for (i = 0; i < SESSIONKEY_LEN; i++) {
-       printf("%x ", (int)(key->key[i]));
-    }
+static void printWeakKey(SESSIONKEY* key) {
+  int i;
+  for (i = 0; i < SESSIONKEY_LEN; i++) {
+    printf("%x ", (int)(key->key[i]));
+  }
 }
 
-int testWeakKey() {
-
+static int testWeakKey() {
   char result[100];  
   char res[100];
   int size;
@@ -78,8 +73,7 @@
     return 0;
 }
 
-int getWeakKeys() {
-
+static int getWeakKeys() {
   SESSIONKEY sessionkey;
   int number_of_weak_keys = 0;
   int number_of_runs;
@@ -127,11 +121,8 @@
 
   return number_of_weak_keys;
 }
-#endif
 
 int main(int argc, char * argv[]) {
-
-#if USE_GCRYPT
   int weak_keys; 
 
   if (GENERATE_WEAK_KEYS) {
@@ -151,9 +142,6 @@
     printf("WEAK KEY TEST FAILED.\n");
     return -1;
   }
-#else
-  return 0;
-#endif
 } 
 
 /* end of weakkeytest.c */

Modified: GNUnet-docs/WWW/download.php3
===================================================================
--- GNUnet-docs/WWW/download.php3       2005-03-08 15:56:11 UTC (rev 416)
+++ GNUnet-docs/WWW/download.php3       2005-03-08 19:58:07 UTC (rev 417)
@@ -16,7 +16,6 @@
  <li><strong><?php W("Required:"); ?></strong>
      <a href="http://www.gnu.org/software/gmp/";>GNU MP Bignum Library</a> 
(&gt;= 4.0.0)</li>
  <li><strong><?php W("Required:"); ?></strong>
-     <a href="http://www.openssl.org/";>OpenSSL</a> (&gt;= 0.95)  <?php 
W("or"); ?>
      <a href="http://www.gnu.org/directory/security/libgcrypt.html";>libgcrypt 
(&gt;= 1.2.0)</a></li>
  <li><strong><?php W("Required:"); ?></strong>
      <a href="/libextractor/">libextractor (&gt;= 0.4.2)</a></li>

Modified: branches/GNUnet06/src/server/connection.c
===================================================================
--- branches/GNUnet06/src/server/connection.c   2005-03-08 15:56:11 UTC (rev 
416)
+++ branches/GNUnet06/src/server/connection.c   2005-03-08 19:58:07 UTC (rev 
417)
@@ -2101,7 +2101,6 @@
      and then merge the values; but for now, let's just go
      hardcore and adjust all values rapidly */
   for (u=0;u<activePeerCount;u++) {
-    entries[u]->idealized_limit = 0;
     adjustedRR[u] = entries[u]->recently_received * cronMINUTES / 
timeDifference;
 
 #if DEBUG_CONNECTION





reply via email to

[Prev in Thread] Current Thread [Next in Thread]