yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-01-09 16:45:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
4633 commits 88 branches 205 tags 69 MiB
Commit graph

4633 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gilles Peskine 855863093d Merge branch 'mbedtls-2.1' into mbedtls-2.1-restricted 2017-12-22 11:20:55 +01:00
Gilles Peskine 892c1752f7 Merge remote-tracking branch 'upstream-public/pr/1233' into mbedtls-2.1 2017-12-22 11:20:23 +01:00
Mohammad Azim Khan 075dc853fe Backport: Add option to do baremetal configuration. 
Aligned with development branch and added option 'baremetal' that sets configuration for bare metal builds.
 2017-12-21 17:21:56 +00:00
Manuel Pégourié-Gonnard 87244fa253 Merge branch 'mbedtls-2.1' into mbedtls-2.1-restricted 
* mbedtls-2.1:
  compat.sh: use wait_server_start
  wait_server_start: minor efficiency improvement
 2017-12-21 11:13:30 +01:00
Gilles Peskine c83f57b4c6 Merge remote-tracking branch 'upstream-restricted/pr/434' into mbedtls-2.1-restricted 2017-12-19 19:49:44 +01:00
Gilles Peskine 78493be3ee compat.sh: use wait_server_start 
Port wait_server_start from ssl-opt.sh to compat.sh, instead of just
using "sleep 1". This solves the problem that on a heavily loaded
machine, sleep 1 is sometimes not enough (we had CI failures because
of this). This is also faster on a lightly-loaded machine (execution
time reduced from ~8min to ~6min on my machine).
 2017-12-19 13:33:12 +01:00
Gilles Peskine 684a517220 wait_server_start: minor efficiency improvement 
In wait_server_start, fork less. When lsof is present, call it on the
expected process. This saves a few percent of execution time on a
lightly loaded machine. Also, sleep for a short duration rather than
using a tight loop.
 2017-12-19 13:33:08 +01:00
Manuel Pégourié-Gonnard 4aa6f12d0c Merge branch 'mbedtls-2.1' into mbedtls-2.1-restricted 
* mbedtls-2.1:
  Allow comments in test data files
 2017-12-19 12:20:18 +01:00
Manuel Pégourié-Gonnard 86bc448e75 Merge remote-tracking branch 'public/pr/1118' into mbedtls-2.1 
* public/pr/1118:
  Allow comments in test data files
 2017-12-19 12:19:52 +01:00
Manuel Pégourié-Gonnard 914fd5d2c9 Merge branch 'mbedtls-2.1' into mbedtls-2.1-restricted 
* mbedtls-2.1:
  ssl-opt.sh: support fixed seed for random tests
 2017-12-19 12:19:12 +01:00
Manuel Pégourié-Gonnard 157393a2f4 Merge remote-tracking branch 'public/pr/1192' into mbedtls-2.1 
* public/pr/1192:
  ssl-opt.sh: support fixed seed for random tests
 2017-12-19 12:18:54 +01:00
Manuel Pégourié-Gonnard 329d0904ab Merge branch 'mbedtls-2.1' into mbedtls-2.1-restricted 
* mbedtls-2.1:
  Address PR review comments
  Backport 2.1:Fix crash when calling `mbedtls_ssl_cache_free` twice
 2017-12-19 11:43:10 +01:00
Manuel Pégourié-Gonnard 227692a6b1 Merge remote-tracking branch 'public/pr/1160' into mbedtls-2.1 
* public/pr/1160:
  Address PR review comments
  Backport 2.1:Fix crash when calling `mbedtls_ssl_cache_free` twice
 2017-12-19 11:42:29 +01:00
Manuel Pégourié-Gonnard 451ea75286 Merge remote-tracking branch 'restricted/pr/412' into mbedtls-2.1-restricted 
* restricted/pr/412:
  Correct record header size in case of TLS
  Don't allocate space for DTLS header if DTLS is disabled
  Improve debugging output
  Adapt ChangeLog
  Add run-time check for handshake message size in ssl_write_record
  Add run-time check for record content size in ssl_encrypt_buf
  Add compile-time checks for size of record content and payload
 2017-12-19 11:33:07 +01:00
Manuel Pégourié-Gonnard 4b133e6dcf Fix magic constant in previous commit 2017-12-19 10:05:03 +01:00
Manuel Pégourié-Gonnard b67a5c1f29 Fix SSLv3 MAC computation 
In a previous PR (Fix heap corruption in implementation of truncated HMAC
extension #425) the place where MAC is computed was changed from the end of
the SSL I/O buffer to a local buffer (then (part of) the content of the local
buffer is either copied to the output buffer of compare to the input buffer).

Unfortunately, this change was made only for TLS 1.0 and later, leaving SSL
3.0 in an inconsistent state due to ssl_mac() still writing to the old,
hard-coded location, which, for MAC verification, resulted in later comparing
the end of the input buffer (containing the computed MAC) to the local buffer
(uninitialised), most likely resulting in MAC verification failure, hence no
interop (even with ourselves).

This commit completes the move to using a local buffer by using this strategy
for SSL 3.0 too. Fortunately ssl_mac() was static so it's not a problem to
change its signature.
 2017-12-19 10:05:00 +01:00
Manuel Pégourié-Gonnard c0b9456f60 Merge branch 'mbedtls-2.1' into mbedtls-2.1-restricted 
* mbedtls-2.1:
  Fix build error with gcc -Werror=misleading-indentation
 2017-12-18 11:46:43 +01:00
Manuel Pégourié-Gonnard d1ededf4a3 Merge remote-tracking branch 'public/pr/1187' into mbedtls-2.1 
* public/pr/1187:
  Fix build error with gcc -Werror=misleading-indentation
 2017-12-18 11:46:10 +01:00
Manuel Pégourié-Gonnard 3fe67dae0b Merge branch 'mbedtls-2.1' into mbedtls-2.1-restricted 
* mbedtls-2.1:
  Fix build without MBEDTLS_FS_IO
 2017-12-18 11:44:26 +01:00
Manuel Pégourié-Gonnard 912e4471bb Merge remote-tracking branch 'public/pr/1185' into mbedtls-2.1 
* public/pr/1185:
  Fix build without MBEDTLS_FS_IO
 2017-12-18 11:44:07 +01:00
Hanno Becker e40802aebc Correct record header size in case of TLS 
The previous commit reduced the internal header size to 5 bytes in case of
TLS. This is not a valid since in that situation Mbed TLS internally uses the
first 8 bytes of the message buffer for the implicit record sequence number.
 2017-12-07 08:27:56 +00:00
Gilles Peskine 92e6a0e71a Merge branch 'mbedtls-2.1' into mbedtls-2.1-restricted 2017-12-04 18:01:28 +00:00
Gilles Peskine a15486a35f Merge branch 'pr_1044' into mbedtls-2.1 2017-12-04 17:29:28 +01:00
Gilles Peskine 45c8f6a38a Added ChangeLog entry 2017-12-04 17:28:09 +01:00
Gilles Peskine 4b36dfb820 Merge remote-tracking branch 'upstream-public/pr/1174' into mbedtls-2.1 2017-12-04 17:20:45 +01:00
Gilles Peskine aed7188b2e Merge remote-tracking branch 'upstream-restricted/pr/427' into mbedtls-2.1-restricted 2017-12-01 18:05:40 +01:00
Gilles Peskine bb4aaf1bbc ssl-opt.sh: support fixed seed for random tests 
Support --seed and $SEED to set the seed for random tests.

Partial backport of commit 7770ea82d5
(the part applying to all.sh is already present).
 2017-12-01 17:23:34 +01:00
Gilles Peskine 14ab4cff9f Fix build error with gcc -Werror=misleading-indentation 
Fix misleading indentation. This was just bad indentation, the
behavior was correct. It was detected by gcc 6.
 2017-12-01 11:45:21 +01:00
Gilles Peskine 6ddfa37084 Fix build without MBEDTLS_FS_IO 
Fix missing definition of mbedtls_zeroize when MBEDTLS_FS_IO is
disabled in the configuration.

Introduced by d08ae68237
    Merge remote-tracking branch 'upstream-public/pr/1112' into mbedtls-2.1
 2017-11-30 12:20:19 +01:00
Gilles Peskine 6cf85ff1a4 Merge branch 'mbedtls-2.1' into mbedtls-2.1-restricted 2017-11-29 21:07:28 +01:00
Gilles Peskine 49349bacb9 Merge remote-tracking branch 'upstream-public/pr/1153' into mbedtls-2.1 2017-11-29 20:53:58 +01:00
Gilles Peskine f663c22ab7 Merge remote-tracking branch 'upstream-public/pr/916' into mbedtls-2.1 2017-11-29 20:53:44 +01:00
Gilles Peskine 1854a0e0cd Merge branch 'mbedtls-2.1' into mbedtls-2.1-restricted 2017-11-28 18:44:49 +01:00
Gilles Peskine 25aa833ac3 Merge branch 'pr_1082' into mbedtls-2.1 2017-11-28 18:33:50 +01:00
Gilles Peskine 026d18aefa Add ChangeLog entry 2017-11-28 18:33:31 +01:00
Gilles Peskine 283a80d51f Merge remote-tracking branch 'upstream-public/pr/1108' into mbedtls-2.1 2017-11-28 18:31:28 +01:00
Gilles Peskine 31dce36364 Merge remote-tracking branch 'upstream-public/pr/1080' into mbedtls-2.1 2017-11-28 18:30:18 +01:00
Gilles Peskine a6f6947490 Merge remote-tracking branch 'upstream-public/pr/943' into mbedtls-2.1 2017-11-28 18:28:39 +01:00
Gilles Peskine dc89416ad9 Merge remote-tracking branch 'upstream-public/pr/996' into mbedtls-2.1 2017-11-28 17:10:10 +01:00
Gilles Peskine 1b8822e9b3 Merge remote-tracking branch 'upstream-restricted/pr/422' into mbedtls-2.1-restricted 
Resolved simple conflicts caused by the independent addition of
calls to mbedtls_zeroize with sometimes whitespace or comment
differences.
 2017-11-28 16:21:07 +01:00
Gilles Peskine 9aab6995a9 Merge remote-tracking branch 'upstream-restricted/pr/406' into mbedtls-2.1-restricted 2017-11-28 16:19:19 +01:00
Gilles Peskine 5a8fe053d8 Merge remote-tracking branch 'upstream-restricted/pr/401' into mbedtls-2.1-restricted 2017-11-28 14:24:15 +01:00
Gilles Peskine 336b7de48a Merge remote-tracking branch 'upstream-restricted/pr/386' into mbedtls-2.1-restricted 2017-11-28 14:24:05 +01:00
Gilles Peskine 206110dcb9 Merge branch 'iotssl-1419-safermemcmp-volatile_backport-2.1' into mbedtls-2.1-restricted 2017-11-28 13:51:37 +01:00
Gilles Peskine 2f615af5cf add changelog entry 2017-11-28 13:34:24 +01:00
Gilles Peskine e881a22126 Merge branch 'mbedtls-2.1' into mbedtls-2.1-restricted 2017-11-24 16:06:16 +01:00
Gilles Peskine d08ae68237 Merge remote-tracking branch 'upstream-public/pr/1112' into mbedtls-2.1 2017-11-24 15:37:29 +01:00
Gilles Peskine 5eb8edc0cb Merge branch 'mbedtls-2.1' into mbedtls-2.1-restricted 2017-11-23 20:11:07 +01:00
Gilles Peskine 7aa24190b4 Merge remote-tracking branch 'upstream-public/pr/1107' into mbedtls-2.1 2017-11-23 20:09:48 +01:00
Gilles Peskine a90c3da42f Merge branch 'iotssl-1368-unsafe-bounds-check-psk-identity-merge-2.1' into mbedtls-2.1-restricted 2017-11-23 19:06:29 +01:00