From ec3a617d40b1a9e4c43f19cf14faeab3c17e2d40 Mon Sep 17 00:00:00 2001 From: Paul Bakker Date: Wed, 9 Jul 2014 10:21:28 +0200 Subject: [PATCH] Make ready for release of 1.3.8 and soversion 7 --- ChangeLog | 6 +----- doxygen/input/doc_mainpage.h | 2 +- doxygen/polarssl.doxyfile | 2 +- include/polarssl/version.h | 8 ++++---- library/CMakeLists.txt | 2 +- library/Makefile | 4 ++-- library/version_features.c | 6 ++++++ tests/suites/test_suite_version.data | 4 ++-- visualc/VS2010/PolarSSL.vcxproj | 1 + visualc/VS6/polarssl.dsp | 4 ++++ 10 files changed, 23 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e99e263a..eb3889d91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,6 @@ PolarSSL ChangeLog (Sorted per branch, date) -TODO: bump SOVERSION for ABI change -(internal-but-not-static function x509_get_sig_alg() changed prototype) -(and various x509 structures got a new member) - -= PolarSSL 1.3 branch += PolarSSL 1.3.8 branch (not yet released) Security * Fix length checking for AEAD ciphersuites (found by Codenomicon). It was possible to crash the server (and client) using crafted messages diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h index df88d2fb1..0f36db72e 100644 --- a/doxygen/input/doc_mainpage.h +++ b/doxygen/input/doc_mainpage.h @@ -4,7 +4,7 @@ */ /** - * @mainpage PolarSSL v1.3.7 source code documentation + * @mainpage PolarSSL v1.3.8 source code documentation * * This documentation describes the internal structure of PolarSSL. It was * automatically generated from specially formatted comment blocks in diff --git a/doxygen/polarssl.doxyfile b/doxygen/polarssl.doxyfile index 18362d595..64e4a8d75 100644 --- a/doxygen/polarssl.doxyfile +++ b/doxygen/polarssl.doxyfile @@ -28,7 +28,7 @@ DOXYFILE_ENCODING = UTF-8 # identify the project. Note that if you do not use Doxywizard you need # to put quotes around the project name if it contains spaces. -PROJECT_NAME = "PolarSSL v1.3.7" +PROJECT_NAME = "PolarSSL v1.3.8" # The PROJECT_NUMBER tag can be used to enter a project or revision number. # This could be handy for archiving the generated documentation or diff --git a/include/polarssl/version.h b/include/polarssl/version.h index 2e1e64af6..1ee2a3b5a 100644 --- a/include/polarssl/version.h +++ b/include/polarssl/version.h @@ -43,16 +43,16 @@ */ #define POLARSSL_VERSION_MAJOR 1 #define POLARSSL_VERSION_MINOR 3 -#define POLARSSL_VERSION_PATCH 7 +#define POLARSSL_VERSION_PATCH 8 /** * The single version number has the following structure: * MMNNPP00 * Major version | Minor version | Patch version */ -#define POLARSSL_VERSION_NUMBER 0x01030700 -#define POLARSSL_VERSION_STRING "1.3.7" -#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.3.7" +#define POLARSSL_VERSION_NUMBER 0x01030800 +#define POLARSSL_VERSION_STRING "1.3.8" +#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.3.8" #if defined(POLARSSL_VERSION_C) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index c57e14f2b..bc986eee4 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -118,7 +118,7 @@ endif() if(USE_SHARED_POLARSSL_LIBRARY) add_library(polarssl SHARED ${src}) - set_target_properties(polarssl PROPERTIES VERSION 1.3.7 SOVERSION 6) + set_target_properties(polarssl PROPERTIES VERSION 1.3.8 SOVERSION 7) target_link_libraries(polarssl ${libs}) diff --git a/library/Makefile b/library/Makefile index 281353ad7..d637417c5 100644 --- a/library/Makefile +++ b/library/Makefile @@ -22,9 +22,9 @@ ifdef SHARED CFLAGS += -fPIC endif -SONAME=libpolarssl.so.6 +SONAME=libpolarssl.so.7 -DLEXT=so.6 +DLEXT=so.7 # OSX shared library extension: # DLEXT=dylib diff --git a/library/version_features.c b/library/version_features.c index 8dc530a6d..10231987f 100644 --- a/library/version_features.c +++ b/library/version_features.c @@ -147,6 +147,9 @@ const char *features[] = { #if defined(POLARSSL_ENABLE_WEAK_CIPHERSUITES) "POLARSSL_ENABLE_WEAK_CIPHERSUITES", #endif /* POLARSSL_ENABLE_WEAK_CIPHERSUITES */ +#if defined(POLARSSL_REMOVE_ARC4_CIPHERSUITES) + "POLARSSL_REMOVE_ARC4_CIPHERSUITES", +#endif /* POLARSSL_REMOVE_ARC4_CIPHERSUITES */ #if defined(POLARSSL_ECP_DP_SECP192R1_ENABLED) "POLARSSL_ECP_DP_SECP192R1_ENABLED", #endif /* POLARSSL_ECP_DP_SECP192R1_ENABLED */ @@ -336,6 +339,9 @@ const char *features[] = { #if defined(POLARSSL_X509_CHECK_EXTENDED_KEY_USAGE) "POLARSSL_X509_CHECK_EXTENDED_KEY_USAGE", #endif /* POLARSSL_X509_CHECK_EXTENDED_KEY_USAGE */ +#if defined(POLARSSL_X509_RSASSA_PSS_SUPPORT) + "POLARSSL_X509_RSASSA_PSS_SUPPORT", +#endif /* POLARSSL_X509_RSASSA_PSS_SUPPORT */ #if defined(POLARSSL_ZLIB_SUPPORT) "POLARSSL_ZLIB_SUPPORT", #endif /* POLARSSL_ZLIB_SUPPORT */ diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data index 20ceb19dd..4ef73daa4 100644 --- a/tests/suites/test_suite_version.data +++ b/tests/suites/test_suite_version.data @@ -1,8 +1,8 @@ Check compiletime library version -check_compiletime_version:"1.3.7" +check_compiletime_version:"1.3.8" Check runtime library version -check_runtime_version:"1.3.7" +check_runtime_version:"1.3.8" Check for POLARSSL_VERSION_C check_feature:"POLARSSL_VERSION_C":0 diff --git a/visualc/VS2010/PolarSSL.vcxproj b/visualc/VS2010/PolarSSL.vcxproj index 5ea5b15ad..5767b96fc 100644 --- a/visualc/VS2010/PolarSSL.vcxproj +++ b/visualc/VS2010/PolarSSL.vcxproj @@ -256,6 +256,7 @@ + diff --git a/visualc/VS6/polarssl.dsp b/visualc/VS6/polarssl.dsp index 17e9e70fc..59aedfb7c 100644 --- a/visualc/VS6/polarssl.dsp +++ b/visualc/VS6/polarssl.dsp @@ -273,6 +273,10 @@ SOURCE=..\..\library\ripemd160.c # End Source File # Begin Source File +SOURCE=..\..\library\rnd_test.c +# End Source File +# Begin Source File + SOURCE=..\..\library\rsa.c # End Source File # Begin Source File