*** empty log message ***

4 files changed, 28 insertions, 27 deletions

diff --git a/README b/README
index 2111a2d98c..2068c1916b 100644
--- a/README
+++ b/README
@@ -1,35 +1,37 @@
 This is the GNU TLS library. More up to date information can be found
-at http://www.gnu.org/software/gnutls and http://www.gnutls.org
+at http://www.gnu.org/software/gnutls/ and http://www.gnutls.org/
 
-It is a TLS implementation for the GNU project. 
-It is currently under heavy development. (and still not ready for 
-real world programs)
+It is a TLS 1.0 and SSL 3.0 implementation for the GNU project. 
+It is currently under heavy development.
 
-* The library needs libgcrypt. Libgcrypt is part of gnupg (ftp.gnupg.org)
+- The library needs libgcrypt. You can find libgcrypt at
+ ftp://ftp.gnupg.org/pub/gcrypt/alpha/libgcrypt/
 
-* Documentation:
+- Documentation:
  view the doc/ directory and the examples in the src/ directory.
 
 
+****************************
 LICENSE ISSUES:
 
-The latest release of the gnutls library is covered under the GNU Lesser 
-GPL License, unlike previously released versions which were licensed under 
-the GPL. 
+Since the 0.4.2 version the gnutls library is covered under both the 
+GNU Lesser GPL, and GNU GPL Licenses. Previously released versions were 
+licensed under the GPL. (see COPYING and COPYING.LIB for the licenses)
 
-The LGPL license (found in COPYING.LIB) applies to all parts of the gnutls 
-library except for the "OPENPGP authentication" part, and the "SRP 
-authentication" part, which stay GPL (see the COPYING file).  Both of these 
-parts can be disabled at compile time.
+The LGPL license applies to all parts of the gnutls library except for the 
+"OPENPGP authentication" part, and the "SRP authentication" part, which are 
+only available under the GPL.  Both of these parts can be disabled at compile 
+time.
 
 In order to create a library under the LGPL run the configure script with 
 the following parameters:
     --disable-srp-authentication
     --disable-openpgp-authentication
 
-or the library will be under the GPL. In both cases the libraries are
-binary compatible. In the LGPL case the functions are replaced with
-stubs that always fail.
+This will disable the above authentication methods. If this is not done 
+the library will be only available under the GPL. In both cases the generated
+libraries are binary compatible. In the LGPL case the missing functions are 
+replaced with stubs that always fail.
 
 The rationale behind this license change is that given the fact that other 
 free libraries with similar functionality exist, keeping the gnutls library 
@@ -42,6 +44,7 @@ the users of the code that it covers.
 See http://www.gnu.org/philosophy/why-not-lgpl.html for more explanation.
 
 
+****************************
 BUGS:
 
 Currently gnuTLS needs a lot of testing. By notifying the developers
@@ -50,4 +53,3 @@ important and expensive. If you think you found a bug,
 report it to bug-gnutls@gnu.org, together with the needed information,
 in order for developers to reproduce it. 
 
-
diff --git a/configure.in b/configure.in
index 8c61d1f15e..866bee7b90 100644
--- a/configure.in
+++ b/configure.in
@@ -336,13 +336,13 @@ AC_CONFIG_COMMANDS([lib/gnutls.h],[[
 ]],[[]])
 
 AC_CONFIG_COMMANDS_POST( 
-	echo "*****************"
+	echo "***************************"
 if test x$ac_enable_srp = xno && test x$ac_enable_openpgp = xno;then
-	echo "* License: LGPL *"
+	echo "* License: GNU Lesser GPL *"
 else
-	echo "* License: GPL  *"
+	echo "* License: GNU GPL        *"
 fi
-	echo "*****************"
+	echo "***************************"
 	echo "(see the README file)"
 	echo ""
 )
diff --git a/src/prime.c b/src/prime.c
index d09a027693..dfdf185c76 100644
--- a/src/prime.c
+++ b/src/prime.c
@@ -22,12 +22,10 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include "../lib/defines.h"
-#include "../lib/gnutls_int.h"
-#include "../lib/gnutls_srp.h"
-#include "../lib/crypt.h"
-#include "../lib/x509_b64.h"
 #include "prime-gaa.h"
+#include <gcrypt.h>
+#include "../lib/gnutls.h"
+#include "../lib/defines.h"
 
 MPI _gcry_generate_elg_prime( int mode, unsigned pbits, unsigned qbits,
 	                MPI g, MPI **ret_factors );
@@ -48,7 +46,7 @@ int main(int argc, char **argv)
 	gnutls_global_init();
 
 	fprintf(stderr, "Generating prime...");
-//	gcry_control (GCRYCTL_SET_VERBOSITY, (int)0);
+	gcry_control (GCRYCTL_SET_VERBOSITY, (int)0);
 	
 	/* this is an emulation of Michael Wiener's table
 	 * bad emulation.
diff --git a/src/tests.c b/src/tests.c
index 540add099f..a9c404171f 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -22,6 +22,7 @@
 #include <unistd.h>
 #include <signal.h>
 #include <stdlib.h>
+#include <string.h>
 
 extern GNUTLS_SRP_CLIENT_CREDENTIALS srp_cred;
 extern GNUTLS_ANON_CLIENT_CREDENTIALS anon_cred;