Repository: trafficserver Updated Branches: refs/heads/master ae4aabe60 -> e70d480da
TS-612: build fix for uninitialized variable Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/e70d480d Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/e70d480d Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/e70d480d Branch: refs/heads/master Commit: e70d480da8c2158ed91124533b8ca8e1262a30c8 Parents: ae4aabe Author: James Peach <[email protected]> Authored: Tue Feb 25 15:55:54 2014 -0800 Committer: James Peach <[email protected]> Committed: Tue Feb 25 15:55:58 2014 -0800 ---------------------------------------------------------------------- iocore/net/SSLUtils.cc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e70d480d/iocore/net/SSLUtils.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc index d066416..2cb9bea 100644 --- a/iocore/net/SSLUtils.cc +++ b/iocore/net/SSLUtils.cc @@ -81,13 +81,16 @@ typedef SSL_METHOD * ink_ssl_method_t; // gather user provided settings from ssl_multicert.config in to a single struct struct ssl_user_config { - xptr<char> addr; // dest_ip - IPv[64] address to match - xptr<char> cert; // ssl_cert_name - certificate - xptr<char> ca; // ssl_ca_name - CA public certificate - xptr<char> key; // ssl_key_name - Private key - int session_ticket_enabled; // ssl_ticket_enabled - session ticket enabled - xptr<char> ticket_key_filename; // ticket_key_name - session key file. [key_name (16Byte) + HMAC_secret (16Byte) + AES_key (16Byte)] - xptr<char> dialog; // ssl_key_dialog - Private key dialog + ssl_user_config () : session_ticket_enabled(1) { + } + + int session_ticket_enabled; // ssl_ticket_enabled - session ticket enabled + xptr<char> addr; // dest_ip - IPv[64] address to match + xptr<char> cert; // ssl_cert_name - certificate + xptr<char> ca; // ssl_ca_name - CA public certificate + xptr<char> key; // ssl_key_name - Private key + xptr<char> ticket_key_filename; // ticket_key_name - session key file. [key_name (16Byte) + HMAC_secret (16Byte) + AES_key (16Byte)] + xptr<char> dialog; // ssl_key_dialog - Private key dialog }; // Check if the ticket_key callback #define is available, and if so, enable session tickets.
