[SCM] GNU gnutls branch, master, updated. gnutls_3_0_9-43-g78fea83

[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=78fea838ce924346b12e615c44d6b7274f3b898e

The branch, master has been updated
       via  78fea838ce924346b12e615c44d6b7274f3b898e (commit)
       via  c2de7463641d31662766ff95a0d2cc8aa90801b5 (commit)
       via  ed060c35c6977012e1eb5669b2af5551325c9c4e (commit)
       via  59821cf60e9ee33ee314a0c9abd8058411196f49 (commit)
       via  f6b42a5e54f4b155653dea44c51498ebfd379ffd (commit)
       via  b4abb6273b5463e478839f3c5878c7653801ecec (commit)
      from  4bcdbb03b14770ae7cd98ea4767dba9ef22c2500 (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 78fea838ce924346b12e615c44d6b7274f3b898e
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Dec 30 02:20:41 2011 +0200

    more files to ignore

commit c2de7463641d31662766ff95a0d2cc8aa90801b5
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Dec 30 02:19:40 2011 +0200

    Added missing function names.

commit ed060c35c6977012e1eb5669b2af5551325c9c4e
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Dec 30 02:18:54 2011 +0200

    Added a preliminary win32 compilation makefile.

commit 59821cf60e9ee33ee314a0c9abd8058411196f49
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Dec 30 02:18:45 2011 +0200

    win32 fixes

commit f6b42a5e54f4b155653dea44c51498ebfd379ffd
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Dec 30 01:24:35 2011 +0200

    do not build crywrap on win32

commit b4abb6273b5463e478839f3c5878c7653801ecec
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Dec 30 01:18:42 2011 +0200

    undefine possible system macros.

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

Summary of changes:
 .gitignore                      |    5 ++
 configure.ac                    |    4 ++
 cross.mk                        |   99 +++++++++++++++++++++++++++++++++++++++
 doc/Makefile.am                 |    8 ++-
 doc/manpages/Makefile.am        |    3 +-
 extra/includes/gnutls/openssl.h |    2 +
 6 files changed, 118 insertions(+), 3 deletions(-)
 create mode 100644 cross.mk

diff --git a/.gitignore b/.gitignore
index 001e106..7c60614 100644
--- a/.gitignore
+++ b/.gitignore
@@ -539,3 +539,8 @@ tests/slow/keygen
 tests/slow/gendh
 doc/reference/*.bak
 doc/manpages/gnutls_*.3
+doc/examples/ex-client-anon
+doc/examples/ex-client-dtls
+doc/examples/ex-client-x509
+doc/examples/ex-serv-x509
+tests/slow/cipher-test
diff --git a/configure.ac b/configure.ac
index ebc8625..7c0812e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -409,6 +409,8 @@ dnl Crywrap dependencies
 *** Checking dependencies for crywrap...
 ])
 
+if test "$have_win" != "yes"; then
+
 AC_CHECK_HEADERS([arpa/inet.h netinet/in.h sys/select.h sys/types.h 
sys/wait.h])
 
 dnl **********************
@@ -431,6 +433,8 @@ AC_CHECK_FUNCS([alarm atexit dup2 epoll_create kqueue 
memchr memset munmap \
 
 PKG_CHECK_MODULES(LIBIDN, libidn >= 0.0.0, [libidn=yes], [libidn=no])
 
+fi
+
 AM_CONDITIONAL(ENABLE_CRYWRAP, test "x$libidn" != "xno")
 
 dnl end of crywrap requirements
diff --git a/cross.mk b/cross.mk
new file mode 100644
index 0000000..f66747c
--- /dev/null
+++ b/cross.mk
@@ -0,0 +1,99 @@
+
+GNUTLS_FILE:=gnutls-3.0.9.tar.xz
+GNUTLS_DIR:=gnutls-3.0.9
+
+GMP_FILE:=gmp-5.0.2.tar.lz
+GMP_DIR:=gmp-5.0.2
+
+P11_KIT_FILE:=p11-kit-0.9.tar.gz
+P11_KIT_DIR:=p11-kit-0.9
+
+NETTLE_FILE:=nettle-2.4.tar.gz
+NETTLE_DIR:=nettle-2.4
+
+CROSS_DIR:=$(PWD)/win32
+BIN_DIR:=$(CROSS_DIR)/bin
+LIB_DIR:=$(CROSS_DIR)/lib
+HEADERS_DIR:=$(LIB_DIR)/include
+
+all: gnutls-win32
+
+$(GNUTLS_DIR)-win32.zip: $(LIB_DIR) $(BIN_DIR) $(GNUTLS_DIR)/.installed
+       cd $(CROSS_DIR) && zip -r $(PWD)/$@ *
+
+gnutls-win32: $(GNUTLS_DIR)-win32.zip
+
+nettle: $(NETTLE_DIR)/.installed
+
+gmp: $(GMP_DIR)/.installed
+
+$(BIN_DIR):
+       mkdir -p $(BIN_DIR)
+
+$(LIB_DIR):
+       mkdir -p $(LIB_DIR)
+       mkdir -p $(HEADERS_DIR)
+
+CONFIG_FLAGS := --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)
+       test -d $(P11_KIT_DIR) || tar -xf $(P11_KIT_FILE)
+       cd $(P11_KIT_DIR) && ./configure $(CONFIG_FLAGS) && cd ..
+       touch $@
+
+$(P11_KIT_DIR)/.installed: $(P11_KIT_DIR)/.configured
+       make -C $(P11_KIT_DIR) -j2
+       make -C $(P11_KIT_DIR) install -i
+       -rm -rf $(HEADERS_DIR)/p11-kit
+       -mv $(HEADERS_DIR)/p11-kit-1/p11-kit $(HEADERS_DIR)
+       -rmdir $(HEADERS_DIR)/p11-kit-1
+       rm -f $(BIN_DIR)/p11-kit.exe
+       touch $@
+
+$(GMP_DIR)/.configured: 
+       test -f $(GMP_FILE) || wget 
ftp://ftp.gmplib.org/pub/$(GMP_DIR)/$(GMP_FILE)
+       test -d $(GMP_DIR) || tar -xf $(GMP_FILE)
+       cd $(GMP_DIR) && ./configure $(CONFIG_FLAGS) --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
+       touch $@
+
+$(NETTLE_DIR)/.configured: $(GMP_DIR)/.installed
+       test -f $(NETTLE_FILE) || wget 
http://www.lysator.liu.se/~nisse/archive/$(NETTLE_FILE)
+       test -d $(NETTLE_DIR) || tar -xf $(NETTLE_FILE)
+       cd $(NETTLE_DIR) && CFLAGS="-I$(HEADERS_DIR)" 
CXXFLAGS="-I$(HEADERS_DIR)" ./configure $(CONFIG_FLAGS) 
--with-lib-path=$(LIB_DIR) && cd ..
+       touch $@
+
+#nettle messes up installation
+$(NETTLE_DIR)/.installed: $(NETTLE_DIR)/.configured
+       make -C $(NETTLE_DIR) -j2
+       make -C $(NETTLE_DIR) install -i
+       rm -f $(LIB_DIR)/libnettle.a $(LIB_DIR)/libhogweed.a 
$(BIN_DIR)/nettle-hash.exe $(BIN_DIR)/nettle-lfib-stream.exe 
$(BIN_DIR)/pkcs1-conv.exe $(BIN_DIR)/sexp-conv.exe
+       cp $(NETTLE_DIR)/libnettle.dll.a $(NETTLE_DIR)/libhogweed.dll.a 
$(LIB_DIR)/
+       cp $(NETTLE_DIR)/libnettle*.dll $(NETTLE_DIR)/libhogweed*.dll 
$(BIN_DIR)/
+       touch $@
+
+$(GNUTLS_DIR)/.installed: $(GNUTLS_DIR)/.configured
+       make -C $(GNUTLS_DIR) -j2
+       make -C $(GNUTLS_DIR) install -i
+       cp $(GNUTLS_DIR)/COPYING $(GNUTLS_DIR)/COPYING.LESSER $(CROSS_DIR)
+       touch $@
+
+$(GNUTLS_DIR)/.configured: $(NETTLE_DIR)/.installed $(P11_KIT_DIR)/.installed
+       test -f $(GNUTLS_FILE) || wget 
ftp://ftp.gnu.org/gnu/gnutls/$(GNUTLS_FILE)
+       test -d $(GNUTLS_DIR) || tar -xf $(GNUTLS_FILE)
+       cd $(GNUTLS_DIR) && \
+               P11_KIT_CFLAGS="-I$(HEADERS_DIR)" \
+               P11_KIT_LIBS="$(LIB_DIR)/libp11-kit.la" \
+               LDFLAGS="-L$(LIB_DIR)" CFLAGS="-I$(HEADERS_DIR)" 
CXXFLAGS="-I$(HEADERS_DIR)" \
+               ./configure $(CONFIG_FLAGS) --with-libnettle-prefix=$(LIB_DIR) \
+               --disable-openssl-compatibility && cd ..
+       touch $@
+
+clean:
+       rm -rf $(CROSS_DIR) $(GNUTLS_DIR)/.installed $(NETTLE_DIR)/.installed 
$(GMP_DIR)/.installed $(P11_KIT_DIR)/.installed
+
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d391260..b9b6ca5 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -198,12 +198,16 @@ crypto-api.texi: 
$(top_srcdir)/lib/includes/gnutls/crypto.h
        mv -f address@hidden $@
 
 # Generated texinfos.
-
+# for some reason it does not work when cross compiling
+if !WINDOWS
 gnutls_TEXINFOS += error_codes.texi algorithms.texi alerts.texi  enums.texi
+endif
+
 MAINTAINERCLEANFILES += error_codes.texi algorithms.texi enums.texi
 
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/lib/includes -I$(top_builddir)/lib/includes
+       -I$(top_builddir)/lib/includes -I$(top_srcdir)/lib/includes \
+       -I$(top_builddir)/
 
 EXTRA_PROGRAMS = errcodes printlist alert-printlist
 
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 4b7baed..4ca1b7e 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -215,7 +215,7 @@ APIMANS += gnutls_session_ticket_enable_server.3
 APIMANS += gnutls_key_generate.3
 APIMANS += gnutls_priority_init.3
 APIMANS += gnutls_priority_deinit.3
-APIMANS += gnutls_priority_get_cipher_suite.3
+APIMANS += gnutls_priority_get_cipher_suite_index.3
 APIMANS += gnutls_priority_set.3
 APIMANS += gnutls_priority_set_direct.3
 APIMANS += gnutls_set_default_priority.3
@@ -298,6 +298,7 @@ APIMANS += gnutls_session_set_ptr.3
 APIMANS += gnutls_session_get_ptr.3
 APIMANS += gnutls_openpgp_send_cert.3
 APIMANS += gnutls_fingerprint.3
+APIMANS += gnutls_random_art.3
 APIMANS += gnutls_srp_free_client_credentials.3
 APIMANS += gnutls_srp_allocate_client_credentials.3
 APIMANS += gnutls_srp_set_client_credentials.3
diff --git a/extra/includes/gnutls/openssl.h b/extra/includes/gnutls/openssl.h
index 86ae199..d176c15 100644
--- a/extra/includes/gnutls/openssl.h
+++ b/extra/includes/gnutls/openssl.h
@@ -92,6 +92,8 @@ extern "C"
 #define SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER (0x2)
 #define SSL_MODE_AUTO_RETRY (0x4)
 
+#undef X509_NAME
+#undef X509
   typedef gnutls_x509_dn X509_NAME;
   typedef gnutls_datum_t X509;
 


hooks/post-receive
-- 
GNU gnutls