diff options
| author | Simon Josefsson <simon@josefsson.org> | 2008-07-07 14:10:29 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2008-07-07 14:10:29 +0200 |
| commit | 26cdb90cdb68cc5e5ac110b5a2bc4341f3293dbd (patch) | |
| tree | cd00a688d06eb36aa23f25352e453e9e092acb2d | |
| parent | a0cb2f19139388aa3432ab05aaba471057e3ecc6 (diff) | |
| parent | d768f45a6a476410295fafc90259ab36c6ffdc15 (diff) | |
| download | gnutls_2_5_with_shishi.tar.gz | |
Merge branch 'master' into gnutls_2_5_with_shishignutls_2_5_with_shishi
Conflicts:
NEWS
configure.in
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | NEWS | 7 | ||||
| -rw-r--r-- | cfg.mk | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | lib/gnutls_dh_primes.c | 4 | ||||
| -rw-r--r-- | lib/minitasn1/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/opencdk/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/x509/Makefile.am | 2 |
8 files changed, 14 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 89f686186f..f7f31de4a8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ # along with this file; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-guile +DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc SUBDIRS = lgl gl includes lib libextra src doc tests po @@ -3,7 +3,12 @@ Copyright (C) 2004, 2005, 2006, 2007, 2008 Simon Josefsson Copyright (C) 2000, 2001, 2002, 2003, 2004 Nikos Mavrogiannopoulos See the end for copying conditions. -* Version 2.5.1.shishi.0 (unreleased) +* Version 2.5.2.shishi.0 (unreleased) + +* Version 2.5.2 (unreleased) + +** libgnutls: Fix bug in gnutls_dh_params_generate2. +The prime and generator was swapped. ** API and ABI modifications: No changes since last version. @@ -18,7 +18,7 @@ # along with this file; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -CFGFLAGS ?= --enable-developer-mode --enable-gtk-doc --disable-guile +CFGFLAGS ?= --enable-developer-mode --enable-gtk-doc INDENT_SOURCES = `find . -name \*.c|grep -v -e ^./lgl -e ^./gl -e ^./src/cfg -e -gaa.c -e asn1_tab.c` diff --git a/configure.in b/configure.in index a8235a6de7..4d900b77ac 100644 --- a/configure.in +++ b/configure.in @@ -22,7 +22,7 @@ dnl Process this file with autoconf to produce a configure script. # USA AC_PREREQ(2.61) -AC_INIT([GnuTLS], [2.5.1.shishi.0], [bug-gnutls@gnu.org]) +AC_INIT([GnuTLS], [2.5.2.shishi.0], [bug-gnutls@gnu.org]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([1.10 dist-bzip2]) diff --git a/lib/gnutls_dh_primes.c b/lib/gnutls_dh_primes.c index 524e48245d..e7a0b9aea2 100644 --- a/lib/gnutls_dh_primes.c +++ b/lib/gnutls_dh_primes.c @@ -191,8 +191,8 @@ gnutls_dh_params_generate2 (gnutls_dh_params_t params, unsigned int bits) return ret; } - params->params[0] = group.g; - params->params[1] = group.p; + params->params[0] = group.p; + params->params[1] = group.g; return 0; } diff --git a/lib/minitasn1/Makefile.am b/lib/minitasn1/Makefile.am index 371a1d2555..7f6860842d 100644 --- a/lib/minitasn1/Makefile.am +++ b/lib/minitasn1/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/lgl -I$(top_builddir)/lgl +AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/lgl -I$(top_builddir)/lgl noinst_LTLIBRARIES = libminitasn1.la diff --git a/lib/opencdk/Makefile.am b/lib/opencdk/Makefile.am index 4dcfeafdc8..b54ba907fa 100644 --- a/lib/opencdk/Makefile.am +++ b/lib/opencdk/Makefile.am @@ -20,7 +20,7 @@ # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301, USA -INCLUDES = -I$(top_srcdir)/lib \ +AM_CPPFLAGS = -I$(top_srcdir)/lib \ -I$(top_srcdir)/includes -I$(top_builddir)/includes \ -I$(top_srcdir)/lgl -I$(top_builddir)/lgl diff --git a/lib/x509/Makefile.am b/lib/x509/Makefile.am index 4702beb227..1d435410bc 100644 --- a/lib/x509/Makefile.am +++ b/lib/x509/Makefile.am @@ -18,7 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/lgl -I$(top_builddir)/lgl \ -I$(top_srcdir)/libextra -I$(top_srcdir)/lib/minitasn1 \ -I$(top_srcdir)/libextra/openpgp/ \ |