1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-15 00:02:49 +03:00

dir changes - things are broken at the moment

git-svn-id: svn://svn.code.sf.net/p/axtls/code/trunk@116 9a5d90b5-6617-0410-8a86-bb477d3ed2e3
This commit is contained in:
cameronrich
2007-08-29 09:15:39 +00:00
parent a1bfbe6b07
commit f9ee197cff
40 changed files with 432 additions and 901 deletions

View File

@ -30,7 +30,7 @@ TARGET=../../$(STAGE)/axssl
endif # cygwin
LIBS=../../$(STAGE)
CFLAGS += -I../../ssl -I../../config
CFLAGS += -I../../crypto -I../../ssl -I../../config
else
TARGET=../../$(STAGE)/axssl.exe
CFLAGS += /I"..\..\ssl" /I"..\..\config"

View File

@ -607,7 +607,8 @@ static void do_client(int argc, char *argv[])
{
while (reconnect--)
{
ssl = ssl_client_new(ssl_ctx, client_fd, session_id);
ssl = ssl_client_new(ssl_ctx, client_fd, session_id,
sizeof(session_id));
if ((res = ssl_handshake_status(ssl)) != SSL_OK)
{
if (!quiet)
@ -635,7 +636,7 @@ static void do_client(int argc, char *argv[])
}
else
{
ssl = ssl_client_new(ssl_ctx, client_fd, NULL);
ssl = ssl_client_new(ssl_ctx, client_fd, NULL, 0);
}
/* check the return status */
@ -854,9 +855,10 @@ static void display_session_id(SSL *ssl)
{
int i;
const uint8_t *session_id = ssl_get_session_id(ssl);
int sess_id_size = ssl_get_session_id_size(ssl);
printf("-----BEGIN SSL SESSION PARAMETERS-----\n");
for (i = 0; i < SSL_SESSION_ID_SIZE; i++)
for (i = 0; i < sess_id_size; i++)
{
printf("%02x", session_id[i]);
}

View File

@ -508,7 +508,8 @@ public class axssl
{
while (reconnect-- > 0)
{
ssl = ssl_ctx.Connect(client_sock, session_id);
ssl = ssl_ctx.Connect(client_sock, session_id,
axtls.SSL_SESSION_ID_SIZE);
if ((res = ssl.HandshakeStatus()) != axtls.SSL_OK)
{

View File

@ -429,10 +429,12 @@ function do_client(build_mode)
-- Try session resumption?
if reconnect ~= 0 then
local session_id = nil
local sess_id_size = 0
while reconnect > 0 do
reconnect = reconnect - 1
ssl = axtlsl.ssl_client_new(ssl_ctx,
client_sock:getfd(), session_id)
client_sock:getfd(), session_id, sess_id_size)
res = axtlsl.ssl_handshake_status(ssl)
if res ~= axtlsl.SSL_OK then
@ -443,6 +445,7 @@ function do_client(build_mode)
display_session_id(ssl)
session_id = axtlsl.ssl_get_session_id(ssl)
sess_id_size = axtlsl.ssl_get_session_id_size(ssl)
if reconnect > 0 then
axtlsl.ssl_free(ssl)
@ -452,7 +455,7 @@ function do_client(build_mode)
end
else
ssl = axtlsl.ssl_client_new(ssl_ctx, client_sock:getfd(), nil)
ssl = axtlsl.ssl_client_new(ssl_ctx, client_sock:getfd(), nil, 0)
end
-- check the return status

View File

@ -411,9 +411,12 @@ sub do_client
if ($reconnect)
{
my $session_id = undef;
my $sess_id_size = 0;
while ($reconnect--)
{
$ssl = axtlsp::ssl_client_new($ssl_ctx, $native_sock, $session_id);
$ssl = axtlsp::ssl_client_new($ssl_ctx, $native_sock,
$session_id, $sess_id_size);
$res = axtlsp::ssl_handshake_status($ssl);
if ($res != $axtlsp::SSL_OK)
@ -439,7 +442,7 @@ sub do_client
}
else
{
$ssl = axtlsp::ssl_client_new($ssl_ctx, $native_sock, undef);
$ssl = axtlsp::ssl_client_new($ssl_ctx, $native_sock, undef, 0);
}
# check the return status