Merge branch 'development' into dtls
* development:
Add missing guards for gnuTLS
Prepare for mbed TLS 1.3.10 release
Fix potential timing issue in RSA pms handling
Conflicts:
ChangeLog
doxygen/input/doc_mainpage.h
doxygen/mbedtls.doxyfile
include/polarssl/version.h
library/CMakeLists.txt
library/ssl_srv.c
tests/suites/test_suite_version.data
visualc/VS2010/mbedTLS.vcxproj
visualc/VS6/mbedtls.dsp
visualc/VS6/mbedtls.dsw
diff --git a/visualc/VS6/mbedtls.dsw b/visualc/VS6/mbedtls.dsw
index 6a5a93a..2561750 100644
--- a/visualc/VS6/mbedtls.dsw
+++ b/visualc/VS6/mbedtls.dsw
@@ -1,4 +1,3 @@
-<<<<<<< HEAD:visualc/VS6/polarssl.dsw
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
@@ -13,7 +12,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -28,7 +27,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -43,7 +42,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -58,7 +57,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -73,7 +72,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -88,7 +87,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -103,7 +102,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -118,7 +117,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -133,7 +132,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -148,7 +147,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -163,7 +162,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -178,7 +177,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -193,7 +192,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -208,7 +207,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -223,7 +222,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -238,7 +237,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -253,7 +252,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -268,7 +267,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -283,7 +282,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -298,7 +297,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -313,7 +312,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -328,7 +327,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -343,7 +342,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -358,7 +357,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -373,7 +372,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -388,7 +387,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -403,7 +402,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -418,7 +417,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -433,7 +432,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -448,7 +447,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -463,7 +462,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -478,7 +477,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -493,7 +492,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -508,7 +507,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -523,7 +522,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -538,7 +537,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -553,7 +552,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -568,7 +567,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -583,7 +582,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -598,7 +597,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -613,7 +612,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -628,7 +627,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -643,7 +642,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -658,7 +657,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -673,7 +672,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -688,7 +687,7 @@
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name polarssl
+ Project_Dep_Name mbedtls
End Project Dependency
}}}
@@ -706,666 +705,3 @@
###############################################################################
-=======
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "aescrypt2"=.\aescrypt2.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "crypt_and_hash"=.\crypt_and_hash.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "hello"=.\hello.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "generic_sum"=.\generic_sum.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "md5sum"=.\md5sum.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "sha1sum"=.\sha1sum.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "sha2sum"=.\sha2sum.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "dh_client"=.\dh_client.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "dh_genprime"=.\dh_genprime.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "dh_server"=.\dh_server.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "gen_key"=.\gen_key.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "key_app"=.\key_app.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "key_app_writer"=.\key_app_writer.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "mpi_demo"=.\mpi_demo.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "pk_decrypt"=.\pk_decrypt.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "pk_encrypt"=.\pk_encrypt.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "pk_sign"=.\pk_sign.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "pk_verify"=.\pk_verify.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "rsa_genkey"=.\rsa_genkey.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "rsa_decrypt"=.\rsa_decrypt.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "rsa_encrypt"=.\rsa_encrypt.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "rsa_sign"=.\rsa_sign.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "rsa_verify"=.\rsa_verify.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "rsa_sign_pss"=.\rsa_sign_pss.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "rsa_verify_pss"=.\rsa_verify_pss.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ssl_client1"=.\ssl_client1.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ssl_client2"=.\ssl_client2.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ssl_server"=.\ssl_server.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ssl_server2"=.\ssl_server2.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ssl_fork_server"=.\ssl_fork_server.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ssl_mail_client"=.\ssl_mail_client.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "gen_entropy"=.\gen_entropy.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "gen_random_havege"=.\gen_random_havege.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "gen_random_ctr_drbg"=.\gen_random_ctr_drbg.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ssl_cert_test"=.\ssl_cert_test.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "benchmark"=.\benchmark.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "selftest"=.\selftest.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "ssl_test"=.\ssl_test.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "pem2der"=.\pem2der.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "strerror"=.\strerror.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "cert_app"=.\cert_app.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "crl_app"=.\crl_app.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "cert_req"=.\cert_req.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
- Begin Project Dependency
- Project_Dep_Name mbedtls
- End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
->>>>>>> development:visualc/VS6/mbedtls.dsw