diff options
| author | Daiki Ueno <ueno@gnu.org> | 2019-05-24 06:33:38 +0000 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2019-05-24 06:33:38 +0000 |
| commit | 2c7897531693ea0ea85d5f9cfa57ed35a20b9208 (patch) | |
| tree | 89776c3b960a308e660e72dc408a6586cac807d0 | |
| parent | eac062f478a940471c16c750fe7f080f5a4128c6 (diff) | |
| parent | 46555608c43a72877155c055ef069baf58e10890 (diff) | |
| download | gnutls-2c7897531693ea0ea85d5f9cfa57ed35a20b9208.tar.gz | |
Merge branch 'tmp-version-override' into 'master'
tests: prf-early fixes the global version
See merge request gnutls/gnutls!1009
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | lib/db.h | 2 | ||||
| -rw-r--r-- | lib/global.c | 2 | ||||
| -rw-r--r-- | lib/gnutls_int.h | 2 | ||||
| -rw-r--r-- | lib/libgnutls.map | 2 | ||||
| -rw-r--r-- | m4/hooks.m4 | 6 | ||||
| -rw-r--r-- | tests/tls13/prf-early.c | 3 |
7 files changed, 14 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 3d4589e02b..571ae4f7cc 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.63) dnl when updating version also update LT_REVISION in m4/hooks.m4 -AC_INIT([GnuTLS], [3.6.7], [bugs@gnutls.org]) +AC_INIT([GnuTLS], [3.6.8], [bugs@gnutls.org]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIRS([m4 src/gl/m4 src/libopts/m4 lib/unistring/m4]) AC_CANONICAL_HOST @@ -30,6 +30,6 @@ int _gnutls_server_restore_session(gnutls_session_t session, int _gnutls_check_resumed_params(gnutls_session_t session); -#define PACKED_SESSION_MAGIC ((0xfadebadd)+(GNUTLS_VERSION_NUMBER)) +#define PACKED_SESSION_MAGIC ((0xfadebadd)+(_gnutls_global_version)) #endif /* GNUTLS_LIB_DB_H */ diff --git a/lib/global.c b/lib/global.c index 2ff371f873..334148342e 100644 --- a/lib/global.c +++ b/lib/global.c @@ -79,6 +79,8 @@ gnutls_log_func _gnutls_log_func = NULL; gnutls_audit_log_func _gnutls_audit_log_func = NULL; int _gnutls_log_level = 0; /* default log level */ +unsigned int _gnutls_global_version = GNUTLS_VERSION_NUMBER; + static int _gnutls_global_init(unsigned constructor); static void _gnutls_global_deinit(unsigned destructor); diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h index da0a92ebcb..0e0942511d 100644 --- a/lib/gnutls_int.h +++ b/lib/gnutls_int.h @@ -1621,4 +1621,6 @@ get_certificate_type(gnutls_session_t session, #define CONSTCHECK_NOT_EQUAL(a, b) ((-((uint32_t)(a) ^ (uint32_t)(b))) >> 31) #define CONSTCHECK_EQUAL(a, b) (1U - CONSTCHECK_NOT_EQUAL(a, b)) +extern unsigned int _gnutls_global_version; + #endif /* GNUTLS_LIB_GNUTLS_INT_H */ diff --git a/lib/libgnutls.map b/lib/libgnutls.map index f200c841d7..836e75eb87 100644 --- a/lib/libgnutls.map +++ b/lib/libgnutls.map @@ -1347,6 +1347,8 @@ GNUTLS_PRIVATE_3_4 { _gnutls_x509_generalTime2gtime; # Internal symbols needed by tests/: + # by tests/tls13/prf-early.c + _gnutls_global_version; _gnutls_default_priority_string; _gnutls_supplemental_deinit; _gnutls_record_overhead; diff --git a/m4/hooks.m4 b/m4/hooks.m4 index 2c10fe4191..6eb010a92d 100644 --- a/m4/hooks.m4 +++ b/m4/hooks.m4 @@ -40,9 +40,9 @@ AC_DEFUN([LIBGNUTLS_HOOKS], # in CONTRIBUTION.md for more info. # # Interfaces removed: AGE=0 (+bump all symbol versions in .map) - AC_SUBST(LT_CURRENT, 53) - AC_SUBST(LT_REVISION, 2) - AC_SUBST(LT_AGE, 23) + AC_SUBST(LT_CURRENT, 54) + AC_SUBST(LT_REVISION, 0) + AC_SUBST(LT_AGE, 24) AC_SUBST(LT_SSL_CURRENT, 27) AC_SUBST(LT_SSL_REVISION, 2) diff --git a/tests/tls13/prf-early.c b/tests/tls13/prf-early.c index 758f78efe7..414b1db5ea 100644 --- a/tests/tls13/prf-early.c +++ b/tests/tls13/prf-early.c @@ -54,6 +54,8 @@ static void terminate(void); #define MAX_BUF 5*1024 #define MSG "Hello TLS" +extern unsigned int _gnutls_global_version; + /* This program tests whether the gnutls_prf() works as * expected. */ @@ -421,6 +423,7 @@ void doit(void) int i; int ret; + _gnutls_global_version = 0x030607; signal(SIGPIPE, SIG_IGN); for (i = 0; i < SESSIONS; i++) { |