Simon Butcher
6ac1cf6f5f
Merge remote-tracking branch 'public/pr/1182' into development
2018-06-14 10:33:29 +01:00
Simon Butcher
c1bf1aaee5
Merge remote-tracking branch 'public/pr/1555' into development
2018-06-14 10:24:56 +01:00
Simon Butcher
73a4b80475
Merge remote-tracking branch 'public/pr/1672' into development
2018-06-14 10:24:02 +01:00
Simon Butcher
2ff0e52087
Fix missing preprocessor condition in AES self-test
...
The AES OFB self-test made use of a variable `offset` but failed to have a
preprocessor condition around it, so unless CTR and CBC were enabled, the
variable would be undeclared.
2018-06-14 09:57:07 +01:00
Darryl Green
b11de306c4
Fix braces in mbedtls_memory_buffer_alloc_status()
2018-06-12 16:56:04 +01:00
Simon Butcher
e47d6fd97e
Merge remote-tracking branch 'public/pr/1497' into development
2018-06-12 16:53:04 +01:00
Simon Butcher
f0d7629771
Merge remote-tracking branch 'public/pr/1593' into development
2018-06-12 16:41:41 +01:00
Simon Butcher
ebb6427992
Merge remote-tracking branch 'public/pr/1646' into development
2018-06-12 16:41:04 +01:00
Simon Butcher
263498ac36
Merge remote-tracking branch 'public/pr/1667' into development
2018-06-12 16:40:07 +01:00
Simon Butcher
4844bf2b5c
Add OFB as additional block mode
...
Following rebasing on the development branch which introduced the ARIA cipher,
OFB was missing as a block mode from some cipher tables.
2018-06-11 15:21:05 +01:00
Simon Butcher
5db13621ec
Clarify documentation for AES OFB
...
1. Changed reference/link to NIST SP800-38A
2. Clarified language around AES-OFB usage
2018-06-11 14:03:22 +01:00
Simon Butcher
00131446be
Fix style and formatting for OFB feature
2018-06-11 14:03:22 +01:00
Simon Butcher
ad4e4938d1
Fix AES-OFB support for errors, tests and self-test
...
Adds error handling into mbedtls_aes_crypt_ofb for AES errors, a self-test
for the OFB mode using NIST SP 800-38A test vectors and adds a check to
potential return errors in setting the AES encryption key in the OFB test
suite.
2018-06-11 14:03:22 +01:00
Simon Butcher
7487c5b2c8
Add missing OFB entry to null ciphersuite
...
The OFB entry has been omitted from the the null cipher suite definition,
null_base_info.
2018-06-11 14:03:22 +01:00
Simon Butcher
8c0fd1e881
Add cipher abstraction and test cases for OFB block mode
...
Adds OFB as additional block mode in the cipher abstraction, and additional
test cases for that block mode.
2018-06-11 14:03:22 +01:00
Simon Butcher
76a5b22973
Add OFB block mode to AES-128/192/256
...
Adds a new configuration of MBEDTLS_CIPHER_MODE_OFB and OFB mode to AES.
2018-06-11 14:03:22 +01:00
Thomas Fossati
656864b360
Add an HKDF (RFC 5869) implementation
2018-06-11 13:10:14 +01:00
Simon Butcher
d5a09f1e68
Updated version number to 2.10.0 for release
2018-06-06 14:52:00 +01:00
Simon Butcher
246cb05a92
Merge remote-tracking branch 'public/pr/1410' into development
2018-06-01 19:25:56 +01:00
Gilles Peskine
02b9329f2b
Fix MSan build without MBEDTLS_TIMING_C
...
When MBEDTLS_TIMING_C was not defined in config.h, but the MemSan
memory sanitizer was activated, entropy_poll.c used memset without
declaring it. Fix this by including string.h unconditionally.
2018-06-01 18:19:59 +02:00
Janos Follath
4c579391b1
CCM*: Remove superfluous braces
2018-05-30 13:58:38 +01:00
Janos Follath
997e85c049
CCM*: Remove nested if
2018-05-29 11:59:22 +01:00
Janos Follath
b5734a28d9
CCM*: Add implementation
2018-05-29 11:59:22 +01:00
Azim Khan
45b79cf12b
Treat warnings as errors for IAR
...
Fix IAR compiler warnings
Two warnings have been fixed:
1. code 'if( len <= 0xFFFFFFFF )' gave warning 'pointless integer comparison'.
This was fixed by wraping the condition in '#if SIZE_MAX > 0xFFFFFFFF'.
2. code 'diff |= A[i] ^ B[i];' gave warning 'the order of volatile accesses is undefined in'.
This was fixed by read the volatile data in temporary variables before the computation.
Explain IAR warning on volatile access
Consistent use of CMAKE_C_COMPILER_ID
2018-05-25 14:54:14 +01:00
Manuel Pégourié-Gonnard
39f25616b3
Fix edit mistake in cipher_wrap.c
...
Error was from 08c337d058
2018-05-24 14:06:02 +02:00
Simon Butcher
2f3a581567
Merge remote-tracking branch 'public/pr/1178' into development
2018-05-23 16:15:13 +01:00
Manuel Pégourié-Gonnard
7124fb63be
Use zeroize function from new platform_util
2018-05-22 16:05:33 +02:00
Manuel Pégourié-Gonnard
a3712beb9b
Merge branch 'development' into iotssl-1941-aria-ciphersuites
...
* development: (504 commits)
Fix minor code style issues
Add the uodate to the soversion to the ChangeLog
Fix the ChangeLog for clarity, english and credit
Update version to 2.9.0
ecp: Fix binary compatibility with group ID
Changelog entry
Change accepted ciphersuite versions when parsing server hello
Remove preprocessor directives around platform_util.h include
Fix style for mbedtls_mpi_zeroize()
Improve mbedtls_platform_zeroize() docs
mbedtls_zeroize -> mbedtls_platform_zeroize in docs
Reword config.h docs for MBEDTLS_PLATFORM_ZEROIZE_ALT
Organize CMakeLists targets in alphabetical order
Organize output objs in alfabetical order in Makefile
Regenerate errors after ecp.h updates
Update ecp.h
Change variable bytes_written to header_bytes in record decompression
Update ecp.h
Update ecp.h
Update ecp.h
...
2018-05-22 15:58:50 +02:00
Manuel Pégourié-Gonnard
2df4bfe803
Fix typo in comments
2018-05-22 13:39:01 +02:00
Manuel Pégourié-Gonnard
565e4e0fb2
Use more appropriate type for local variable
2018-05-22 13:30:28 +02:00
Manuel Pégourié-Gonnard
08c337d058
Remove useless parameter from function
2018-05-22 13:18:01 +02:00
Manuel Pégourié-Gonnard
89924ddc7e
Wipe sensitive info from the stack
2018-05-22 13:07:07 +02:00
Manuel Pégourié-Gonnard
12e2fbdf29
Style adjustments
2018-05-22 13:01:09 +02:00
Manuel Pégourié-Gonnard
d418b0dcba
Fix typo in comment
2018-05-22 12:56:11 +02:00
Darryl Green
11999bb72e
Fix minor code style issues
2018-05-15 09:21:57 +01:00
Jaeden Amero
a331e0f0af
Merge remote-tracking branch 'upstream-restricted/pr/421' into development-proposed
2018-05-04 14:39:24 +01:00
Jaeden Amero
7d7bad6b1f
Update version to 2.9.0
...
Bump SOVERSION for parity with 2.7.2 and 2.7.3.
2018-04-30 09:58:33 +01:00
Jaeden Amero
c64a300027
Merge remote-tracking branch 'upstream-restricted/pr/471' into development-restricted-proposed
...
Remove trailing whitespace in ChangeLog.
2018-04-26 09:06:33 +01:00
Jaeden Amero
bd05dfd49f
Merge branch 'development-proposed' into development-restricted-proposed
...
Resolve conflicts in ChangeLog
2018-04-26 09:03:03 +01:00
Jaeden Amero
84a1107818
Merge remote-tracking branch 'upstream-public/pr/1592' into development-proposed
2018-04-25 14:22:12 +01:00
Andrzej Kurek
03bac448db
Change accepted ciphersuite versions when parsing server hello
...
Accept only ciphersuites for version chosen by the server
2018-04-25 05:06:07 -04:00
Jaeden Amero
8945343a51
Merge branch 'development-proposed' into development-restricted-proposed
...
Resolve merge conflict in ecp.h, where `mbedtls_ecp_keypair` was moved.
2018-04-24 17:16:34 +01:00
Andres Amaya Garcia
8491406803
Remove preprocessor directives around platform_util.h include
2018-04-24 08:40:46 -05:00
Andres Amaya Garcia
6698d2fc5c
Fix style for mbedtls_mpi_zeroize()
2018-04-24 08:39:07 -05:00
Andres Amaya Garcia
bc7bdbf5c8
Organize CMakeLists targets in alphabetical order
2018-04-24 08:29:20 -05:00
Andres Amaya Garcia
21b376b56c
Organize output objs in alfabetical order in Makefile
2018-04-24 08:28:26 -05:00
Jaeden Amero
1afdec1812
Merge remote-tracking branch 'upstream-public/pr/1578' into development-proposed
2018-04-24 14:19:41 +01:00
Jaeden Amero
3dd8abd037
Regenerate errors after ecp.h updates
...
The error descriptions were updated in ecp.h (PR #1578 ), so also update
the strings in error.c.
2018-04-24 14:13:15 +01:00
Andrzej Kurek
a9ceef8e03
Change variable bytes_written to header_bytes in record decompression
...
The name is changed to better reflect the input, decompression case
2018-04-24 06:34:17 -04:00
Mohammad Azim Khan
1d3b508b82
Same ciphersuite validation in server and client hello
2018-04-20 18:54:18 +01:00