fbrosson
533407a266
Use "#!/usr/bin/env perl" as shebang line.
2018-04-04 21:44:29 +00:00
Gilles Peskine
80aa3b8d65
Merge branch 'pr_946' into development-proposed
2018-04-04 10:33:45 +02:00
Gilles Peskine
e4d3b7f860
Fix merge glitch in ChangeLog
2018-04-04 09:28:48 +02:00
Gilles Peskine
b9e8696d56
Merge remote-tracking branch 'upstream-public/pr/1142' into development-proposed
2018-04-04 09:20:59 +02:00
Gilles Peskine
73db8380ca
Merge remote-tracking branch 'upstream-public/pr/1547' into development-proposed
2018-04-04 09:19:12 +02:00
Gilles Peskine
be2371c3d9
Merge branch 'pr_348' into development-proposed
2018-04-04 09:18:27 +02:00
Gilles Peskine
557e77d9a3
Add ChangeLog entry
2018-04-04 09:18:11 +02:00
Gilles Peskine
a09453f495
Merge branch 'pr_1395' into development-proposed
2018-04-04 09:14:12 +02:00
Gilles Peskine
d6953b58d7
Improve changelog entry
2018-04-04 09:09:29 +02:00
Kevin Luty
0cbe816bfc
ChangeLog updated and returning proper value
2018-04-02 10:01:16 -05:00
Gilles Peskine
90a8b5219f
Merge branch 'pr_1480' into development-proposed
2018-04-01 12:44:06 +02:00
Gilles Peskine
092bf3dd38
Add original PR reference
2018-04-01 12:43:48 +02:00
Gilles Peskine
0ed632f445
Merge remote-tracking branch 'upstream-public/pr/1499' into development-proposed
2018-04-01 12:41:22 +02:00
Gilles Peskine
5e4464e392
Merge remote-tracking branch 'upstream-public/pr/1539' into development-proposed
2018-04-01 12:40:37 +02:00
Gilles Peskine
695d557dcf
Merge branch 'pr_1180' into development-proposed
2018-04-01 12:26:36 +02:00
Gilles Peskine
4045c74421
Minor changelog improvement
2018-04-01 12:25:48 +02:00
Gilles Peskine
c96ccf4b3f
Add ChangeLog entry to credit independent contribution
...
Also: fixes #1437
2018-03-31 22:57:03 +02:00
Darryl Green
eea1c4ee5a
Improve documentation of mbedtls_ssl_write()
2018-03-29 16:41:09 +01:00
Andrzej Kurek
a357f1a6ca
Move changelog entry to bugfix from changes
2018-03-29 08:17:15 -04:00
Jaeden Amero
4ba87fc958
Merge remote-tracking branch 'upstream-public/pr/758' into development-proposed
2018-03-29 11:01:38 +01:00
Jaeden Amero
2ad47e3bcc
Merge remote-tracking branch 'upstream-public/pr/1528' into development-proposed
2018-03-29 11:00:50 +01:00
Jaeden Amero
78a03ec230
Merge remote-tracking branch 'upstream-public/pr/1379' into development-proposed
2018-03-29 10:57:57 +01:00
Jaeden Amero
90226be779
Merge remote-tracking branch 'upstream-public/pr/1467' into development-proposed
2018-03-28 15:35:22 +01:00
Jaeden Amero
2843d21d99
Merge remote-tracking branch 'upstream-public/pr/1523' into development-proposed
2018-03-28 15:32:13 +01:00
Hanno Becker
2bd57578af
Merge branch 'development' into iotssl-1204
2018-03-28 14:52:35 +01:00
Jaeden Amero
5ec118352e
Merge remote-tracking branch 'upstream-public/pr/1474' into development-proposed
2018-03-28 14:22:29 +01:00
Ivan Krylov
065ecf587f
Changelog: use my real name ( #758 )
2018-03-28 16:19:18 +03:00
Jaeden Amero
552b9cc5ba
Merge remote-tracking branch 'upstream-public/pr/1477' into development-proposed
2018-03-28 13:42:32 +01:00
Jaeden Amero
9528658446
Merge remote-tracking branch 'upstream-public/pr/701' into development-proposed
...
Fixes #1299 , fixes #1475
2018-03-28 12:50:28 +01:00
Jaeden Amero
8645e90825
Merge remote-tracking branch 'upstream-restricted/pr/363' into development-proposed
2018-03-28 11:54:28 +01:00
Manuel Pégourié-Gonnard
fff308e2fa
Add a ChangeLog entry for Curve22519 N
2018-03-28 11:13:05 +02:00
Azim Khan
71830318d3
Rephrase Changelog entry Bugfix->Changes
2018-03-28 09:48:29 +01:00
Jethro Beekman
6c563fa7cd
Add tests for "return plaintext data faster on unpadded decryption"
2018-03-27 19:25:35 -07:00
Gilles Peskine
f69ad5a898
Add ChangeLog entry
...
Fixes #1299 . Fixes #1475 .
2018-03-27 23:16:26 +02:00
Andres Amaya Garcia
cb47a79e04
Add ChangeLog entry for PBES2 when ASN1 disabled
2018-03-27 21:19:50 +01:00
Andres Amaya Garcia
d1b1788b40
Improve ChangeLog for DLEXT and AR_DASH changes
2018-03-27 19:14:24 +01:00
Jaeden Amero
b604960572
Merge remote-tracking branch 'upstream-public/pr/1435' into development-proposed
2018-03-27 16:45:36 +01:00
Gilles Peskine
e4f2736b42
Add ChangeLog entry
2018-03-26 12:29:30 +02:00
Andres Amaya Garcia
ea5a8a418b
Add ChangeLog entry for library/makefile changes
2018-03-25 23:57:09 +01:00
Jaeden Amero
f65379bc40
Merge remote-tracking branch 'upstream-restricted/pr/382' into development
2018-03-23 11:14:17 +00:00
Gilles Peskine
51d9394fdf
Add changelog entries for improved testing
...
Fixes #1040
2018-03-23 02:16:43 +01:00
Gilles Peskine
15ad579895
Merge tag 'mbedtls-2.8.0' into iotssl-1381-x509-verify-refactor-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:16:22 +01:00
Jethro Beekman
d2df936e67
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:01:18 -07:00
Gilles Peskine
fc458d0b9b
Merge remote-tracking branch 'myfork/pr_1073' into development-proposed
2018-03-22 21:53:12 +01:00
Gilles Peskine
0818540ff7
Merge branch 'pr_726' into development-proposed
2018-03-22 21:50:48 +01:00
Gilles Peskine
88c6df1ce8
Add ChangeLog entry
2018-03-22 21:48:28 +01:00
Gilles Peskine
5bdb671404
Merge branch 'pr_403' into development-proposed
2018-03-22 21:34:15 +01:00
Gilles Peskine
58afc39dd7
Add ChangeLog entry
2018-03-22 21:33:28 +01:00
Gilles Peskine
9b9cc616ca
Add ChangeLog entry
2018-03-22 17:03:45 +01:00
Azim Khan
bdfc14e4a3
Add reference to original PR in Changelog
2018-03-22 12:17:36 +00:00