Merge origin/TestSuite into TestSuite

jurajsomorovsky · jurajsomorovsky · commit 3fbfe2a2f1c7 · 2016-05-31T11:41:28.000+02:00
Conflicts:
	resources/testsuite/CiphersuiteCompatibility/README.md
	resources/testsuite/CryptoAttacks/README.md
diff --git a/resources/testsuite/CiphersuiteCompatibility/README.md b/resources/testsuite/CiphersuiteCompatibility/README.md
@@ -1,2 +1,2 @@
 Specific TLS cipher suites should only be supported in specific TLS versions.
-This testsuite checks whether the server correctly handles cipher suites and their support across different protocols. For example, TLS_RSA_WITH_AES_256_CBC_SHA256 should only be supported in TLS 1.2.
+This testsuite checks whether the server correctly handles cipher suites and their support across different protocols. For example, TLS_RSA_WITH_AES_256_CBC_SHA256 should only be supported in TLS 1.2.
diff --git a/resources/testsuite/CryptoAttacks/README.md b/resources/testsuite/CryptoAttacks/README.md
@@ -1 +1 @@
-This testsuite validates the correct server behavior that protects from various cryptographic attacks.
+This testsuite checks validates the correct server behavior that protects from various cryptographic attacks.

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`Specific TLS cipher suites should only be supported in specific TLS versions.`
`2`		`-This testsuite checks whether the server correctly handles cipher suites and their support across different protocols. For example, TLS_RSA_WITH_AES_256_CBC_SHA256 should only be supported in TLS 1.2.`
	`2`	`+This testsuite checks whether the server correctly handles cipher suites and their support across different protocols. For example, TLS_RSA_WITH_AES_256_CBC_SHA256 should only be supported in TLS 1.2.`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-This testsuite validates the correct server behavior that protects from various cryptographic attacks.`
	`1`	`+This testsuite checks validates the correct server behavior that protects from various cryptographic attacks.`