Warmcat homepage andy@warmcat.com
libwebsockets
{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1750148621, "reponame":"openssl", "desc":"OpenSSL", "owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://warmcat.com/repo/openssl", "f":3, "items": [ {"schema":"libjg2-1", "cid":"19d219523daf02017b70a7b5da2d2bc8", "commit": {"type":"commit", "time": 1524074213, "time_ofs": 120, "oid_tree": { "oid": "c73d8550528809192cd593a544b5be88f1cff869", "alias": []}, "oid":{ "oid": "17cde9c2e404a0ada05601fb726dbaed6c532112", "alias": []}, "msg": "TLSProxy/Proxy.pm: refine NewSessionTicket detection.", "sig_commit": { "git_time": { "time": 1524074213, "offset": 120 }, "name": "Andy Polyakov", "email": "appro@openssl.org", "md5": "50bd64fa2a792cbbf679fa16213a3b2a" }, "sig_author": { "git_time": { "time": 1523880787, "offset": 120 }, "name": "Andy Polyakov", "email": "appro@openssl.org", "md5": "50bd64fa2a792cbbf679fa16213a3b2a" }}, "body": "TLSProxy/Proxy.pm: refine NewSessionTicket detection.\n\nReviewed-by: Richard Levitte \u003clevitte@openssl.org\u003e\n(Merged from https://github.com/openssl/openssl/pull/5975)\n" , "diff": "diff --git a/util/perl/TLSProxy/Proxy.pm b/util/perl/TLSProxy/Proxy.pm\nindex 9e9764d..df17731 100644\n--- a/util/perl/TLSProxy/Proxy.pm\n+++ b/util/perl/TLSProxy/Proxy.pm\n@@ -369,13 +369,14 @@ sub clientstart\n $fdset \u003d IO::Select-\u003enew($server_sock, $client_sock);\n my @ready;\n my $ctr \u003d 0;\n- my $sessionfile \u003d $self-\u003e{sessionfile};\n local $SIG{PIPE} \u003d \u0022IGNORE\u0022;\n+ $self-\u003e{saw_session_ticket} \u003d undef;\n while($fdset-\u003ecount \u0026\u0026 $ctr \u003c 10) {\n- if (defined($sessionfile)) {\n+ if (defined($self-\u003e{sessionfile})) {\n # s_client got -ign_eof and won't be exiting voluntarily, so we\n- # look for data *and* check on session file...\n- last if TLSProxy::Message-\u003esuccess() \u0026\u0026 -s $sessionfile;\n+ # look for data *and* session ticket...\n+ last if TLSProxy::Message-\u003esuccess()\n+ \u0026\u0026 $self-\u003e{saw_session_ticket};\n }\n if (!(@ready \u003d $fdset-\u003ecan_read(1))) {\n $ctr++;\n@@ -449,7 +450,7 @@ sub clientstart\n $self-\u003econnect_to_server();\n }\n $pid \u003d $self-\u003e{clientpid};\n- print \u0022Waiting for client process to close: $pid...\u005cn\u0022;\n+ print \u0022Waiting for s_client process to close: $pid...\u005cn\u0022;\n waitpid($pid, 0);\n \n return 1;\n@@ -496,6 +497,14 @@ sub process_packet\n $self-\u003efilter-\u003e($self);\n }\n \n+ #Take a note on NewSessionTicket\n+ foreach my $message (reverse @{$self-\u003e{message_list}}) {\n+ if ($message-\u003e{mt} \u003d\u003d TLSProxy::Message::MT_NEW_SESSION_TICKET) {\n+ $self-\u003e{saw_session_ticket} \u003d 1;\n+ last;\n+ }\n+ }\n+\n #Reconstruct the packet\n $packet \u003d \u0022\u0022;\n foreach my $record (@{$self-\u003erecord_list}) {\n","s":{"c":1750025276,"u": 35139}} ],"g": 1237,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "7d0a"}