mars_nwe/mars-matrixssl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MatrixSSL 4.6.0

Browse Source
This commit is contained in:
matrixssl-admin
2022-12-29 11:25:01 +02:00
parent 69b5f2c6c3
commit effeb14219
15 changed files with 73 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
matrixssl/test/pkcs12Test.c
View File

@@ -5,7 +5,7 @@
* Test program that tries out the new extensions to pkcs12 parsing.
*/
/*
* Copyright (c) 2020 Rambus Inc
* Copyright (c) 2020 INSIDE Secure Corporation
* All Rights Reserved
*
* The latest version of this code is available at http://www.matrixssl.org

2
matrixssl/test/provider.c
View File

@@ -5,7 +5,7 @@
* Example how to set crypto provider programmatically.
*/
/*
* Copyright (c) 2017-2017 Rambus Inc
* Copyright (c) 2017-2017 INSIDE Secure Corporation
* All Rights Reserved
*
* The latest version of this code is available at http://www.matrixssl.org

34
matrixssl/test/sslTest.c
View File

@@ -7,7 +7,7 @@
* Iterates over all supported protocol versions and ciphersuites.
*/
/*
* Copyright (c) 2014-2018 Rambus Inc
* Copyright (c) 2014-2018 INSIDE Secure Corporation
* Copyright (c) PeerSec Networks, 2002-2011
* All Rights Reserved
*
@@ -362,6 +362,9 @@ static __THREAD uint32_t ECCKEY_SIZE, ECC_SIZE, ECCCA_SIZE;
# include "testkeys/DH/2048_DH_PARAMS.h"
# include "testkeys/DH/3072_DH_PARAMS.h"
# include "testkeys/DH/4096_DH_PARAMS.h"
# include "testkeys/DH/ffdhe2048_DH_PARAMS.h"
# include "testkeys/DH/ffdhe3072_DH_PARAMS.h"
# include "testkeys/DH/ffdhe4096_DH_PARAMS.h"
# ifdef USE_LARGE_DH_GROUPS
# include "testkeys/DH/ffdhe6144_DH_PARAMS.h"
# include "testkeys/DH/ffdhe8192_DH_PARAMS.h"
@@ -1660,24 +1663,36 @@ L_NEXT_DH:
switch (DH_SIZE)
{
case 0:
DHPARAM = DHPARAM1024; DH_SIZE = DHPARAM1024_SIZE;
keysize = 1024;
break;
{
DHPARAM = DHPARAM1024; DH_SIZE = DHPARAM1024_SIZE;
keysize = 1024;
break;
}
case DHPARAM1024_SIZE:
DHPARAM = DHPARAM2048; DH_SIZE = DHPARAM2048_SIZE;
keysize = 2048;
break;
{
DHPARAM = DHPARAM2048; DH_SIZE = DHPARAM2048_SIZE;
keysize = 2048;
break;
}
case DHPARAM2048_SIZE:
DHPARAM = DHPARAM3072; DH_SIZE = DHPARAM3072_SIZE;
keysize = 3072;
break;
case ffdhe2048_DH_PARAMS_SIZE:
DHPARAM = ffdhe3072_DH_PARAMS; DH_SIZE = ffdhe3072_DH_PARAMS_SIZE;
keysize = 3072;
break;
case ffdhe3072_DH_PARAMS_SIZE:
DHPARAM = ffdhe4096_DH_PARAMS; DH_SIZE = ffdhe4096_DH_PARAMS_SIZE;
keysize = 4096;
break;
case DHPARAM3072_SIZE:
# if !defined(EMBEDDED) || defined(USE_LARGE_DH_GROUPS)
DHPARAM = DHPARAM4096; DH_SIZE = DHPARAM4096_SIZE;
keysize = 4096;
break;
# if defined(USE_LARGE_DH_GROUPS)
case DHPARAM4096_SIZE:
case DHPARAM4096_SIZE:case ffdhe4096_DH_PARAMS_SIZE:
DHPARAM = ffdhe6144_DH_PARAMS;
DH_SIZE = ffdhe6144_DH_PARAMS_SIZE;
keysize = 6144;
@@ -1689,7 +1704,7 @@ L_NEXT_DH:
break;
case ffdhe8192_DH_PARAMS_SIZE:
# else
case DHPARAM4096_SIZE:
case DHPARAM4096_SIZE:case ffdhe4096_DH_PARAMS_SIZE:
# endif
# endif /* !EMBEDDED || USE_LARGE_DH_GROUPS */
DH_SIZE = 0;
@@ -1702,6 +1717,7 @@ L_NEXT_DH:
}
# endif /* REQUIRE_DH_PARAMS */
# ifdef USE_PSK_CIPHER_SUITE
if (spec->type == CS_PSK)
{

9
matrixssl/tls13Decode.c
View File

@@ -269,7 +269,14 @@ parse_next_record_header:
}
/* Done - tell the caller what we've consumed. */
*in += parsedBytes;
*len -= parsedBytes;
if (*len >= parsedBytes)
{
*len -= parsedBytes;
}
else
{
return MATRIXSSL_ERROR;
}
*remaining -= PS_MIN(parsedBytes, *remaining);
/* If there's handshake message waiting in outbuf then send it */
if (ssl->outlen > 0)

6
matrixssl/version.h
View File

@@ -8,10 +8,10 @@
extern "C" {
#endif
#define MATRIXSSL_VERSION "4.5.1-OPEN"
#define MATRIXSSL_VERSION "4.6.0-OPEN"
#define MATRIXSSL_VERSION_MAJOR 4
#define MATRIXSSL_VERSION_MINOR 5
#define MATRIXSSL_VERSION_PATCH 1
#define MATRIXSSL_VERSION_MINOR 6
#define MATRIXSSL_VERSION_PATCH 0
#define MATRIXSSL_VERSION_CODE "OPEN"
#ifdef __cplusplus