Add TLS1.2 support

Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent 1c35ee38
......@@ -5331,15 +5331,23 @@ module OneM2M_Functions {
log(">>> f_getLocalPoA: ", p_portDesc);
if (ischosen(p_portDesc.binding.httpBindingDesc)) {
v_poa := "http://" & p_portDesc.binding.httpBindingDesc.bindingDesc.tsAddress;
if (ispresent(p_portDesc.binding.httpBindingDesc.bindingDesc.useTls) and (p_portDesc.binding.httpBindingDesc.bindingDesc.useTls == true)) {
v_poa := "https://" & p_portDesc.binding.httpBindingDesc.bindingDesc.tsAddress;
} else {
v_poa := "http://" & p_portDesc.binding.httpBindingDesc.bindingDesc.tsAddress;
}
if (ispresent(p_portDesc.binding.httpBindingDesc.bindingDesc.localPort)) {
v_poa := v_poa & ":" & int2str(p_portDesc.binding.httpBindingDesc.bindingDesc.localPort);
}
v_poa := v_poa & ":" & int2str(p_portDesc.binding.httpBindingDesc.bindingDesc.localPort);
}
} else if (ischosen(p_portDesc.binding.coapBindingDesc)) {
v_poa := "coap://" & p_portDesc.binding.coapBindingDesc.bindingDesc.tsAddress;
if (ispresent(p_portDesc.binding.coapBindingDesc.bindingDesc.localPort)) {
v_poa := v_poa & ":" & int2str(p_portDesc.binding.coapBindingDesc.bindingDesc.localPort);
}
if (ispresent(p_portDesc.binding.coapBindingDesc.bindingDesc.useTls) and (p_portDesc.binding.coapBindingDesc.bindingDesc.useTls == true)) {
v_poa := "coaps://" & p_portDesc.binding.coapBindingDesc.bindingDesc.tsAddress;
} else {
v_poa := "coap://" & p_portDesc.binding.coapBindingDesc.bindingDesc.tsAddress;
}
if (ispresent(p_portDesc.binding.coapBindingDesc.bindingDesc.localPort)) {
v_poa := v_poa & ":" & int2str(p_portDesc.binding.coapBindingDesc.bindingDesc.localPort);
}
} else if (ischosen(p_portDesc.binding.mqttBindingDesc)) {
v_poa := "mqtt://" & p_portDesc.binding.mqttBindingDesc.bindingDesc.tsAddress;
if (ispresent(p_portDesc.binding.mqttBindingDesc.bindingDesc.localPort)) {
......
......@@ -311,7 +311,8 @@ module OneM2M_Pixits {
tsAddress := "127.0.0.1",
remotePort:= 8080,
localPort := 3132,
sutAddress := "127.0.0.1"
sutAddress := "127.0.0.1",
useTls := false
}
}
},
......@@ -325,7 +326,8 @@ module OneM2M_Pixits {
tsAddress := "127.0.0.1",
remotePort:= 8080,
localPort := 3142,
sutAddress := "127.0.0.1"
sutAddress := "127.0.0.1",
useTls := false
}
}
},
......@@ -339,7 +341,8 @@ module OneM2M_Pixits {
tsAddress := "127.0.0.1",
remotePort:= 8080,
localPort := 4132,
sutAddress := "127.0.0.1"
sutAddress := "127.0.0.1",
useTls := false
}
}
},
......@@ -353,7 +356,8 @@ module OneM2M_Pixits {
tsAddress := "127.0.0.1",
remotePort:= 8080,
localPort := 4142,
sutAddress := "127.0.0.1"
sutAddress := "127.0.0.1",
useTls := false
}
}
},
......@@ -373,7 +377,8 @@ module OneM2M_Pixits {
tsAddress := "127.0.0.1",
remotePort := 8080, // SUT CoAP/HTTP port
localPort := 3033, // Test Adapter client port (for debug purpose only)
sutAddress := "127.0.0.1"
sutAddress := "127.0.0.1",
useTls := false
}
}
},
......@@ -387,7 +392,8 @@ module OneM2M_Pixits {
tsAddress := "127.0.0.1",
remotePort := omit,
localPort := 3043, // Test Adapter listener port (AeSimu acts as server)
sutAddress := "127.0.0.1"
sutAddress := "127.0.0.1",
useTls := false
}
}
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment