Jaeden Amero
3263f46a0e
Merge remote-tracking branch 'upstream-restricted/pr/480' into mbedtls-2.1-restricted
2018-04-30 17:38:15 +01:00
Simon Butcher
50d802172f
Fix the ChangeLog for clarity, english and credit
2018-04-30 17:23:10 +01:00
Jaeden Amero
6c0fba4350
Update version to 2.1.12
2018-04-27 13:13:54 +01:00
Jaeden Amero
4faad41346
Merge remote-tracking branch 'upstream-restricted/pr/472' into mbedtls-2.1-restricted-proposed
...
Remove trailing whitespace from ChangeLog.
2018-04-26 11:09:15 +01:00
Jaeden Amero
7db991d56a
Merge branch 'mbedtls-2.1-proposed' into mbedtls-2.1-restricted-proposed
...
Resolve conflicts in ChangeLog
2018-04-26 09:03:14 +01:00
Andrzej Kurek
128bcbea1a
Changelog entry
2018-04-25 05:29:47 -04:00
Andrzej Kurek
bb6661479f
ssl_tls: Fix invalid buffer sizes during compression / decompression
...
Adjust information passed to zlib to include already written data.
2018-04-23 08:29:36 -04:00
Mohammad Azim Khan
3f1d5cb324
Same ciphersuite validation in server and client hello
2018-04-20 19:52:49 +01:00
Manuel Pégourié-Gonnard
1e2f4da801
Merge remote-tracking branch 'restricted/pr/469' into mbedtls-2.1-restricted-proposed
...
* restricted/pr/469:
Improve comments style
Remove a redundant test
Add buffer size check before cert_type_len read
Update change log
Adjust 2.1 specific code to match the buffer verification tests
Add a missing buffer size check
Correct buffer size check
2018-04-18 12:22:24 +02:00
Krzysztof Stachowiak
8fc134fcb1
Update change log
2018-04-05 08:51:35 +02:00
Gilles Peskine
24f4584473
Align ChangeLog entry for PR #1396 with development
2018-04-04 10:18:37 +02:00
Jaeden Amero
23d979bee0
Merge remote-tracking branch 'upstream-public/pr/1554' into mbedtls-2.1-proposed
2018-04-03 19:15:28 +01:00
AndrzejKurek
0de430678e
pk_sign: fix overriding and ignoring return values
2018-04-03 19:38:45 +02:00
Jaeden Amero
ac9939c096
Merge remote-tracking branch 'upstream-public/pr/1461' into mbedtls-2.1-proposed
2018-04-03 18:27:18 +01:00
Jaeden Amero
ee6c822076
Merge remote-tracking branch 'upstream-public/pr/1396' into mbedtls-2.1-proposed
2018-04-03 12:07:19 +01:00
Gilles Peskine
225684015d
Merge remote-tracking branch 'upstream-public/pr/1501' into mbedtls-2.1-proposed
2018-04-01 12:41:33 +02:00
Gilles Peskine
8b1cddcf26
Merge remote-tracking branch 'upstream-public/pr/1542' into mbedtls-2.1-proposed
2018-04-01 12:41:00 +02:00
Gilles Peskine
419e670702
Minor changelog improvement
2018-04-01 12:33:35 +02:00
Gilles Peskine
04450488ec
Add ChangeLog entry to credit independent contribution
...
Also: fixes #1437
2018-03-31 23:06:09 +02:00
Andrzej Kurek
a1149a70ae
Add tests for "return plaintext data faster on unpadded decryption"
2018-03-30 05:00:19 -04:00
Darryl Green
093c170377
Improve documentation of mbedtls_ssl_write()
2018-03-29 16:56:09 +01:00
Jaeden Amero
cbe731c653
Merge remote-tracking branch 'upstream-public/pr/1532' into mbedtls-2.1-proposed
2018-03-29 11:03:17 +01:00
Jaeden Amero
82e288adb6
Merge remote-tracking branch 'upstream-public/pr/1494' into mbedtls-2.1-proposed
2018-03-29 10:59:43 +01:00
Jaeden Amero
616485854e
Merge remote-tracking branch 'upstream-public/pr/1469' into mbedtls-2.1-proposed
2018-03-28 15:36:01 +01:00
Jaeden Amero
478baecc06
Merge remote-tracking branch 'upstream-public/pr/1525' into mbedtls-2.1-proposed
2018-03-28 15:34:25 +01:00
Ivan Krylov
1110a6fa63
Add ChangeLog entry
2018-03-28 17:25:12 +03:00
Jaeden Amero
8b4cd26eaf
Merge remote-tracking branch 'upstream-public/pr/1481' into mbedtls-2.1-proposed
2018-03-28 13:44:28 +01:00
Gilles Peskine
f362b97415
Add ChangeLog entry
...
Fixes #1299 . Fixes #1475 .
2018-03-27 23:22:37 +02:00
Andres Amaya Garcia
47569d7384
Add ChangeLog entry for PBES2 when ASN1 disabled
2018-03-27 21:34:15 +01:00
Andres Amaya Garcia
bc00667a90
Improve ChangeLog for DLEXT and AR_DASH changes
2018-03-27 20:07:52 +01:00
Andres Amaya Garcia
83bffd353e
Add ChangeLog entry for library/makefile changes
2018-03-26 00:15:21 +01:00
Gilles Peskine
d888bd2c65
Add changelog entries for improved testing
...
Fixes #1040
2018-03-23 02:29:49 +01:00
Gilles Peskine
2a74061198
Merge tag 'mbedtls-2.1.11' into iotssl-1381-x509-verify-refactor-2.1-restricted
...
Conflict resolution:
* ChangeLog
* tests/data_files/Makefile: concurrent additions, order irrelevant
* tests/data_files/test-ca.opensslconf: concurrent additions, order irrelevant
* tests/scripts/all.sh: one comment change conflicted with a code
addition. In addition some of the additions in the
iotssl-1381-x509-verify-refactor-restricted branch need support for
keep-going mode, this will be added in a subsequent commit.
2018-03-23 02:28:33 +01:00
Jethro Beekman
1a886ff45f
Fix parsing of PKCS#8 encoded Elliptic Curve keys.
...
The relevant ASN.1 definitions for a PKCS#8 encoded Elliptic Curve key are:
PrivateKeyInfo ::= SEQUENCE {
version Version,
privateKeyAlgorithm PrivateKeyAlgorithmIdentifier,
privateKey PrivateKey,
attributes [0] IMPLICIT Attributes OPTIONAL
}
AlgorithmIdentifier ::= SEQUENCE {
algorithm OBJECT IDENTIFIER,
parameters ANY DEFINED BY algorithm OPTIONAL
}
ECParameters ::= CHOICE {
namedCurve OBJECT IDENTIFIER
-- implicitCurve NULL
-- specifiedCurve SpecifiedECDomain
}
ECPrivateKey ::= SEQUENCE {
version INTEGER { ecPrivkeyVer1(1) } (ecPrivkeyVer1),
privateKey OCTET STRING,
parameters [0] ECParameters {{ NamedCurve }} OPTIONAL,
publicKey [1] BIT STRING OPTIONAL
}
Because of the two optional fields, there are 4 possible variants that need to
be parsed: no optional fields, only parameters, only public key, and both
optional fields. Previously mbedTLS was unable to parse keys with "only
parameters". Also, only "only public key" was tested. There was a test for "no
optional fields", but it was labelled incorrectly as SEC.1 and not run because
of a great renaming mixup.
2018-03-22 18:03:30 -07:00
mohammad1603
cee0890b19
Verify that f_send and f_recv send and receive the expected length
...
Verify that f_send and f_recv send and receive the expected length
Conflicts:
ChangeLog
2018-03-22 15:01:02 -07:00
Andres Amaya Garcia
2a0aee3163
Add ChangeLog entry for redundant mutex initialization optimizations
2018-03-21 17:40:48 +00:00
Andres Amaya Garcia
09d787f2fc
Add ChangeLog entry for dylib builds using Makefile
2018-03-21 11:24:32 +00:00
Jaeden Amero
1c986a9859
Update version to 2.1.11
2018-03-16 16:29:30 +00:00
Jaeden Amero
7f44963f45
Merge remote-tracking branch 'upstream-public/pr/1455' into mbedtls-2.1-restricted-proposed
2018-03-15 15:24:47 +00:00
Ron Eldor
82712a9c97
Write correct number of ciphersuites in log
...
Change location of log, to fit the correct number of used ciphersuites
2018-03-15 15:09:28 +00:00
Jaeden Amero
23f503f12d
Merge remote-tracking branch 'upstream-restricted/pr/465' into mbedtls-2.1-restricted-proposed
2018-03-14 18:32:21 +00:00
Jaeden Amero
5e50ff8f44
Merge remote-tracking branch 'upstream-restricted/pr/395' into mbedtls-2.1-restricted-proposed
2018-03-14 18:16:29 +00:00
Jaeden Amero
10a1a60966
Merge branch 'mbedtls-2.1-proposed' into mbedtls-2.1-restricted-proposed
2018-03-14 18:03:41 +00:00
Jaeden Amero
0980d9a3ae
Merge remote-tracking branch 'upstream-public/pr/1450' into mbedtls-2.1-proposed
2018-03-14 17:53:27 +00:00
Jaeden Amero
4e3629590f
Merge remote-tracking branch 'upstream-public/pr/1452' into mbedtls-2.1-proposed
2018-03-14 17:38:21 +00:00
Krzysztof Stachowiak
d3cec99377
Update change log
2018-03-14 14:39:01 +01:00
Krzysztof Stachowiak
a7a8332402
Update change log
2018-03-14 14:35:12 +01:00
Manuel Pégourié-Gonnard
b0661769ab
x509: CRL: reject unsupported critical extensions
2018-03-14 09:28:24 +01:00
Gilles Peskine
df6f3dd9b0
Merge remote-tracking branch 'upstream-restricted/pr/430' into mbedtls-2.1-restricted-proposed
2018-03-13 17:28:42 +01:00
Gilles Peskine
8c1217984b
Merge remote-tracking branch 'upstream-restricted/pr/360' into mbedtls-2.1-restricted-proposed
...
Conflicts:
* scripts/config.pl: reconciled parallel edits in a comment.
2018-03-13 17:26:49 +01:00