[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls_3_1_3-72-gc7b89cd
|
From: |
Nikos Mavrogiannopoulos |
|
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls_3_1_3-72-gc7b89cd |
|
Date: |
Sat, 03 Nov 2012 11:03:05 +0000 |
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=c7b89cd1fc7dd40c72b2c23bd7f4c125c3aeaed1
The branch, master has been updated
via c7b89cd1fc7dd40c72b2c23bd7f4c125c3aeaed1 (commit)
via c7e20d396a57201ae1ccab4f6d96a6d7ffcbf55a (commit)
via 6c97c1bdcdc97e8004c0bd6989ce920528cf1d3f (commit)
via 74312305c6c05eb260e6b464725b9153dd50a6f0 (commit)
via cb293be293e5f2d40c875184d5f69d698ac316e1 (commit)
via 28d88b39602b1e5f56ef171ab57b6b37167a4e9b (commit)
via f7155b25e64d3ec40f3cbd007734cd4629ab5022 (commit)
from 160abd45cee67e4c5043dd0fc47509863bd5ba4c (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 c7b89cd1fc7dd40c72b2c23bd7f4c125c3aeaed1
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Fri Nov 2 20:17:01 2012 +0100
undefine macro from win32 headers which clashes autogened macros.
commit c7e20d396a57201ae1ccab4f6d96a6d7ffcbf55a
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Fri Nov 2 20:07:18 2012 +0100
bumped version and removed unused dependency
commit 6c97c1bdcdc97e8004c0bd6989ce920528cf1d3f
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Fri Nov 2 20:03:40 2012 +0100
added new functions
commit 74312305c6c05eb260e6b464725b9153dd50a6f0
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Fri Nov 2 19:58:48 2012 +0100
bumped version
commit cb293be293e5f2d40c875184d5f69d698ac316e1
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Fri Nov 2 19:58:37 2012 +0100
disable libdane when cross-building.
commit 28d88b39602b1e5f56ef171ab57b6b37167a4e9b
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Fri Nov 2 16:08:49 2012 +0100
gnutls_srtp_get_keys() returns the size of the key material
commit f7155b25e64d3ec40f3cbd007734cd4629ab5022
Author: Nikos Mavrogiannopoulos <address@hidden>
Date: Fri Nov 2 14:21:30 2012 +0100
corrected copyright
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 2 +-
cross.mk | 4 ++--
doc/Makefile.am | 25 +++++++++++++++++++++----
doc/manpages/Makefile.am | 9 +++++++++
lib/ext/srtp.c | 7 ++++---
libdane/dane-params.c | 2 +-
libdane/errors.c | 2 +-
m4/hooks.m4 | 8 ++++----
src/common.h | 1 +
9 files changed, 44 insertions(+), 16 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1d23cb4..736f815 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.1.3], address@hidden)
+AC_INIT([GnuTLS], [3.1.4], address@hidden)
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/cross.mk b/cross.mk
index 6dab590..9b5ba2c 100644
--- a/cross.mk
+++ b/cross.mk
@@ -1,4 +1,4 @@
-GNUTLS_VERSION:=3.1.2
+GNUTLS_VERSION:=3.1.4
GNUTLS_FILE:=gnutls-$(GNUTLS_VERSION).tar.xz
GNUTLS_DIR:=gnutls-$(GNUTLS_VERSION)
@@ -119,7 +119,7 @@ $(GNUTLS_DIR)/.configured: $(NETTLE_DIR)/.installed
$(P11_KIT_DIR)/.installed
P11_KIT_LIBS="$(LIB_DIR)/libp11-kit.la" \
LDFLAGS="-L$(LIB_DIR)" CFLAGS="-I$(HEADERS_DIR)"
CXXFLAGS="-I$(HEADERS_DIR)" \
./configure $(CONFIG_FLAGS) --enable-local-libopts
--with-libnettle-prefix=$(LIB_DIR) \
- --disable-openssl-compatibility --with-included-libtasn1 && cd
..
+ --disable-libdane --disable-openssl-compatibility
--with-included-libtasn1 && cd ..
touch $@
clean:
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 400c183..c0fd98c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -483,7 +483,7 @@ ENUMS += enums/dane_cert_type_t
ENUMS += enums/dane_cert_usage_t
ENUMS += enums/dane_match_type_t
ENUMS += enums/dane_query_status_t
-ENUMS += enums/dane_verify_flags_t
+ENUMS += enums/dane_state_flags_t
ENUMS += enums/dane_verify_status_t
ENUMS += enums/gnutls_alert_description_t
ENUMS += enums/gnutls_alert_level_t
@@ -525,6 +525,7 @@ ENUMS += enums/gnutls_rnd_level_t
ENUMS += enums/gnutls_sec_param_t
ENUMS += enums/gnutls_server_name_type_t
ENUMS += enums/gnutls_sign_algorithm_t
+ENUMS += enums/gnutls_srtp_profile_t
ENUMS += enums/gnutls_supplemental_data_format_type_t
ENUMS += enums/gnutls_tpmkey_fmt_t
ENUMS += enums/gnutls_x509_crl_reason_t
@@ -532,6 +533,12 @@ ENUMS += enums/gnutls_x509_crt_fmt_t
ENUMS += enums/gnutls_x509_subject_alt_name_t
FUNCS =
+FUNCS += functions/dane_cert_type_name
+FUNCS += functions/dane_cert_type_name.short
+FUNCS += functions/dane_cert_usage_name
+FUNCS += functions/dane_cert_usage_name.short
+FUNCS += functions/dane_match_type_name
+FUNCS += functions/dane_match_type_name.short
FUNCS += functions/dane_query_data
FUNCS += functions/dane_query_data.short
FUNCS += functions/dane_query_deinit
@@ -548,6 +555,8 @@ FUNCS += functions/dane_state_init
FUNCS += functions/dane_state_init.short
FUNCS += functions/dane_strerror
FUNCS += functions/dane_strerror.short
+FUNCS += functions/dane_verification_status_print
+FUNCS += functions/dane_verification_status_print.short
FUNCS += functions/dane_verify_crt
FUNCS += functions/dane_verify_crt.short
FUNCS += functions/dane_verify_session_crt
@@ -686,8 +695,12 @@ FUNCS += functions/gnutls_certificate_type_list
FUNCS += functions/gnutls_certificate_type_list.short
FUNCS += functions/gnutls_certificate_type_set_priority
FUNCS += functions/gnutls_certificate_type_set_priority.short
+FUNCS += functions/gnutls_certificate_verification_status_print
+FUNCS += functions/gnutls_certificate_verification_status_print.short
FUNCS += functions/gnutls_certificate_verify_peers2
FUNCS += functions/gnutls_certificate_verify_peers2.short
+FUNCS += functions/gnutls_certificate_verify_peers3
+FUNCS += functions/gnutls_certificate_verify_peers3.short
FUNCS += functions/gnutls_check_version
FUNCS += functions/gnutls_check_version.short
FUNCS += functions/gnutls_cipher_add_auth
@@ -1544,6 +1557,8 @@ FUNCS += functions/gnutls_session_get_data2
FUNCS += functions/gnutls_session_get_data2.short
FUNCS += functions/gnutls_session_get_id
FUNCS += functions/gnutls_session_get_id.short
+FUNCS += functions/gnutls_session_get_id2
+FUNCS += functions/gnutls_session_get_id2.short
FUNCS += functions/gnutls_session_get_ptr
FUNCS += functions/gnutls_session_get_ptr.short
FUNCS += functions/gnutls_session_get_random
@@ -1616,8 +1631,10 @@ FUNCS +=
functions/gnutls_srp_set_server_credentials_function
FUNCS += functions/gnutls_srp_set_server_credentials_function.short
FUNCS += functions/gnutls_srp_verifier
FUNCS += functions/gnutls_srp_verifier.short
-FUNCS += functions/gnutls_srtp_get_profile_by_name
-FUNCS += functions/gnutls_srtp_get_profile_by_name.short
+FUNCS += functions/gnutls_srtp_get_keys
+FUNCS += functions/gnutls_srtp_get_keys.short
+FUNCS += functions/gnutls_srtp_get_profile_id
+FUNCS += functions/gnutls_srtp_get_profile_id.short
FUNCS += functions/gnutls_srtp_get_profile_name
FUNCS += functions/gnutls_srtp_get_profile_name.short
FUNCS += functions/gnutls_srtp_get_selected_profile
@@ -1625,7 +1642,7 @@ FUNCS += functions/gnutls_srtp_get_selected_profile.short
FUNCS += functions/gnutls_srtp_set_profile
FUNCS += functions/gnutls_srtp_set_profile.short
FUNCS += functions/gnutls_srtp_set_profile_direct
-FUNCS += functions/gnutls_srtp_set_profiles_direct.short
+FUNCS += functions/gnutls_srtp_set_profile_direct.short
FUNCS += functions/gnutls_store_commitment
FUNCS += functions/gnutls_store_commitment.short
FUNCS += functions/gnutls_store_pubkey
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 1ef5a79..3b56904 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -155,7 +155,9 @@ APIMANS += gnutls_certificate_type_get_id.3
APIMANS += gnutls_certificate_type_get_name.3
APIMANS += gnutls_certificate_type_list.3
APIMANS += gnutls_certificate_type_set_priority.3
+APIMANS += gnutls_certificate_verification_status_print.3
APIMANS += gnutls_certificate_verify_peers2.3
+APIMANS += gnutls_certificate_verify_peers3.3
APIMANS += gnutls_check_version.3
APIMANS += gnutls_cipher_add_auth.3
APIMANS += gnutls_cipher_decrypt.3
@@ -584,6 +586,7 @@ APIMANS += gnutls_session_enable_compatibility_mode.3
APIMANS += gnutls_session_get_data.3
APIMANS += gnutls_session_get_data2.3
APIMANS += gnutls_session_get_id.3
+APIMANS += gnutls_session_get_id2.3
APIMANS += gnutls_session_get_ptr.3
APIMANS += gnutls_session_get_random.3
APIMANS += gnutls_session_is_resumed.3
@@ -620,6 +623,12 @@ APIMANS += gnutls_srp_set_prime_bits.3
APIMANS += gnutls_srp_set_server_credentials_file.3
APIMANS += gnutls_srp_set_server_credentials_function.3
APIMANS += gnutls_srp_verifier.3
+APIMANS += gnutls_srtp_get_keys.3
+APIMANS += gnutls_srtp_get_profile_id.3
+APIMANS += gnutls_srtp_get_profile_name.3
+APIMANS += gnutls_srtp_get_selected_profile.3
+APIMANS += gnutls_srtp_set_profile.3
+APIMANS += gnutls_srtp_set_profile_direct.3
APIMANS += gnutls_store_commitment.3
APIMANS += gnutls_store_pubkey.3
APIMANS += gnutls_strerror.3
diff --git a/lib/ext/srtp.c b/lib/ext/srtp.c
index e989911..35e99fa 100644
--- a/lib/ext/srtp.c
+++ b/lib/ext/srtp.c
@@ -451,8 +451,9 @@ gnutls_srtp_set_profile_direct (gnutls_session_t session,
* and @server_salt are convenience datums that point inside the key material.
The may
* be %NULL.
*
- * Returns: %GNUTLS_E_SHORT_MEMORY_BUFFER if the buffer given is not
sufficient,
- * %GNUTLS_E_SUCCESS on success, or an error code.
+ * Returns: On success the size of the key material is returned,
+ * %GNUTLS_E_SHORT_MEMORY_BUFFER if the buffer given is not sufficient,
+ * or a negative error code.
*
* Since 3.1.4
**/
@@ -515,7 +516,7 @@ uint8_t *km = key_material;
server_salt->size = p->salt_length;
}
- return 0;
+ return msize;
}
static void
diff --git a/libdane/dane-params.c b/libdane/dane-params.c
index 53d8473..a9384c1 100644
--- a/libdane/dane-params.c
+++ b/libdane/dane-params.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 KU Leuven
+ * Copyright (C) 2012 Free Software Foundation
*
* Author: Nikos Mavrogiannopoulos
*
diff --git a/libdane/errors.c b/libdane/errors.c
index 0753265..d08f509 100644
--- a/libdane/errors.c
+++ b/libdane/errors.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2012 KU Leuven
+ * Copyright (C) 2012 Free Software Foundation
*
* Author: Nikos Mavrogiannopoulos
*
diff --git a/m4/hooks.m4 b/m4/hooks.m4
index 2c56b00..6117e83 100644
--- a/m4/hooks.m4
+++ b/m4/hooks.m4
@@ -39,17 +39,17 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
# Interfaces changed/added/removed: CURRENT++ REVISION=0
# Interfaces added: AGE++
# Interfaces removed: AGE=0
- AC_SUBST(LT_CURRENT, 41)
+ AC_SUBST(LT_CURRENT, 42)
AC_SUBST(LT_REVISION, 0)
- AC_SUBST(LT_AGE, 13)
+ AC_SUBST(LT_AGE, 14)
AC_SUBST(LT_SSL_CURRENT, 27)
AC_SUBST(LT_SSL_REVISION, 2)
AC_SUBST(LT_SSL_AGE, 0)
- AC_SUBST(LT_DANE_CURRENT, 0)
+ AC_SUBST(LT_DANE_CURRENT, 1)
AC_SUBST(LT_DANE_REVISION, 0)
- AC_SUBST(LT_DANE_AGE, 0)
+ AC_SUBST(LT_DANE_AGE, 1)
AC_SUBST(CXX_LT_CURRENT, 29)
AC_SUBST(CXX_LT_REVISION, 0)
diff --git a/src/common.h b/src/common.h
index 2fac7ee..2f705f1 100644
--- a/src/common.h
+++ b/src/common.h
@@ -34,6 +34,7 @@
#ifdef _WIN32
#include <io.h>
#include <winbase.h>
+#undef OCSP_RESPONSE
#endif
#ifndef __attribute__
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls_3_1_3-72-gc7b89cd,
Nikos Mavrogiannopoulos <=