*** empty log message ***

7 files changed, 15 insertions, 12 deletions

diff --git a/configure.in b/configure.in
index 4af2779783..c6c0638109 100644
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,7 @@ AC_DEFINE_UNQUOTED(T_OS, "$target_os", [OS name])
 dnl Gnutls Version
 GNUTLS_MAJOR_VERSION=0
 GNUTLS_MINOR_VERSION=5
-GNUTLS_MICRO_VERSION=7
+GNUTLS_MICRO_VERSION=8
 GNUTLS_VERSION=$GNUTLS_MAJOR_VERSION.$GNUTLS_MINOR_VERSION.$GNUTLS_MICRO_VERSION
 
 AC_DEFINE_UNQUOTED(GNUTLS_VERSION, "$GNUTLS_VERSION", [version of gnutls])
@@ -116,10 +116,9 @@ affect compiling.])
 if test $ac_cv_c_compiler_gnu != no; then
 
 	if test x$opt_developer_mode = xyes; then
-
-	  CFLAGS="${CFLAGS} -ggdb3 -Wall -Wpointer-arith -Wstrict-prototypes" # -Werror
+	  CFLAGS="${CFLAGS} -Wall -Wpointer-arith -Wstrict-prototypes" # -Werror
 	else
-	  CFLAGS="${CFLAGS} -O2 -finline-functions -fexpensive-optimizations -fomit-frame-pointer"
+	  CFLAGS="${CFLAGS} -O2 -finline-functions"
 	fi
 
 	if test x$opt_dmalloc_mode = xyes; then
@@ -154,7 +153,7 @@ AC_HEADER_TIME
 AC_CHECK_HEADERS(unistd.h pwd.h strings.h stdarg.h)
 AC_CHECK_HEADERS(sys/stat.h sys/types.h sys/socket.h)
 AC_CHECK_HEADERS(errno.h sys/time.h time.h)
-AC_CHECK_FUNCS(bzero memset memmove bcopy,,)
+AC_CHECK_FUNCS(bzero memset memmove bcopy memcmp memcpy,,)
 AC_FUNC_ALLOCA
 
 
diff --git a/doc/TODO b/doc/TODO
index 142c003629..6a23bdfbe8 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -6,6 +6,7 @@ Current list:
 + Add ability to read PKCS-12 structures (certificate and private key)
 * Add support for the certificate authenticated SRP cipher suites
 * Add option to read the SRP parameters using a callback (server side)
+* Add functions to generate SRP parameters and SRP verifiers
 * Convert documentation to texinfo format
 * Merge common stuff in DHE and DHA key exchange
 * Add support for certificate CRLs in certificate verification
diff --git a/doc/tex/alert.tex b/doc/tex/alert.tex
index b69635348f..ee98590ed0 100644
--- a/doc/tex/alert.tex
+++ b/doc/tex/alert.tex
@@ -21,8 +21,8 @@ extreme care for the alert information not to leak, to a possible attacker
 \begin{itemize}
 \item \printfunc{gnutls_alert_send}{gnutls\_alert\_send}:
 to send an alert signal.
-\item \printfunc{gnutls_alert_send_appropriate}{gnutls\_alert\_send\_appropriate}:
-to send an alert signal that depends on a given gnutls error number.
+\item \printfunc{gnutls_error_to_alert}{gnutls\_error\_to\_alert}:
+to map a gnutls error number to an alert signal.
 \item \printfunc{gnutls_alert_get}{gnutls\_alert\_get}:
 returns the last received alert.
 \item \printfunc{gnutls_alert_get_name}{gnutls\_alert\_get\_name}:
diff --git a/doc/tex/auth.tex b/doc/tex/auth.tex
index 429cb1cd98..6f6c7530e7 100644
--- a/doc/tex/auth.tex
+++ b/doc/tex/auth.tex
@@ -99,9 +99,8 @@ SRP & Authentication using the SRP protocol.
 \caption{Supported SRP key exchange algorithms}
 \label{fig:srp}
 
+\end{figure}
+
 \gnutls{} includes a program to manipulate the required for SRP
 authentication. See \ref{srpcrypt} on page \pageref{srpcrypt} for
 more information.
-
-\end{figure}
-
diff --git a/doc/tex/programs.tex b/doc/tex/programs.tex
index f255fefe20..da82f636dd 100644
--- a/doc/tex/programs.tex
+++ b/doc/tex/programs.tex
@@ -5,8 +5,8 @@
 
 The ``gnutls-srpcrypt'' is a very simple program that emulates the programs in the libsrp 
 found in \htmladdnormallink{http://srp.stanford.edu}{http://srp.stanford.edu}.
-It is intended for use in places where you don't expect srp
-authentication to be the performed for system users.
+It is intended for use in places where you don't expect SRP
+authentication to be the used for system users.
 
 Traditionaly libsrp used two files. One called 'tpasswd' which holds usernames 
 and verifiers, and 'tpasswd.conf' which holds generators and primes.
diff --git a/lib/gnutls_alert.c b/lib/gnutls_alert.c
index 8e165a5513..deb93f20e4 100644
--- a/lib/gnutls_alert.c
+++ b/lib/gnutls_alert.c
@@ -162,6 +162,7 @@ int _level = -1;
                         break;
 		case GNUTLS_E_UNKNOWN_CIPHER_SUITE:
 		case GNUTLS_E_UNKNOWN_COMPRESSION_ALGORITHM:
+                case GNUTLS_E_RECEIVED_ILLEGAL_EXTENSION:
                         ret = GNUTLS_A_HANDSHAKE_FAILURE;
 			_level = GNUTLS_AL_FATAL;
                         break;
diff --git a/src/crypt.c b/src/crypt.c
index 9c8d31e91e..eb7d04420c 100644
--- a/src/crypt.c
+++ b/src/crypt.c
@@ -61,6 +61,9 @@ int generate_create_conf(char *tpasswd_conf, int bits)
 
 	_gnutls_srp_generate_prime(&g, &n, bits);
 	sprintf(line, "%d:%s:%s\n", index, n, g);
+	
+	gnutls_free( n);
+	gnutls_free( g);
 
 	fwrite(line, 1, strlen(line), fd);