rename info items and functions

3 files changed, 47 insertions, 45 deletions

diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml
index acb98e48..eee8418f 100644
--- a/docs/rabbitmqctl.1.xml
+++ b/docs/rabbitmqctl.1.xml
@@ -922,6 +922,21 @@
                 <listitem><para>Peer port.</para></listitem>
               </varlistentry>
               <varlistentry>
+                <term>peer_cert_subject</term>
+                <listitem><para>The subject of the peer's SSL
+                certificate.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>peer_cert_issuer</term>
+                <listitem><para>The issuer of the peer's SSL
+                certificate.</para></listitem>
+              </varlistentry>
+              <varlistentry>
+                <term>peer_cert_validity</term>
+                <listitem><para>The period for which the peer's SSL
+                certificate is valid.</para></listitem>
+              </varlistentry>
+              <varlistentry>
                 <term>state</term>
                 <listitem><para>Connection state (one of [<command>starting</command>, <command>tuning</command>,
                   <command>opening</command>, <command>running</command>, <command>closing</command>, <command>closed</command>]).</para></listitem>
@@ -975,21 +990,6 @@
                 <term>send_pend</term>
                 <listitem><para>Send queue size.</para></listitem>
               </varlistentry>
-              <varlistentry>
-                <term>ssl_subject</term>
-                <listitem><para>The subject of the peer's SSL
-                certificate.</para></listitem>
-              </varlistentry>
-              <varlistentry>
-                <term>ssl_issuer</term>
-                <listitem><para>The issuer of the peer's SSL
-                certificate.</para></listitem>
-              </varlistentry>
-              <varlistentry>
-                <term>ssl_validity</term>
-                <listitem><para>The period for which the peer's SSL
-                certificate is valid.</para></listitem>
-              </varlistentry>
             </variablelist>
             <para>
               If no <command>connectioninfoitem</command>s are specified then  user, peer
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index fef6595b..559b57a8 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -66,7 +66,8 @@
                           send_pend, state, channels]).
 
 -define(CREATION_EVENT_KEYS, [pid, address, port, peer_address, peer_port,
-                              ssl_subject, ssl_issuer, ssl_validity,
+                              peer_cert_subject, peer_cert_issuer,
+                              peer_cert_validity,
                               protocol, user, vhost, timeout, frame_max,
                               client_properties]).
 
@@ -821,9 +822,9 @@ i(peer_address, #v1{sock = Sock}) ->
 i(peer_port, #v1{sock = Sock}) ->
     {ok, {_, P}} = rabbit_net:peername(Sock),
     P;
-i(ssl_issuer,   #v1{sock = Sock}) -> rabbit_ssl:ssl_issuer(Sock);
-i(ssl_subject,  #v1{sock = Sock}) -> rabbit_ssl:ssl_subject(Sock);
-i(ssl_validity, #v1{sock = Sock}) -> rabbit_ssl:ssl_validity(Sock);
+i(peer_cert_issuer,   #v1{sock = Sock}) -> rabbit_ssl:peer_cert_issuer(Sock);
+i(peer_cert_subject,  #v1{sock = Sock}) -> rabbit_ssl:peer_cert_subject(Sock);
+i(peer_cert_validity, #v1{sock = Sock}) -> rabbit_ssl:peer_cert_validity(Sock);
 i(SockStat, #v1{sock = Sock}) when SockStat =:= recv_oct;
                                    SockStat =:= recv_cnt;
                                    SockStat =:= send_oct;
diff --git a/src/rabbit_ssl.erl b/src/rabbit_ssl.erl
index e3bbb9fa..2c9d5eca 100644
--- a/src/rabbit_ssl.erl
+++ b/src/rabbit_ssl.erl
@@ -36,7 +36,7 @@
 -include_lib("public_key/include/public_key.hrl").
 -include_lib("ssl/src/ssl_int.hrl").
 
--export([ssl_issuer/1, ssl_subject/1, ssl_validity/1]).
+-export([peer_cert_issuer/1, peer_cert_subject/1, peer_cert_validity/1]).
 
 -export_type([certificate/0, ssl_socket/0]).
 
@@ -48,9 +48,9 @@
 -type(certificate() :: #'OTPCertificate'{}).
 -type(a_socket() :: rabbit_networking:socket() | ssl_socket()).
 
--spec(ssl_issuer/1   :: (a_socket()) -> string()).
--spec(ssl_subject/1  :: (a_socket()) -> string()).
--spec(ssl_validity/1 :: (a_socket()) -> string()).
+-spec(peer_cert_issuer/1   :: (a_socket()) -> string()).
+-spec(peer_cert_subject/1  :: (a_socket()) -> string()).
+-spec(peer_cert_validity/1 :: (a_socket()) -> string()).
 
 -endif. %% use_specs
 
@@ -60,33 +60,35 @@
 %%--------------------------------------------------------------------------
 
 %% Return a string describing the certificate's issuer.
-ssl_issuer(Sock) ->
-    ssl_info(fun(#'OTPCertificate' {
-                    tbsCertificate = #'OTPTBSCertificate' {
-                      issuer = Issuer }}) ->
-                     format_rdn_sequence(Issuer)
-             end, Sock).
+peer_cert_issuer(Sock) ->
+    cert_info(fun(#'OTPCertificate' {
+                     tbsCertificate = #'OTPTBSCertificate' {
+                       issuer = Issuer }}) ->
+                      format_rdn_sequence(Issuer)
+              end, Sock).
 
 %% Return a string describing the certificate's subject, as per RFC4514.
-ssl_subject(Sock) ->
-    ssl_info(fun(#'OTPCertificate' {
-                    tbsCertificate = #'OTPTBSCertificate' {
-                      subject = Subject }}) ->
-                     format_rdn_sequence(Subject)
-             end, Sock).
+peer_cert_subject(Sock) ->
+    cert_info(fun(#'OTPCertificate' {
+                     tbsCertificate = #'OTPTBSCertificate' {
+                       subject = Subject }}) ->
+                      format_rdn_sequence(Subject)
+              end, Sock).
 
 %% Return a string describing the certificate's validity.
-ssl_validity(Sock) ->
-    ssl_info(fun(#'OTPCertificate' {
-                    tbsCertificate = #'OTPTBSCertificate' {
-                      validity = {'Validity', Start, End} }}) ->
-                     lists:flatten(
-                       io_lib:format("~s - ~s", [format_asn1_value(Start),
-                                                 format_asn1_value(End)]))
-             end, Sock).
+peer_cert_validity(Sock) ->
+    cert_info(fun(#'OTPCertificate' {
+                     tbsCertificate = #'OTPTBSCertificate' {
+                       validity = {'Validity', Start, End} }}) ->
+                      lists:flatten(
+                        io_lib:format("~s - ~s", [format_asn1_value(Start),
+                                                  format_asn1_value(End)]))
+              end, Sock).
+
+%%--------------------------------------------------------------------------
 
 %% Wrapper for applying a function to a socket's certificate.
-ssl_info(F, Sock) ->
+cert_info(F, Sock) ->
     case rabbit_net:peercert(Sock) of
         {error, no_peercert} -> no_peer_certificate;
         {error, E}           -> rabbit_log:warning("cannot obtain cert: "
@@ -112,7 +114,6 @@ ssl_info(F, Sock) ->
             end
     end.
 
-
 %%--------------------------------------------------------------------------
 %% Formatting functions
 %%--------------------------------------------------------------------------