More bugfixes and test coverage + bump to 1.0.2

CaliDog · Mar 1, 2018 · b43b417 · b43b417
1 parent fba70d1
commit b43b417
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/lib/easy_ssl.ex b/lib/easy_ssl.ex
@@ -280,9 +280,12 @@ defmodule EasySSL do
                     {:dNSName, dns_name} -> ["DNS:" <> (dns_name |> to_string) | san_list]
                     {:uniformResourceIdentifier, identifier} -> ["URI:" <> (identifier |> to_string) | san_list]
                     {:rfc822Name, identifier} -> ["RFC 822Name:" <> (identifier |> to_string) | san_list]
-                    {:directoryName, _sequence} -> san_list
                     {:iPAddress, ip} -> ["IP:" <> (ip |> ip_to_string) | san_list]
 
+                    # Basically ignore those
+                    {:directoryName, _sequence} -> san_list
+                    {:otherName, other_name} -> san_list
+
                     _ ->
                       raise("Unhandled SAN entry type #{inspect entry}")
                   end
@@ -300,8 +303,12 @@ defmodule EasySSL do
                     {:uniformResourceIdentifier, identifier} -> ["URI:" <> (identifier |> to_string) | issuer_list]
                     {:dNSName, dns_name} -> ["DNS:" <> (dns_name |> to_string) | issuer_list]
                     {:rfc822Name, identifier} -> ["RFC 822Name:" <> (identifier |> to_string) | issuer_list]
-                    {:directoryName, _sequence} -> issuer_list
                     {:iPAddress, ip} -> ["IP:" <> (ip |> ip_to_string) | issuer_list]
+
+                    # Ignore these
+                    {:directoryName, _sequence} -> issuer_list
+                    {:otherName, _sequence} -> issuer_list
+
                     _ ->
                       raise("Unhandled IAN entry type #{inspect entry}")
                   end
@@ -381,8 +388,15 @@ defmodule EasySSL do
                             [cps_string | message]
 
                           {:PolicyQualifierInfo, {1, 3, 6, 1, 5, 5, 7, 2, 2}, user_notice_data} ->
-                            <<_::binary-size(6), user_notice::binary>> = user_notice_data
-                            [user_notice |> String.replace_prefix("", "  User Notice: ") | message]
+                            <<_::binary-size(8), user_notice::binary>> = user_notice_data
+
+                            user_notice = user_notice
+                              |> String.codepoints
+                              |> Enum.filter(fn(c) -> String.printable?(c) end)
+                              |> Enum.join("")
+                              |> String.replace_prefix("", "  User Notice: ")
+
+                            [user_notice  | message]
 
                         end
                       end)

diff --git a/mix.exs b/mix.exs
@@ -5,7 +5,7 @@ defmodule EasySSL.MixProject do
     [
       app: :easy_ssl,
       name: "EasySSL",
-      version: "1.0.1",
+      version: "1.0.2",
       elixir: "~> 1.6",
       description: "SSL/X509 parsing for humans.",
       deps: deps(),

diff --git a/test/data/der/bdfyybd.der b/test/data/der/bdfyybd.der
diff --git a/test/data/der/guardowatches.der b/test/data/der/guardowatches.der
diff --git a/test/data/der/owncloud.biggi-und-marcus.der b/test/data/der/owncloud.biggi-und-marcus.der