version 1.6

darrenjs · Apr 12, 2018 · ca6ad3b · ca6ad3b
1 parent ef0280c
commit ca6ad3b
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 unreleased
 ==========
 
+version 1.6
+===========
+
+Released 2018-04-12
+
 ## Added
 
 - support WAMP unregister (issue #21)
@@ -19,6 +24,8 @@ unreleased
 
 ## Fixed
 
+- Fix compatibility with OpenSSL 1.1 (Sven Neumann)
+
 - http headers checking now case-insensitive  (issue #28)
 
 - user callback functions not checked for null for unsolicited messages

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(wampcc)
 
 # Version number
 set (WAMPCC_VERSION_MAJOR 1)
-set (WAMPCC_VERSION_MINOR 5)
+set (WAMPCC_VERSION_MINOR 6)
 set (WAMPCC_VERSION "${WAMPCC_VERSION_MAJOR}.${WAMPCC_VERSION_MINOR}")
 # Include extra cmake modules
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")

diff --git a/configure.ac b/configure.ac
@@ -1,7 +1,7 @@
 
 #========== Initialisation ==========
 
-AC_INIT([wampcc], [1.5], [[email protected]], [wampcc], [ ] )
+AC_INIT([wampcc], [1.6], [[email protected]], [wampcc], [ ] )
 AC_PREREQ([2.59])
 
 AC_CONFIG_AUX_DIR([.])

diff --git a/include/wampcc/version.h b/include/wampcc/version.h
@@ -9,11 +9,11 @@
 #define WAMPCC_VERSION_H
 
 #define WAMPCC_PACKAGE_NAME "wampcc"
-#define WAMPCC_PACKAGE_VERSION "1.5"
-#define WAMPCC_PACKAGE_STRING "wampcc 1.5"
+#define WAMPCC_PACKAGE_VERSION "1.6"
+#define WAMPCC_PACKAGE_STRING "wampcc 1.6"
 
 #define WAMPCC_MAJOR_VERSION 1
-#define WAMPCC_MINOR_VERSION 5
+#define WAMPCC_MINOR_VERSION 6
 #define WAMPCC_MICRO_VERSION 0
 
 #endif
diff --git a/include/wampcc/wamp_session.h b/include/wampcc/wamp_session.h
@@ -84,7 +84,8 @@ struct auth_provider
                      const std::string& response)> check_cra;
 
   /* Obtain the secret for given user and realm. Required if check_cra is not
-   * provided. */
+   * provided. Note that the user secret can either be a naked password (if
+   * cra_salt is null), or cab be the derived secret (is salting is used). */
   std::function<std::string(const std::string& user,
                             const std::string& realm)> user_secret;
 

diff --git a/libs/json/CMakeLists.txt b/libs/json/CMakeLists.txt
@@ -38,8 +38,8 @@ if(BUILD_SHARED_LIBS)
   set_target_properties(wampcc_json_shared PROPERTIES OUTPUT_NAME wampcc_json)
 
   # Set library API version
-  set_property(TARGET wampcc_json_shared PROPERTY VERSION "5.0.0")
-  set_property(TARGET wampcc_json_shared PROPERTY SOVERSION 5 )
+  set_property(TARGET wampcc_json_shared PROPERTY VERSION "6.0.0")
+  set_property(TARGET wampcc_json_shared PROPERTY SOVERSION 6 )
 
   target_include_directories(wampcc_json_shared
                              PRIVATE ${PROJECT_SOURCE_DIR}/3rdparty/msgpack-c/include

diff --git a/libs/json/Makefile.am b/libs/json/Makefile.am
@@ -65,4 +65,4 @@ libwampcc_json_la_LIBADD=$(janssonlib)
 # - AGE: indicates compatibilty with previous version of the shlib.
 #
 #libwampcc_json_la_LDFLAGS = -version-info 0:0:0  /home/darrens/opt/jansson-2.7/lib/libjansson.la
-libwampcc_json_la_LDFLAGS = -version-info 5:0:0
+libwampcc_json_la_LDFLAGS = -version-info 6:0:0
diff --git a/libs/wampcc/CMakeLists.txt b/libs/wampcc/CMakeLists.txt
@@ -63,8 +63,8 @@ if(BUILD_SHARED_LIBS)
   set_target_properties(wampcc_shared PROPERTIES OUTPUT_NAME wampcc)
 
   # Set library API version
-  set_property(TARGET wampcc_shared PROPERTY VERSION "5.0.0")
-  set_property(TARGET wampcc_shared PROPERTY SOVERSION 5 )
+  set_property(TARGET wampcc_shared PROPERTY VERSION "6.0.0")
+  set_property(TARGET wampcc_shared PROPERTY SOVERSION 6 )
 
   target_include_directories(wampcc_shared PRIVATE
                              ${LIBUV_INCLUDE_DIRS} )

diff --git a/libs/wampcc/Makefile.am b/libs/wampcc/Makefile.am
@@ -58,4 +58,4 @@ libwampcc_la_LIBADD  =  -lpthread -lssl -lcrypto $(libuvlib)
 # - REVISION: revision of current version. Incr. base on internal changes.
 # - AGE: indicates compatibilty with previous version of the shlib.
 #
-libwampcc_la_LDFLAGS =  -version-info 5:0:0
+libwampcc_la_LDFLAGS =  -version-info 6:0:0