Merge pull request #62 from gleydsonsoares/update_protocol_samples

add TLS_method / rename "sslv23" to "any" / update protocol samples.
2024-11-08 06:28:26 +01:00 · 2015-11-19 12:18:49 -02:00 · 2015-11-19 12:18:49 -02:00 · 8be458ff8a
commit 8be458ff8a
parent 64faf6322e 5561ddfa3c
27 changed files with 31 additions and 28 deletions
--- a/samples/chain/client.lua
+++ b/samples/chain/client.lua
@ -7,7 +7,7 @@ local util   = require("util")

 local params = {
   mode = "client",
-   protocol = "tlsv1",
+   protocol = "tlsv1_2",
   key = "../certs/clientAkey.pem",
   certificate = "../certs/clientA.pem",
   cafile = "../certs/rootA.pem",
--- a/samples/chain/server.lua
+++ b/samples/chain/server.lua
@ -7,7 +7,7 @@ local util   = require("util")

 local params = {
   mode = "server",
-   protocol = "tlsv1",
+   protocol = "any",
   key = "../certs/serverAkey.pem",
   certificate = "../certs/serverA.pem",
   cafile = "../certs/rootA.pem",
--- a/samples/dhparam/client.lua
+++ b/samples/dhparam/client.lua
@ -6,7 +6,7 @@ local ssl    = require("ssl")

 local params = {
   mode = "client",
-   protocol = "tlsv1",
+   protocol = "tlsv1_2",
   key = "../certs/clientAkey.pem",
   certificate = "../certs/clientA.pem",
   cafile = "../certs/rootA.pem",
--- a/samples/dhparam/server.lua
+++ b/samples/dhparam/server.lua
@ -31,7 +31,7 @@ end

 local params = {
   mode = "server",
-   protocol = "tlsv1",
+   protocol = "any",
   key = "../certs/serverAkey.pem",
   certificate = "../certs/serverA.pem",
   cafile = "../certs/rootA.pem",
--- a/samples/digest/client.lua
+++ b/samples/digest/client.lua
@ -6,7 +6,7 @@ local ssl    = require("ssl")

 local params = {
   mode = "client",
-   protocol = "tlsv1",
+   protocol = "tlsv1_2",
   key = "../certs/clientAkey.pem",
   certificate = "../certs/clientA.pem",
   cafile = "../certs/rootA.pem",
--- a/samples/digest/server.lua
+++ b/samples/digest/server.lua
@ -6,7 +6,7 @@ local ssl    = require("ssl")

 local params = {
   mode = "server",
-   protocol = "tlsv1",
+   protocol = "any",
   key = "../certs/serverAkey.pem",
   certificate = "../certs/serverA.pem",
   cafile = "../certs/rootA.pem",
--- a/samples/ecdh/client.lua
+++ b/samples/ecdh/client.lua
@ -6,7 +6,7 @@ local ssl    = require("ssl")

 local params = {
   mode = "client",
-   protocol = "tlsv1",
+   protocol = "tlsv1_2",
   key = "../certs/clientAkey.pem",
   certificate = "../certs/clientA.pem",
   cafile = "../certs/rootA.pem",
--- a/samples/ecdh/server.lua
+++ b/samples/ecdh/server.lua
@ -6,7 +6,7 @@ local ssl    = require("ssl")

 local params = {
   mode = "server",
-   protocol = "tlsv1",
+   protocol = "any",
   key = "../certs/serverAkey.pem",
   certificate = "../certs/serverA.pem",
   cafile = "../certs/rootA.pem",
--- a/samples/info/client.lua
+++ b/samples/info/client.lua
@ -6,7 +6,7 @@ local ssl    = require("ssl")

 local params = {
   mode = "client",
-   protocol = "tlsv1",
+   protocol = "tlsv1_2",
   key = "../certs/clientAkey.pem",
   certificate = "../certs/clientA.pem",
   cafile = "../certs/rootA.pem",
--- a/samples/info/server.lua
+++ b/samples/info/server.lua
@ -6,7 +6,7 @@ local ssl    = require("ssl")

 local params = {
   mode = "server",
-   protocol = "tlsv1",
+   protocol = "any",
   key = "../certs/serverAkey.pem",
   certificate = "../certs/serverA.pem",
   cafile = "../certs/rootA.pem",
--- a/samples/loop-gc/client.lua
+++ b/samples/loop-gc/client.lua
@ -6,7 +6,7 @@ local ssl    = require("ssl")

 local params = {
   mode = "client",
-   protocol = "tlsv1",
+   protocol = "tlsv1_2",
   key = "../certs/clientAkey.pem",
   certificate = "../certs/clientA.pem",
   cafile = "../certs/rootA.pem",
--- a/samples/loop-gc/server.lua
+++ b/samples/loop-gc/server.lua
@ -6,7 +6,7 @@ local ssl    = require("ssl")

 local params = {
   mode = "server",
-   protocol = "tlsv1",
+   protocol = "any",
   key = "../certs/serverAkey.pem",
   certificate = "../certs/serverA.pem",
   cafile = "../certs/rootA.pem",
--- a/samples/loop/client.lua
+++ b/samples/loop/client.lua
@ -6,7 +6,7 @@ local ssl    = require("ssl")

 local params = {
   mode = "client",
-   protocol = "tlsv1",
+   protocol = "tlsv1_2",
   key = "../certs/clientAkey.pem",
   certificate = "../certs/clientA.pem",
   cafile = "../certs/rootA.pem",
--- a/samples/loop/server.lua
+++ b/samples/loop/server.lua
@ -6,7 +6,7 @@ local ssl    = require("ssl")

 local params = {
   mode = "server",
-   protocol = "tlsv1",
+   protocol = "any",
   key = "../certs/serverAkey.pem",
   certificate = "../certs/serverA.pem",
   cafile = "../certs/rootA.pem",
--- a/samples/oneshot/client.lua
+++ b/samples/oneshot/client.lua
@ -6,7 +6,7 @@ local ssl    = require("ssl")

 local params = {
   mode = "client",
-   protocol = "tlsv1",
+   protocol = "tlsv1_2",
   key = "../certs/clientAkey.pem",
   certificate = "../certs/clientA.pem",
   cafile = "../certs/rootA.pem",
--- a/samples/oneshot/server.lua
+++ b/samples/oneshot/server.lua
@ -6,7 +6,7 @@ local ssl    = require("ssl")

 local params = {
   mode = "server",
-   protocol = "tlsv1",
+   protocol = "any",
   key = "../certs/serverAkey.pem",
   certificate = "../certs/serverA.pem",
   cafile = "../certs/rootA.pem",
--- a/samples/sni/client.lua
+++ b/samples/sni/client.lua
@ -3,7 +3,7 @@ local ssl    = require("ssl")

 local params = {
  mode = "client",
-  protocol = "tlsv1",
+  protocol = "tlsv1_2",
  key = "../certs/clientAkey.pem",
  certificate = "../certs/clientA.pem",
  cafile = "../certs/rootA.pem",
--- a/samples/sni/server.lua
+++ b/samples/sni/server.lua
@ -3,7 +3,7 @@ local ssl    = require("ssl")

 local params01 = {
  mode = "server",
-  protocol = "tlsv1",
+  protocol = "any",
  key = "../certs/serverAkey.pem",
  certificate = "../certs/serverA.pem",
  cafile = "../certs/rootA.pem",
@ -14,7 +14,7 @@ local params01 = {

 local params02 = {
  mode = "server",
-  protocol = "tlsv1",
+  protocol = "any",
  key = "../certs/serverAAkey.pem",
  certificate = "../certs/serverAA.pem",
  cafile = "../certs/rootA.pem",
--- a/samples/verify/client.lua
+++ b/samples/verify/client.lua
@ -6,7 +6,7 @@ local ssl    = require("ssl")

 local params = {
   mode = "client",
-   protocol = "tlsv1",
+   protocol = "tlsv1_2",
   key = "../certs/serverBkey.pem",
   certificate = "../certs/serverB.pem",
   cafile = "../certs/rootB.pem",
--- a/samples/verify/server.lua
+++ b/samples/verify/server.lua
@ -6,7 +6,7 @@ local ssl    = require("ssl")

 local params = {
   mode = "server",
-   protocol = "tlsv1",
+   protocol = "any",
   key = "../certs/serverAkey.pem",
   certificate = "../certs/serverA.pem",
   cafile = "../certs/rootA.pem",
--- a/samples/want/client.lua
+++ b/samples/want/client.lua
@ -8,7 +8,7 @@ local ssl    = require("ssl")

 local params = {
   mode = "client",
-   protocol = "tlsv1",
+   protocol = "tlsv1_2",
   key = "../certs/clientAkey.pem",
   certificate = "../certs/clientA.pem",
   cafile = "../certs/rootA.pem",
--- a/samples/want/server.lua
+++ b/samples/want/server.lua
@ -6,7 +6,7 @@ local ssl    = require("ssl")

 local params = {
   mode = "server",
-   protocol = "tlsv1",
+   protocol = "any",
   key = "../certs/serverAkey.pem",
   certificate = "../certs/serverA.pem",
   cafile = "../certs/rootA.pem",
--- a/samples/wantread/client.lua
+++ b/samples/wantread/client.lua
@ -6,7 +6,7 @@ local ssl    = require("ssl")

 local params = {
   mode = "client",
-   protocol = "tlsv1",
+   protocol = "tlsv1_2",
   key = "../certs/clientAkey.pem",
   certificate = "../certs/clientA.pem",
   cafile = "../certs/rootA.pem",
--- a/samples/wantread/server.lua
+++ b/samples/wantread/server.lua
@ -8,7 +8,7 @@ local ssl    = require("ssl")

 local params = {
   mode = "server",
-   protocol = "tlsv1",
+   protocol = "any",
   key = "../certs/serverAkey.pem",
   certificate = "../certs/serverA.pem",
   cafile = "../certs/rootA.pem",
--- a/samples/wantwrite/client.lua
+++ b/samples/wantwrite/client.lua
@ -6,7 +6,7 @@ local ssl    = require("ssl")

 local params = {
   mode = "client",
-   protocol = "tlsv1",
+   protocol = "tlsv1_2",
   key = "../certs/clientAkey.pem",
   certificate = "../certs/clientA.pem",
   cafile = "../certs/rootA.pem",
--- a/samples/wantwrite/server.lua
+++ b/samples/wantwrite/server.lua
@ -8,7 +8,7 @@ print("Use Ctrl+S and Ctrl+Q to suspend and resume the server.")

 local params = {
   mode = "server",
-   protocol = "tlsv1",
+   protocol = "any",
   key = "../certs/serverAkey.pem",
   certificate = "../certs/serverA.pem",
   cafile = "../certs/rootA.pem",
--- a/src/context.c
+++ b/src/context.c
@ -93,7 +93,10 @@ static int set_option_flag(const char *opt, unsigned long *flag)
 */
 static LSEC_SSL_METHOD* str2method(const char *method)
 {
-  if (!strcmp(method, "sslv23"))  return SSLv23_method();
+#if OPENSSL_VERSION_NUMBER>=0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+#define SSLv23_method TLS_method
+#endif
+  if (!strcmp(method, "any"))  return SSLv23_method();
 #ifndef OPENSSL_NO_SSL3
  if (!strcmp(method, "sslv3"))   return SSLv3_method();
 #endif