AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'polarssl-1.2' for release of PolarSSL 1.2.3

Browse Source
This commit is contained in:
Paul Bakker 2012-11-26 16:30:11 +01:00
commit 77d51d7867
7 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
PolarSSL ChangeLog PolarSSL ChangeLog
= Version 1.2.3 released 2012-11-26
Bugfix
* Server not always sending correct CertificateRequest message
= Version 1.2.2 released 2012-11-24 = Version 1.2.2 released 2012-11-24
Changes Changes
* Added p_hw_data to ssl_context for context specific hardware acceleration * Added p_hw_data to ssl_context for context specific hardware acceleration

2
doxygen/input/doc_mainpage.h
View File

@ -4,7 +4,7 @@
*/ */
/** /**
* @mainpage PolarSSL v1.2.2 source code documentation * @mainpage PolarSSL v1.2.3 source code documentation
* *
* This documentation describes the internal structure of PolarSSL. It was * This documentation describes the internal structure of PolarSSL. It was
* automatically generated from specially formatted comment blocks in * automatically generated from specially formatted comment blocks in

2
doxygen/polarssl.doxyfile
View File

@ -25,7 +25,7 @@ DOXYFILE_ENCODING = UTF-8
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project. # by quotes) that should identify the project.
PROJECT_NAME = "PolarSSL v1.2.2" PROJECT_NAME = "PolarSSL v1.2.3"
# The PROJECT_NUMBER tag can be used to enter a project or revision number. # The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or

8
include/polarssl/version.h
View File

@ -39,16 +39,16 @@
*/ */
#define POLARSSL_VERSION_MAJOR 1 #define POLARSSL_VERSION_MAJOR 1
#define POLARSSL_VERSION_MINOR 2 #define POLARSSL_VERSION_MINOR 2
#define POLARSSL_VERSION_PATCH 2 #define POLARSSL_VERSION_PATCH 3
/** /**
* The single version number has the following structure: * The single version number has the following structure:
* MMNNPP00 * MMNNPP00
* Major version | Minor version | Patch version * Major version | Minor version | Patch version
*/ */
#define POLARSSL_VERSION_NUMBER 0x01020200 #define POLARSSL_VERSION_NUMBER 0x01020300
#define POLARSSL_VERSION_STRING "1.2.2" #define POLARSSL_VERSION_STRING "1.2.3"
#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.2.2" #define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.2.3"
#if defined(POLARSSL_VERSION_C) #if defined(POLARSSL_VERSION_C)

2
library/CMakeLists.txt
View File

@ -57,7 +57,7 @@ add_library(polarssl STATIC ${src})
else(NOT USE_SHARED_POLARSSL_LIBRARY) else(NOT USE_SHARED_POLARSSL_LIBRARY)
add_library(polarssl SHARED ${src}) add_library(polarssl SHARED ${src})
set_target_properties(polarssl PROPERTIES VERSION 1.2.2 SOVERSION 2) set_target_properties(polarssl PROPERTIES VERSION 1.2.3 SOVERSION 2)
endif(NOT USE_SHARED_POLARSSL_LIBRARY) endif(NOT USE_SHARED_POLARSSL_LIBRARY)

4
library/ssl_srv.c
View File

@ -753,7 +753,7 @@ static int ssl_write_certificate_request( ssl_context *ssl )
p += 2; p += 2;
crt = ssl->ca_chain; crt = ssl->ca_chain;
total_dn_size = 2; total_dn_size = 0;
while( crt != NULL ) while( crt != NULL )
{ {
if( p - buf > 4096 ) if( p - buf > 4096 )
@ -767,7 +767,7 @@ static int ssl_write_certificate_request( ssl_context *ssl )
SSL_DEBUG_BUF( 3, "requested DN", p, dn_size ); SSL_DEBUG_BUF( 3, "requested DN", p, dn_size );
total_dn_size += dn_size; total_dn_size += 2 + dn_size;
crt = crt->next; crt = crt->next;
} }

4
tests/suites/test_suite_version.data
View File

@ -1,5 +1,5 @@
Check compiletime library version Check compiletime library version
check_compiletime_version:"1.2.2" check_compiletime_version:"1.2.3"
Check runtime library version Check runtime library version
check_runtime_version:"1.2.2" check_runtime_version:"1.2.3"