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 2015/09/03 20:09:51 UTC
trafficserver git commit: TS-3461 changes sizeof() to not use
non-static member variables
Repository: trafficserver
Updated Branches:
refs/heads/master 50210f9e9 -> 0315f6db4
TS-3461 changes sizeof() to not use non-static member variables
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/0315f6db
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0315f6db
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0315f6db
Branch: refs/heads/master
Commit: 0315f6db4c4ef915fb2e2c716d9d83114d72449a
Parents: 50210f9
Author: Leif Hedstrom <zw...@apache.org>
Authored: Thu Sep 3 12:08:58 2015 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Thu Sep 3 12:08:58 2015 -0600
----------------------------------------------------------------------
iocore/net/SSLUtils.cc | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0315f6db/iocore/net/SSLUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index e9f30a6..9559f39 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -561,10 +561,11 @@ ssl_context_enable_tickets(SSL_CTX *ctx, const char *ticket_key_path)
// with any key (for rotation purposes).
for (unsigned i = 0; i < num_ticket_keys; ++i) {
const char *data = (const char *)ticket_key_data + (i * sizeof(ssl_ticket_key_t));
- memcpy(keyblock->keys[i].key_name, data, sizeof(ssl_ticket_key_t::key_name));
- memcpy(keyblock->keys[i].hmac_secret, data + sizeof(ssl_ticket_key_t::key_name), sizeof(ssl_ticket_key_t::hmac_secret));
- memcpy(keyblock->keys[i].aes_key, data + sizeof(ssl_ticket_key_t::key_name) + sizeof(ssl_ticket_key_t::hmac_secret),
- sizeof(ssl_ticket_key_t::aes_key));
+
+ memcpy(keyblock->keys[i].key_name, data, sizeof(keyblock->keys[i].key_name));
+ memcpy(keyblock->keys[i].hmac_secret, data + sizeof(keyblock->keys[i].key_name), sizeof(keyblock->keys[i].hmac_secret));
+ memcpy(keyblock->keys[i].aes_key, data + sizeof(keyblock->keys[i].key_name) + sizeof(keyblock->keys[i].hmac_secret),
+ sizeof(keyblock->keys[i].aes_key));
}
// Setting the callback can only fail if OpenSSL does not recognize the
@@ -1946,19 +1947,19 @@ ssl_callback_session_ticket(SSL *ssl, unsigned char *keyname, unsigned char *iv,
if (enc == 1) {
const ssl_ticket_key_t &most_recent_key = keyblock->keys[0];
- memcpy(keyname, most_recent_key.key_name, sizeof(ssl_ticket_key_t::key_name));
+ memcpy(keyname, most_recent_key.key_name, sizeof(most_recent_key.key_name));
RAND_pseudo_bytes(iv, EVP_MAX_IV_LENGTH);
EVP_EncryptInit_ex(cipher_ctx, EVP_aes_128_cbc(), NULL, most_recent_key.aes_key, iv);
- HMAC_Init_ex(hctx, most_recent_key.hmac_secret, sizeof(ssl_ticket_key_t::hmac_secret), evp_md_func, NULL);
+ HMAC_Init_ex(hctx, most_recent_key.hmac_secret, sizeof(most_recent_key.hmac_secret), evp_md_func, NULL);
Debug("ssl", "create ticket for a new session.");
SSL_INCREMENT_DYN_STAT(ssl_total_tickets_created_stat);
return 0;
} else if (enc == 0) {
for (unsigned i = 0; i < keyblock->num_keys; ++i) {
- if (memcmp(keyname, keyblock->keys[i].key_name, sizeof(ssl_ticket_key_t::key_name)) == 0) {
+ if (memcmp(keyname, keyblock->keys[i].key_name, sizeof(keyblock->keys[i].key_name)) == 0) {
EVP_DecryptInit_ex(cipher_ctx, EVP_aes_128_cbc(), NULL, keyblock->keys[i].aes_key, iv);
- HMAC_Init_ex(hctx, keyblock->keys[i].hmac_secret, sizeof(ssl_ticket_key_t::hmac_secret), evp_md_func, NULL);
+ HMAC_Init_ex(hctx, keyblock->keys[i].hmac_secret, sizeof(keyblock->keys[i].hmac_secret), evp_md_func, NULL);
Debug("ssl", "verify the ticket for an existing session.");
// Increase the total number of decrypted tickets.