You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2010/09/16 17:05:05 UTC
svn commit: r997778 - in /trafficserver/traffic/trunk: build/ iocore/net/
proxy/ proxy/http2/ proxy/mgmt2/ proxy/mgmt2/web2/ test/SDKtest/client/
Author: zwoop
Date: Thu Sep 16 15:05:04 2010
New Revision: 997778
URL: http://svn.apache.org/viewvc?rev=997778&view=rev
Log:
TS-367 Remove HAVE_LIBSSL
Author: Mladen Turk
Small additions by Leif.
Modified:
trafficserver/traffic/trunk/build/crypto.m4
trafficserver/traffic/trunk/iocore/net/I_NetProcessor.h
trafficserver/traffic/trunk/iocore/net/NetTest-connect.c
trafficserver/traffic/trunk/iocore/net/NetTest-http-server.c
trafficserver/traffic/trunk/iocore/net/NetTest-simple-proxy.c
trafficserver/traffic/trunk/iocore/net/P_Net.h
trafficserver/traffic/trunk/iocore/net/SSLCertLookup.cc
trafficserver/traffic/trunk/iocore/net/SSLConfig.cc
trafficserver/traffic/trunk/iocore/net/SSLNet.cc
trafficserver/traffic/trunk/iocore/net/SSLNetVConnection.cc
trafficserver/traffic/trunk/iocore/net/SSLUnixNet.cc
trafficserver/traffic/trunk/iocore/net/test_I_Net.cc
trafficserver/traffic/trunk/proxy/Main.cc
trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.cc
trafficserver/traffic/trunk/proxy/http2/HttpSM.cc
trafficserver/traffic/trunk/proxy/mgmt2/Main.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebUtils.cc
trafficserver/traffic/trunk/test/SDKtest/client/DoTest.cc
trafficserver/traffic/trunk/test/SDKtest/client/DoTest.h
Modified: trafficserver/traffic/trunk/build/crypto.m4
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/build/crypto.m4?rev=997778&r1=997777&r2=997778&view=diff
==============================================================================
--- trafficserver/traffic/trunk/build/crypto.m4 (original)
+++ trafficserver/traffic/trunk/build/crypto.m4 Thu Sep 16 15:05:04 2010
@@ -103,27 +103,8 @@ if test "$enable_openssl" != "no"; then
if test "$openssl_have_headers" != "0"; then
AC_CHECK_DECLS([EVP_PKEY_CTX_new], [], [],
[#include <openssl/evp.h>])
-
enable_crypto=yes
-
- AC_MSG_CHECKING([for const input buffers in OpenSSL])
- AC_TRY_COMPILE([#include <openssl/rsa.h>],
- [ const unsigned char * buf;
- unsigned char * outbuf;
- RSA rsa;
- RSA_private_decrypt(1,
- buf,
- outbuf,
- &rsa,
- RSA_PKCS1_PADDING);
-
- ],
- [AC_MSG_RESULT([yes])]
- [AC_DEFINE([CRYPTO_OPENSSL_CONST_BUFFERS], 1, [Define that OpenSSL uses const buffers])],
- [AC_MSG_RESULT([no])])
-
AC_SUBST([LIBSSL],["-lssl -lcrypto"])
- AC_DEFINE([HAVE_LIBSSL],[1],[Define to 1 if you have OpenSSL library])
else
enable_openssl=no
CPPFLAGS=$saved_cppflags
Modified: trafficserver/traffic/trunk/iocore/net/I_NetProcessor.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/I_NetProcessor.h?rev=997778&r1=997777&r2=997778&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/I_NetProcessor.h (original)
+++ trafficserver/traffic/trunk/iocore/net/I_NetProcessor.h Thu Sep 16 15:05:04 2010
@@ -297,9 +297,8 @@ private:
@endcode
*/
-extern inkcoreapi NetProcessor & netProcessor;
+extern inkcoreapi NetProcessor& netProcessor;
-#ifdef HAVE_LIBSSL
/**
Global netProcessor singleton object for making ssl enabled net
calls. As far as the SM is concerned this behaves excatly like
@@ -307,7 +306,6 @@ extern inkcoreapi NetProcessor & netProc
over ssl.
*/
-extern inkcoreapi NetProcessor & sslNetProcessor;
-#endif
+extern inkcoreapi NetProcessor& sslNetProcessor;
#endif
Modified: trafficserver/traffic/trunk/iocore/net/NetTest-connect.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/NetTest-connect.c?rev=997778&r1=997777&r2=997778&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/NetTest-connect.c (original)
+++ trafficserver/traffic/trunk/iocore/net/NetTest-connect.c Thu Sep 16 15:05:04 2010
@@ -79,12 +79,7 @@ test_main()
EThread *t = this_ethread();
MUTEX_TRY_LOCK(lock, nct->mutex, t);
ink_debug_assert(lock);
- Action *a =
-#ifdef HAVE_LIBSSL
- sslNetProcessor.connect_s(nct, srv_ip[i], srv_port[i], 0, 10 * 1000);
-#else
- netProcessor.connect_s(nct, srv_ip[i], srv_port[i], 0, 1000 * 1000);
-#endif
+ Action *a = sslNetProcessor.connect_s(nct, srv_ip[i], srv_port[i], 0, 10 * 1000);
}
return 0;
}
Modified: trafficserver/traffic/trunk/iocore/net/NetTest-http-server.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/NetTest-http-server.c?rev=997778&r1=997777&r2=997778&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/NetTest-http-server.c (original)
+++ trafficserver/traffic/trunk/iocore/net/NetTest-http-server.c Thu Sep 16 15:05:04 2010
@@ -189,14 +189,8 @@ test_main()
memset(b + strlen(response_hdr), 'x', 8000);
resp_blk->fill(doc_len = strlen(response_hdr) + 8000);
-#ifdef HAVE_LIBSSL
Action *a = sslNetProcessor.accept(NEW(new NetTesterAccept(new_ProxyMutex())),
8080, true);
-#else
- Action *a = netProcessor.accept(NEW(new NetTesterAccept(new_ProxyMutex())),
- 8080, true);
-
-#endif
return 0;
}
Modified: trafficserver/traffic/trunk/iocore/net/NetTest-simple-proxy.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/NetTest-simple-proxy.c?rev=997778&r1=997777&r2=997778&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/NetTest-simple-proxy.c (original)
+++ trafficserver/traffic/trunk/iocore/net/NetTest-simple-proxy.c Thu Sep 16 15:05:04 2010
@@ -115,11 +115,7 @@ struct NetTesterSM:public Continuation
client_vc->cancel_inactivity_timeout();
// connect to the origin server
SET_HANDLER(&NetTesterSM::handle_server_connect);
-#ifdef HAVE_LIBSSL
sslNetProcessor.connect_re(this, origin_server_ip, origin_server_port);
-#else
- netProcessor.connect_s(this, origin_server_ip, origin_server_port);
-#endif
}
break;
case VC_EVENT_READ_COMPLETE:
@@ -304,11 +300,8 @@ test_main()
Action *a;
origin_server_ip = get_addr(origin_server);
-#ifdef HAVE_LIBSSL
a = sslNetProcessor.accept(NEW(new NetTesterAccept(new_ProxyMutex())), 45080, true);
-#else
- a = netProcessor.accept(NEW(new NetTesterAccept(new_ProxyMutex())), 45080, true);
-#endif
+
#ifdef TEST_ACCEPT_CANCEL
Stop *s = NEW(new Stop(new_ProxyMutex()));
eventProcessor.schedule_in(s, HRTIME_SECONDS(10));
Modified: trafficserver/traffic/trunk/iocore/net/P_Net.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/P_Net.h?rev=997778&r1=997777&r2=997778&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/P_Net.h (original)
+++ trafficserver/traffic/trunk/iocore/net/P_Net.h Thu Sep 16 15:05:04 2010
@@ -115,14 +115,11 @@ do { \
#include "P_NetVCTest.h"
#include "P_LibBulkIO.h"
-#ifdef HAVE_LIBSSL
#include "P_SSLConfig.h"
#include "P_SSLNetVConnection.h"
#include "P_SSLNetProcessor.h"
#include "P_SSLNetAccept.h"
#include "P_SSLCertLookup.h"
-#endif
-
#undef NET_SYSTEM_MODULE_VERSION
#define NET_SYSTEM_MODULE_VERSION makeModuleVersion( \
Modified: trafficserver/traffic/trunk/iocore/net/SSLCertLookup.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/SSLCertLookup.cc?rev=997778&r1=997777&r2=997778&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/SSLCertLookup.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/SSLCertLookup.cc Thu Sep 16 15:05:04 2010
@@ -23,8 +23,6 @@
#include "ink_config.h"
-#ifdef HAVE_LIBSSL
-
#include "P_SSLCertLookup.h"
#include "P_UnixNet.h"
@@ -234,5 +232,3 @@ SSLCertLookup::~SSLCertLookup()
{
ink_hash_table_destroy_and_xfree_values(SSLCertLookupHashTable);
}
-
-#endif
Modified: trafficserver/traffic/trunk/iocore/net/SSLConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/SSLConfig.cc?rev=997778&r1=997777&r2=997778&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/SSLConfig.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/SSLConfig.cc Thu Sep 16 15:05:04 2010
@@ -32,22 +32,17 @@
#include "inktomi++.h"
#include "I_Layout.h"
-#ifdef HAVE_LIBSSL
#include <string.h>
#include "P_Net.h"
#include <openssl/ssl.h>
-int
- SslConfig::id = 0;
-bool
- SslConfig::serverSSLTermination = 0;
+int SslConfig::id = 0;
+bool SslConfig::serverSSLTermination = 0;
-SslConfig
- sslTerminationConfig;
+SslConfig sslTerminationConfig;
#ifndef USE_CONFIG_PROCESSOR
-SslConfigParams *
- SslConfig::ssl_config_params;
+SslConfigParams *SslConfig::ssl_config_params;
#endif
SslConfigParams::SslConfigParams()
@@ -583,5 +578,3 @@ SslConfig::release(SslConfigParams * par
configProcessor.release(id, params);
#endif
}
-
-#endif
Modified: trafficserver/traffic/trunk/iocore/net/SSLNet.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/SSLNet.cc?rev=997778&r1=997777&r2=997778&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/SSLNet.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/SSLNet.cc Thu Sep 16 15:05:04 2010
@@ -30,7 +30,6 @@
#include "ink_config.h"
-#ifdef HAVE_LIBSSL
#include "P_Net.h"
#if !defined (_IOCORE_WIN32) // remove when NT openssl lib is upgraded to eng-0.9.6
#include "openssl/engine.h"
@@ -40,8 +39,7 @@
void sslLockingCallback(int mode, int type, const char *file, int line);
unsigned long SSL_pthreads_thread_id();
-bool
- SSLNetProcessor::open_ssl_initialized = false;
+bool SSLNetProcessor::open_ssl_initialized = false;
int
@@ -582,4 +580,3 @@ SSLNetProcessor::initSSLClient(SslConfig
}
return (0);
}
-#endif
Modified: trafficserver/traffic/trunk/iocore/net/SSLNetVConnection.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/SSLNetVConnection.cc?rev=997778&r1=997777&r2=997778&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/SSLNetVConnection.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/SSLNetVConnection.cc Thu Sep 16 15:05:04 2010
@@ -21,8 +21,6 @@
limitations under the License.
*/
#include "ink_config.h"
-
-#ifdef HAVE_LIBSSL
#include "P_Net.h"
#define SSL_READ_ERROR_NONE 0
@@ -619,5 +617,3 @@ SSLNetVConnection::sslClientHandShakeEve
return EVENT_CONT;
}
-
-#endif
Modified: trafficserver/traffic/trunk/iocore/net/SSLUnixNet.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/SSLUnixNet.cc?rev=997778&r1=997777&r2=997778&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/SSLUnixNet.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/SSLUnixNet.cc Thu Sep 16 15:05:04 2010
@@ -32,7 +32,6 @@
****************************************************************************/
#include "ink_config.h"
-#ifdef HAVE_LIBSSL
#include "P_Net.h"
//
// Global Data
@@ -157,6 +156,3 @@ SSLNetProcessor::~SSLNetProcessor()
{
cleanup();
}
-
-
-#endif
Modified: trafficserver/traffic/trunk/iocore/net/test_I_Net.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/test_I_Net.cc?rev=997778&r1=997777&r2=997778&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/test_I_Net.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/test_I_Net.cc Thu Sep 16 15:05:04 2010
@@ -173,10 +173,7 @@ main()
#endif
netProcessor.start();
-
-#ifdef HAVE_LIBSSL
sslNetProcessor.start(1);
-#endif
/*
* Call the tests main function
Modified: trafficserver/traffic/trunk/proxy/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Main.cc?rev=997778&r1=997777&r2=997778&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/Main.cc Thu Sep 16 15:05:04 2010
@@ -2021,9 +2021,7 @@ main(int argc, char **argv)
udpNet.start(num_of_udp_threads); // XXX : broken for __WIN32
-#ifdef HAVE_LIBSSL
sslNetProcessor.start(getNumSSLThreads());
-#endif
#ifdef USE_NCA
ncaProcessor.start();
Modified: trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.cc?rev=997778&r1=997777&r2=997778&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.cc Thu Sep 16 15:05:04 2010
@@ -353,7 +353,7 @@ start_HttpProxyServer(int fd, int port,
}
}
}
-#ifdef HAVE_LIBSSL
+
SslConfigParams *sslParam = sslTerminationConfig.acquire();
if (sslParam->getTerminationMode() & sslParam->SSL_TERM_MODE_CLIENT) {
@@ -364,7 +364,6 @@ start_HttpProxyServer(int fd, int port,
}
sslTerminationConfig.release(sslParam);
-#endif
#ifdef USE_NCA
start_NcaServer();
Modified: trafficserver/traffic/trunk/proxy/http2/HttpSM.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpSM.cc?rev=997778&r1=997777&r2=997778&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpSM.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpSM.cc Thu Sep 16 15:05:04 2010
@@ -4422,8 +4422,6 @@ HttpSM::do_http_server_open(bool raw)
Action *connect_action_handle;
-#ifdef HAVE_LIBSSL
-
if (t_state.scheme == URL_WKSIDX_HTTPS) {
Debug("http", "calling sslNetProcessor.connect_re");
connect_action_handle = sslNetProcessor.connect_re(this, // state machine
@@ -4463,40 +4461,6 @@ HttpSM::do_http_server_open(bool raw)
}
}
-#else
-
- if (t_state.method != HTTP_WKSIDX_CONNECT) {
- Debug("http", "calling netProcessor.connect_re");
- connect_action_handle = netProcessor.connect_re(this, // state machine
- srv_ip, // host_op
- srv_port, // host_port
- } else {
- // Setup the timeouts
- // Set the inactivity timeout to the connect timeout so that we
- // we fail this server if it doesn't start sending the response
- // header
- MgmtInt connect_timeout;
- if (t_state.method == HTTP_WKSIDX_POST || t_state.method == HTTP_WKSIDX_PUT) {
- connect_timeout = t_state.http_config_param->post_connect_attempts_timeout;
- } else if (is_request_from_streaming_client(&t_state.hdr_info.client_request)) {
- connect_timeout = t_state.http_config_param->streaming_connect_attempts_timeout;
- } else if (t_state.current.server == &t_state.parent_info) {
- connect_timeout = t_state.http_config_param->parent_connect_timeout;
- } else {
- if (t_state.pCongestionEntry != NULL)
- connect_timeout = t_state.pCongestionEntry->connect_timeout();
- else
- connect_timeout = t_state.http_config_param->connect_attempts_timeout;
- }
- Debug("http", "calling netProcessor.connect_s");
- connect_action_handle = netProcessor.connect_s(this, // state machine
- srv_ip, // host_op
- srv_port, // host_port
- t_state.http_config_param->outgoing_ip_to_bind_saddr,
- connect_timeout, &opt);
- }
-#endif
-
if (connect_action_handle != ACTION_RESULT_DONE) {
ink_assert(!pending_action);
pending_action = connect_action_handle;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/Main.cc?rev=997778&r1=997777&r2=997778&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/Main.cc Thu Sep 16 15:05:04 2010
@@ -54,7 +54,7 @@
#include "HTTP.h"
#include "RecordsConfig.h"
-#if defined(HAVE_LIBSSL) && defined(TRAFFIC_NET)
+#if defined(TRAFFIC_NET)
#include "traffic_net/tn_Thread.h"
#endif
@@ -872,7 +872,7 @@ main(int argc, char **argv)
lmgmt->listenForProxy();
-#if defined(HAVE_LIBSSL) && defined(TRAFFIC_NET)
+#if defined(TRAFFIC_NET)
// Traffic Net Thread
ink_thread tnThrId;
tnThrId = ink_thread_create(tn_mgmt_main, NULL); /* Spin Traffic Net thread */
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc?rev=997778&r1=997777&r2=997778&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc Thu Sep 16 15:05:04 2010
@@ -59,7 +59,6 @@
#include "ConfigAPI.h"
#include "SysAPI.h"
-#ifdef HAVE_LIBSSL
#include "openssl/ssl.h"
#include "openssl/err.h"
#include "openssl/crypto.h"
@@ -70,7 +69,6 @@
#define HEAP_H
#define STACK_H
#endif // !defined(_WIN32)
-#endif // HAVE_LIBSSL
//-------------------------------------------------------------------------
@@ -4108,7 +4106,6 @@ signal_handler_init()
int
ssl_init(WebHttpContext * whc)
{
-#ifdef HAVE_LIBSSL
SSL *SSL_con = NULL;
unsigned int sslErrno;
char ssl_Error[256];
@@ -4121,9 +4118,7 @@ ssl_init(WebHttpContext * whc)
return WEB_HTTP_ERR_FAIL;
}
whc->si.SSLcon = SSL_con;
-#else
- mgmt_fatal(stderr, "[ssl_init] attempt to use SSL in non-SSL enabled build");
-#endif
+
return WEB_HTTP_ERR_OKAY;
}
@@ -4134,13 +4129,10 @@ ssl_init(WebHttpContext * whc)
int
ssl_free(WebHttpContext * whc)
{
-#ifdef HAVE_LIBSSL
if (whc->si.SSLcon != NULL) {
SSL_free((SSL *) whc->si.SSLcon);
}
-#else
- ink_debug_assert(!"[ssl_free] attempt to free SSL context in non-SSL build");
-#endif
+
return WEB_HTTP_ERR_OKAY;
}
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc?rev=997778&r1=997777&r2=997778&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc Thu Sep 16 15:05:04 2010
@@ -58,8 +58,6 @@ extern "C"
}
#endif
-#ifdef HAVE_LIBSSL
-
#include "openssl/ssl.h"
#include "openssl/err.h"
#include "openssl/crypto.h"
@@ -78,13 +76,6 @@ extern "C"
#define HEAP_H
#define STACK_H
-#if SSLEAY_VERSION_NUMBER >= 0x0800
-#define SSLEAY8
-#endif
-
-#endif // HAVE_LIBSSL
-
-
typedef int fd;
#define SOCKET_TIMEOUT 10*60
@@ -114,8 +105,6 @@ int aconf_port_arg = -1;
// INKqa10098: UBSWarburg: Overseer port enabled by default
static int overseerMode = 0;
-#ifdef HAVE_LIBSSL
-
// Locks that SSleay uses
static ink_mutex ssl_locks[CRYPTO_NUM_LOCKS];
@@ -169,12 +158,8 @@ init_SSL(char *sslCertFile, WebContext *
SSL_load_error_strings();
-#ifdef SSLEAY8
SSLeay_add_ssl_algorithms();
wContext->SSL_Context = (SSL_CTX *) SSL_CTX_new(SSLv23_server_method());
-#else
- wContext->SSL_Context = (SSL_CTX *) SSL_CTX_new();
-#endif
if (SSL_CTX_use_PrivateKey_file(wContext->SSL_Context, sslCertFile, SSL_FILETYPE_PEM) <= 0) {
sslErrno = ERR_get_error();
@@ -227,7 +212,6 @@ SSL_FAILED:
}
return -1;
}
-#endif
// void tmpFileDestructor(void* ptr)
//
@@ -753,11 +737,7 @@ webIntr_main(void *x)
configUI();
#endif /* NO_WEBUI */
-#ifdef HAVE_LIBSSL
configSSLenable();
-#else
- adminContext.SSLenabled = 0;
-#endif
Debug("ui", "SSL enabled is %d\n", adminContext.SSLenabled);
// Set up the ip based access control
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.cc?rev=997778&r1=997777&r2=997778&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.cc Thu Sep 16 15:05:04 2010
@@ -89,10 +89,8 @@ setUpWebCB()
ink_assert(RecRegisterConfigUpdateCb("proxy.config.admin.admin_password", WebConfigCB, (void *) AUTH_ADMIN_PASSWD_CB)
== REC_ERR_OKAY);
-#ifdef HAVE_LIBSSL
ink_assert(RecRegisterConfigUpdateCb("proxy.config.admin.use_ssl", WebConfigCB, (void *) SSL_ENABLED_CB)
== REC_ERR_OKAY);
-#endif
ink_assert(RecRegisterConfigUpdateCb("proxy.config.admin.ui_refresh_rate", WebConfigCB, (void *) REFRESH_RATE_CB)
== REC_ERR_OKAY);
@@ -183,12 +181,12 @@ updateWebConfig()
updateArray[REFRESH_RATE_CB] = 0;
configRefreshRate();
}
-#ifdef HAVE_LIBSSL
+
if (updateArray[SSL_ENABLED_CB] != 0) {
updateArray[SSL_ENABLED_CB] = 0;
configSSLenable();
}
-#endif
+
if (updateArray[ADV_UI_ENABLED] != 0) {
updateArray[ADV_UI_ENABLED] = 0;
@@ -517,7 +515,6 @@ configRefreshRate()
wGlobals.refreshRate = (int) refresh;
}
-#ifdef HAVE_LIBSSL
void
configSSLenable()
{
@@ -583,7 +580,6 @@ SSL_FAILED:
return;
}
-#endif
void
configLoadFactor()
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebUtils.cc?rev=997778&r1=997777&r2=997778&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebUtils.cc Thu Sep 16 15:05:04 2010
@@ -38,8 +38,6 @@
*
****************************************************************************/
-#ifdef HAVE_LIBSSL
-
#include "openssl/ssl.h"
#ifndef _WIN32
@@ -53,8 +51,6 @@
#endif // !_WIN32
-#endif // HAVE_LIBSSL
-
/* Converts a printable character to it's six bit representation */
const unsigned char printableToSixBit[256] = {
64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64,
@@ -126,12 +122,7 @@ ssize_t
socket_write(SocketInfo socketD, const char *buf, size_t nbyte)
{
if (socketD.SSLcon != NULL) {
-#ifdef HAVE_LIBSSL
return SSL_write((SSL *) socketD.SSLcon, (char *) buf, nbyte);
-#else
- mgmt_fatal(stderr, "[socket_write] Attempt to use disabled SSL\n");
-#endif
-
} else {
return write_socket(socketD.fd, buf, nbyte);
}
@@ -142,11 +133,7 @@ ssize_t
socket_read(SocketInfo socketD, char *buf, size_t nbyte)
{
if (socketD.SSLcon != NULL) {
-#ifdef HAVE_LIBSSL
return SSL_read((SSL *) socketD.SSLcon, (char *) buf, nbyte);
-#else
- mgmt_fatal(stderr, "[socket_read] Attempt to use disabled SSL\n");
-#endif
} else {
return read_socket(socketD.fd, buf, nbyte);
}
Modified: trafficserver/traffic/trunk/test/SDKtest/client/DoTest.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/SDKtest/client/DoTest.cc?rev=997778&r1=997777&r2=997778&view=diff
==============================================================================
--- trafficserver/traffic/trunk/test/SDKtest/client/DoTest.cc (original)
+++ trafficserver/traffic/trunk/test/SDKtest/client/DoTest.cc Thu Sep 16 15:05:04 2010
@@ -184,7 +184,6 @@ DoTest::create_new_connection_and_send_r
printf("Connection opened sec: %ld ms: %ld\n", tv.tv_sec, tv.tv_usec);
fflush(stdout);
}
-#ifdef HAVE_LIBSSL
if (ssl) {
RAND_seed((void *) randBuff, sizeof(randBuff));
user_info[user].m_ssl = SSL_new(ctx);
@@ -226,7 +225,6 @@ DoTest::create_new_connection_and_send_r
X509_free(server_cert);
}
-#endif
len_to_write = strlen(user_info[user].request_sent);
len_written = 0;
@@ -237,7 +235,6 @@ DoTest::create_new_connection_and_send_r
while (len_to_write > len_written) {
-#ifdef HAVE_LIBSSL
if (ssl) {
s = SSL_write(user_info[user].m_ssl, user_info[user].request_sent + len_written, len_to_write - len_written);
flag_write = SSL_get_error(user_info[user].m_ssl, s);
@@ -253,12 +250,7 @@ DoTest::create_new_connection_and_send_r
printf("OTHER\n");
}
}
- }
-#else
- if (0) {
- }
-#endif /* WITH_OEPNSSL */
- else {
+ } else {
while ((s = write(fd, (user_info[user].request_sent + len_written), (len_to_write -
len_written))) < 0 && errno == EINTR);
}
@@ -558,7 +550,6 @@ DoTest::actual_test(int rr_flag)
struct timeval last_time;
double warmup_status;
-#ifdef HAVE_LIBSSL
if (ssl) {
if (debug) {
printf("Initializing SSL algorithms and methods ...\n");
@@ -570,7 +561,6 @@ DoTest::actual_test(int rr_flag)
ctx = SSL_CTX_new(meth);
CHK_NULL(ctx);
}
-#endif
int more_request = TRUE;
@@ -730,7 +720,6 @@ DoTest::actual_test(int rr_flag)
if (bytes_to_read > MAX_READBUF_SIZE)
bytes_to_read = MAX_READBUF_SIZE;
-#ifdef HAVE_LIBSSL
if (ssl) {
tempint = 0;
do {
@@ -760,12 +749,7 @@ DoTest::actual_test(int rr_flag)
}
} while (flag_read == SSL_ERROR_NONE);
s = tempint;
- }
-#else
- if (0) {
- }
-#endif // HAVE_LIBSSL
- else {
+ } else {
while ((s = read(poll_vector[i].fd, read_buf, bytes_to_read)) < 0 && errno == EINTR);
}
@@ -877,11 +861,10 @@ DoTest::actual_test(int rr_flag)
user_info[i].read_count = 0;
strcpy(user_info[i].request_sent, "");
user_info[i].think_time = generate_think_time();
-#ifdef HAVE_LIBSSL
+
if (ssl) {
SSL_free(user_info[i].m_ssl);
}
-#endif
#ifdef _PLUG_IN
user_info[i].target_addr = &(user_info[i].dynamic_target_addr);
Modified: trafficserver/traffic/trunk/test/SDKtest/client/DoTest.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/SDKtest/client/DoTest.h?rev=997778&r1=997777&r2=997778&view=diff
==============================================================================
--- trafficserver/traffic/trunk/test/SDKtest/client/DoTest.h (original)
+++ trafficserver/traffic/trunk/test/SDKtest/client/DoTest.h Thu Sep 16 15:05:04 2010
@@ -44,7 +44,6 @@
#include <fcntl.h>
#include <sys/time.h>
-#ifdef HAVE_LIBSSL
#include <openssl/rsa.h> /* SSLeay stuff */
#include <openssl/crypto.h>
#include <openssl/x509.h>
@@ -55,7 +54,6 @@
#define CHK_NULL(x) if ((x)==NULL) exit (1)
#define CHK_ERR(err,s) if ((err)==-1) { perror(s); exit(1); }
#define CHK_SSL(err) if ((err)==-1) { ERR_print_errors_fp(errFp); exit(2); }
-#endif
#define DIFF_TIME(start_time,end_time) \
(long) (((double) (end_time).tv_sec*1000.0 + \
@@ -103,9 +101,7 @@ struct UserInfo
/* for differentiate a completed/non-completed connection */
int internal_rid;
void *request_id;
-#ifdef HAVE_LIBSSL
SSL *m_ssl;
-#endif
/////////////////////
#ifdef _PLUG_IN
@@ -225,11 +221,9 @@ struct DoTest
struct pollfd *poll_vector;
char read_buf[MAX_READBUF_SIZE];
-#ifdef HAVE_LIBSSL
X509 *server_cert;
SSL_CTX *ctx;
SSL_METHOD *meth;
-#endif
FILE *errFp;
char *str;