diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-06 14:25:47 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-06 14:25:47 +0000 |
| commit | 8c48c6835fbfada96d2197bcbc7a87023bfc8291 (patch) | |
| tree | 2a60509a6637549f370b63ce3b27a3de8f9736d8 /epan/dissectors/packet-ssl-utils.c | |
| parent | d6b920b8f6b22548e3828258ea11b2443af89ce4 (diff) | |
| download | wireshark-8c48c6835fbfada96d2197bcbc7a87023bfc8291.tar.gz | |
Rename address_to_str() to ep_address_to_str() because:
1) This indicates that the string has ephemeral lifetime
2) More consistent with its existing seasonal counterpart, se_address_to_str().
svn path=/trunk/; revision=29747
Diffstat (limited to 'epan/dissectors/packet-ssl-utils.c')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 0d670f7f7f..599045def0 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -669,7 +669,7 @@ const value_string ssl_31_ciphersuite[] = { { 0xC036, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA" }, { 0xC037, "TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256" }, { 0xC038, "TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384" }, - { 0xC039, "TLS_ECDHE_PSK_WITH_NULL_SHA" }, + { 0xC039, "TLS_ECDHE_PSK_WITH_NULL_SHA" }, { 0xC03A, "TLS_ECDHE_PSK_WITH_NULL_SHA256" }, { 0xC03B, "TLS_ECDHE_PSK_WITH_NULL_SHA384" }, @@ -2514,7 +2514,7 @@ ssl_find_private_key(SslDecryptSession *ssl_session, GHashTable *key_hash, GTree dummy.port = port = pinfo->destport; } ssl_debug_printf("ssl_find_private_key server %s:%u\n", - address_to_str(&dummy.addr),dummy.port); + ep_address_to_str(&dummy.addr),dummy.port); /* try to retrieve private key for this service. Do it now 'cause pinfo * is not always available |