kris/httperf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

WiP: disable some functions so that it compiles against boringssl

Browse Source
This commit is contained in:
Henry Case 2019-07-23 17:11:14 +01:00
parent 20d43a035a
commit 50b4fa4334
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gen/session.c
View File

@ -9,7 +9,7 @@
modify it under the terms of the GNU General Public License as modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of the published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version. License, or (at your option) any later version.
In addition, as a special exception, the copyright holders give In addition, as a special exception, the copyright holders give
permission to link the code of this work with the OpenSSL project's permission to link the code of this work with the OpenSSL project's
"OpenSSL" library (or with modified versions of it that use the same "OpenSSL" library (or with modified versions of it that use the same
@ -27,7 +27,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA 02110-1301, USA
*/ */
@ -152,10 +152,10 @@ create_conn (Sess *sess, struct Conn_Info *ci)
#ifdef HAVE_SSL #ifdef HAVE_SSL
if (param.ssl_reuse && ci->conn->ssl && sess->ssl) if (param.ssl_reuse && ci->conn->ssl && sess->ssl)
{ {
if (DBG > 0) if (DBG > 0) fprintf (stderr, "create_conn: reusing SSL session %p\n", (void *) sess->ssl);
fprintf (stderr, "create_conn: reusing SSL session %p\n",
(void *) sess->ssl); fprintf (stderr, "\n\n\n create_conn: Calling not working functionality %p\n");
SSL_copy_session_id (ci->conn->ssl, sess->ssl); // SSL_copy_session_id (ci->conn->ssl, sess->ssl);
} }
#endif #endif
@ -237,7 +237,8 @@ conn_connected (Event_Type et, Object *obj, Any_Type regarg, Any_Type callarg)
#ifdef HAVE_SSL #ifdef HAVE_SSL
if (param.ssl_reuse && !sess->ssl && ci->conn->ssl) if (param.ssl_reuse && !sess->ssl && ci->conn->ssl)
{ {
sess->ssl = SSL_dup (ci->conn->ssl); fprintf (stderr, "\n\n\nconn_connected: Calling not working functionality %p\n");
// sess->ssl = SSL_dup (ci->conn->ssl);
if (DBG > 0) if (DBG > 0)
fprintf (stderr, "create_conn: cached SSL session %p as %p\n", fprintf (stderr, "create_conn: cached SSL session %p as %p\n",
(void *) ci->conn->ssl, (void *) sess->ssl); (void *) ci->conn->ssl, (void *) sess->ssl);