diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-01-06 13:50:44 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-01-06 13:50:44 +0000 |
| commit | ef591d28162a9b4fbd38768b5c50c24af58a1f23 (patch) | |
| tree | d4f478ec017e7a5002db538e39ba0e8fe0d6976e | |
| parent | 96994162eef383c82b7f9e20e9d4af479699bee8 (diff) | |
| download | rabbitmq-server-git-ef591d28162a9b4fbd38768b5c50c24af58a1f23.tar.gz | |
peer_cert_subject_itemn -> peer_cert_subject_items, there's no guarantee we'll only have one!
| -rw-r--r-- | src/rabbit_ssl.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_ssl.erl b/src/rabbit_ssl.erl index e0defa9e96..563bc091db 100644 --- a/src/rabbit_ssl.erl +++ b/src/rabbit_ssl.erl @@ -21,7 +21,7 @@ -include_lib("public_key/include/public_key.hrl"). -export([peer_cert_issuer/1, peer_cert_subject/1, peer_cert_validity/1]). --export([peer_cert_subject_item/2]). +-export([peer_cert_subject_items/2]). %%-------------------------------------------------------------------------- @@ -34,8 +34,8 @@ -spec(peer_cert_issuer/1 :: (certificate()) -> string()). -spec(peer_cert_subject/1 :: (certificate()) -> string()). -spec(peer_cert_validity/1 :: (certificate()) -> string()). --spec(peer_cert_subject_item/2 :: - (certificate(), tuple()) -> string() | 'not_found'). +-spec(peer_cert_subject_items/2 :: + (certificate(), tuple()) -> [string()] | 'not_found'). -endif. @@ -60,7 +60,7 @@ peer_cert_subject(Cert) -> end, Cert). %% Return a part of the certificate's subject. -peer_cert_subject_item(Cert, Type) -> +peer_cert_subject_items(Cert, Type) -> cert_info(fun(#'OTPCertificate' { tbsCertificate = #'OTPTBSCertificate' { subject = Subject }}) -> @@ -89,8 +89,8 @@ find_by_type(Type, {rdnSequence, RDNs}) -> case [V || #'AttributeTypeAndValue'{type = T, value = V} <- lists:flatten(RDNs), T == Type] of - [Val] -> format_asn1_value(Val); - [] -> not_found + [] -> not_found; + L -> [format_asn1_value(V) || V <- L] end. %%-------------------------------------------------------------------------- |