[SCM] GNU gnutls branch, gnutls_3_0_x-2, updated. gnutls_3_0_19-34-g57f7620

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=57f762040318acd63541f4cb4711c37515024dcb

The branch, gnutls_3_0_x-2 has been updated
       via  57f762040318acd63541f4cb4711c37515024dcb (commit)
       via  476dc0bc7d0436bf510c83c04fcc2771f360e8ce (commit)
       via  0ac3685d6e6c82ded434d90aec58e4fffe0dad60 (commit)
      from  ef75c79382c2b12df38c7064a12fcdc00057fc50 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 57f762040318acd63541f4cb4711c37515024dcb
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun May 27 13:54:10 2012 +0200

    bumped version

commit 476dc0bc7d0436bf510c83c04fcc2771f360e8ce
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun May 27 13:52:21 2012 +0200

    corrected data copy

commit 0ac3685d6e6c82ded434d90aec58e4fffe0dad60
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun May 27 11:15:56 2012 +0200

    documented fix

-----------------------------------------------------------------------

Summary of changes:
 NEWS                      |    9 +++++++++
 configure.ac              |    2 +-
 cross.mk                  |   24 ++++++++++++++++++------
 lib/gnutls_session_pack.c |    8 ++++----
 m4/hooks.m4               |    6 +++---
 5 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/NEWS b/NEWS
index 9f8c3f4..5ce7d5d 100644
--- a/NEWS
+++ b/NEWS
@@ -4,11 +4,20 @@ See the end for copying conditions.
 
 * Version 3.0.20 (unreleased)
 
+** libgnutls: Check key identifiers when checking for an issuer.
+
 ** libgnutls: Added gnutls_pubkey_verify_hash2()
 
+** libgnutls: Added gnutls_certificate_set_x509_system_trust()
+that loads the trusted CA certificates from system locations
+(e.g. trusted storage in windows and CA bundle files in other systems).
+
 ** certtool: Added support for the URI subject alternative
 name type in certtool.
 
+** certtool: Increase to 128 the number of distinct options
+(e.g. dns_names) allowed.
+
 ** API and ABI modifications:
 gnutls_pk_to_sign: Added
 gnutls_pubkey_verify_hash2: Added
diff --git a/configure.ac b/configure.ac
index dc74ddd..f826704 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl Process this file with autoconf to produce a configure 
script.
 # USA
 
 AC_PREREQ(2.61)
-AC_INIT([GnuTLS], [3.0.19], address@hidden)
+AC_INIT([GnuTLS], [3.0.20], address@hidden)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/cross.mk b/cross.mk
index a5eb8fe..08f20dc 100644
--- a/cross.mk
+++ b/cross.mk
@@ -1,6 +1,6 @@
-
-GNUTLS_FILE:=gnutls-3.0.18.tar.xz
-GNUTLS_DIR:=gnutls-3.0.18
+GNUTLS_VERSION:=3.0.20
+GNUTLS_FILE:=gnutls-$(GNUTLS_VERSION).tar.xz
+GNUTLS_DIR:=gnutls-$(GNUTLS_VERSION)
 
 GMP_FILE:=gmp-5.0.4.tar.bz2
 GMP_DIR:=gmp-5.0.4
@@ -15,6 +15,7 @@ CROSS_DIR:=$(PWD)/win32
 BIN_DIR:=$(CROSS_DIR)/bin
 LIB_DIR:=$(CROSS_DIR)/lib
 HEADERS_DIR:=$(CROSS_DIR)/include
+DEVCPP_DIR:=$(PWD)/devcpp
 
 all: update-gpg-keys gnutls-w32
 
@@ -22,10 +23,19 @@ update-gpg-keys:
        gpg --recv-keys 96865171 B565716F D92765AF A8F4C2FD DB899F46
 
 $(GNUTLS_DIR)-w32.zip: $(LIB_DIR) $(BIN_DIR) $(GNUTLS_DIR)/.installed
-       rm -rf $(CROSS_DIR)/etc $(CROSS_DIR)/share
+       rm -rf $(CROSS_DIR)/etc $(CROSS_DIR)/share $(CROSS_DIR)/lib/include 
$(CROSS_DIR)/lib/pkgconfig
        cd $(CROSS_DIR) && zip -r $(PWD)/$@ *
        gpg --sign --detach $(GNUTLS_DIR)-w32.zip
 
+gnutls-$(GNUTLS_VERSION)-1gn.DevPak: $(GNUTLS_DIR)-w32.zip devcpp.tar
+       rm -rf $(DEVCPP_DIR)
+       mkdir -p $(DEVCPP_DIR)
+       cd $(DEVCPP_DIR) && unzip ../$(GNUTLS_DIR)-w32.zip 
+       cd $(DEVCPP_DIR) && tar xf ../devcpp.tar && sed -i 
's/@VERSION@/$(GNUTLS_VERSION)/g' gnutls.DevPackage
+       cd $(DEVCPP_DIR) && tar -cjf ../$@ .
+
+devpak: gnutls-$(GNUTLS_VERSION)-1gn.DevPak
+
 gnutls-w32: $(GNUTLS_DIR)-w32.zip
 
 nettle: $(NETTLE_DIR)/.installed
@@ -38,7 +48,7 @@ $(BIN_DIR):
 $(LIB_DIR):
        mkdir -p $(LIB_DIR)
 
-CONFIG_FLAGS := --prefix=$(CROSS_DIR) --host=i686-w64-mingw32 --enable-shared 
--disable-static --bindir=$(BIN_DIR) --libdir=$(LIB_DIR)
+CONFIG_FLAGS := --prefix=$(CROSS_DIR) --host=i686-w64-mingw32 --enable-shared 
--disable-static --bindir=$(BIN_DIR) --libdir=$(LIB_DIR) 
--includedir=$(HEADERS_DIR)
 
 $(P11_KIT_DIR)/.configured:
        test -f $(P11_KIT_FILE) || wget 
http://p11-glue.freedesktop.org/releases/$(P11_KIT_FILE)
@@ -62,12 +72,14 @@ $(GMP_DIR)/.configured:
        test -f $(GMP_FILE).sig || wget 
ftp://ftp.gmplib.org/pub/$(GMP_DIR)/$(GMP_FILE).sig
        gpg --verify $(GMP_FILE).sig
        test -d $(GMP_DIR) || tar -xf $(GMP_FILE)
-       cd $(GMP_DIR) && ./configure $(CONFIG_FLAGS) --enable-fat 
--exec-prefix=$(LIB_DIR) --oldincludedir=$(HEADERS_DIR) && cd ..
+       cd $(GMP_DIR) && ./configure $(CONFIG_FLAGS) --enable-fat 
--exec-prefix=$(LIB_DIR)  --oldincludedir=$(HEADERS_DIR) && cd ..
        touch $@
 
 $(GMP_DIR)/.installed: $(GMP_DIR)/.configured
        make -C $(GMP_DIR) -j2
        make -C $(GMP_DIR) install -i
+       mv $(LIB_DIR)/include/* $(HEADERS_DIR)/
+       rmdir $(LIB_DIR)/include/
        touch $@
 
 $(NETTLE_DIR)/.configured: $(GMP_DIR)/.installed
diff --git a/lib/gnutls_session_pack.c b/lib/gnutls_session_pack.c
index 77960dd..3e89b98 100644
--- a/lib/gnutls_session_pack.c
+++ b/lib/gnutls_session_pack.c
@@ -819,20 +819,20 @@ unpack_security_parameters (gnutls_session_t session, 
gnutls_buffer_st * ps)
   BUFFER_POP_NUM (ps, session->internals.resumed_security_parameters.version);
 
   BUFFER_POP (ps,
-              &session->internals.resumed_security_parameters.master_secret,
+              session->internals.resumed_security_parameters.master_secret,
               GNUTLS_MASTER_SIZE);
 
   BUFFER_POP (ps,
-              &session->internals.resumed_security_parameters.client_random,
+              session->internals.resumed_security_parameters.client_random,
               GNUTLS_RANDOM_SIZE);
   BUFFER_POP (ps,
-              &session->internals.resumed_security_parameters.server_random,
+              session->internals.resumed_security_parameters.server_random,
               GNUTLS_RANDOM_SIZE);
   BUFFER_POP_NUM (ps,
                   session->internals.
                   resumed_security_parameters.session_id_size);
 
-  BUFFER_POP (ps, &session->internals.resumed_security_parameters.session_id,
+  BUFFER_POP (ps, session->internals.resumed_security_parameters.session_id,
               session->internals.resumed_security_parameters.session_id_size);
 
   BUFFER_POP_NUM (ps,
diff --git a/m4/hooks.m4 b/m4/hooks.m4
index ec9e7d1..9443263 100644
--- a/m4/hooks.m4
+++ b/m4/hooks.m4
@@ -39,9 +39,9 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
   # Interfaces changed/added/removed:   CURRENT++       REVISION=0
   # Interfaces added:                             AGE++
   # Interfaces removed:                           AGE=0
-  AC_SUBST(LT_CURRENT, 36)
-  AC_SUBST(LT_REVISION, 1)
-  AC_SUBST(LT_AGE, 8)
+  AC_SUBST(LT_CURRENT, 37)
+  AC_SUBST(LT_REVISION, 2)
+  AC_SUBST(LT_AGE, 9)
 
   AC_SUBST(LT_SSL_CURRENT, 27)
   AC_SUBST(LT_SSL_REVISION, 2)


hooks/post-receive
-- 
GNU gnutls