Gilles Peskine 3963993e2a Merge 'mbedtls/development' into merge-crypto-development-20190806 ... Conflicts and changes: * Files that do not exist in Mbed Crypto and have changed in Mbed TLS: These files should not exist in Mbed Crypto. Keep them deleted. * tests/data_files/test-ca.server1.db: new file in Mbed TLS, don't create it in Mbed Crypto. * tests/data_files/rsa_pkcs1_1024_clear.pem: do create this file in Mbed Crypto. I don't see why it would be kept out. * tests/data_files/Makefile: don't take any of the changes in sections that have been removed in Crypto. Do take in the certificate expiration date updates and the extra .crt.der rules (even if Crypto doesn't actually use those certificates: removing them would be out of scope of the present merge). * tests/suites/helpers.function: consecutive additions, take both (order indifferent).		2019-08-06 19:09:55 +02:00
..
.jenkins
data_files	Merge 'mbedtls/development' into merge-crypto-development-20190806	2019-08-06 19:09:55 +02:00
docker/bionic	Improve compatibility with firewalled networks	2019-06-29 17:45:34 -05:00
git-scripts
scripts	Merge remote-tracking branch 'tls/development' into development	2019-07-31 10:37:53 +01:00
suites	Merge 'mbedtls/development' into merge-crypto-development-20190806	2019-08-06 19:09:55 +02:00
.gitignore
CMakeLists.txt	Move fuzz directory to programs	2019-06-27 08:46:45 +02:00
Descriptions.txt	Remove tests that depend on TLS or X.509	2019-03-11 16:49:26 +00:00
make-in-docker.sh	Clean up file prologue comments	2019-06-29 17:45:34 -05:00
Makefile	Merge remote-tracking branch 'tls/development' into development	2019-07-31 10:37:53 +01:00