more tests

lib/encryption/cms.ex

@@ -85,18 +85,38 @@ defmodule CA.CMS do
 
   # Test
 
-  def pem(name), do: hd(:public_key.pem_decode(:erlang.element(2,:file.read_file(name))))
-  def testDecryptECC(), do: CA.CMS.decrypt(testECC(), testPrivateKeyECC())
-  def testDecryptKEK(), do: CA.CMS.decrypt(testKEK(), testPrivateKeyKEK())
-  def testDecryptRSA(), do: CA.CMS.decrypt(testRSA(), testPrivateKeyRSA())
+  def pem(name), do: hd(:public_key.pem_decode(:erlang.element(2, :file.read_file(name))))
+  def testDecryptECC(), do: [cipher: :binary.part(:erlang.element(2, CA.CMS.decrypt(testECC(), testPrivateKeyECC())),0,48)]
+  def testDecryptKEK(), do: [cipher: :binary.part(:erlang.element(2, CA.CMS.decrypt(testKEK(), testPrivateKeyKEK())),0,48)]
+  def testDecryptRSA(), do: [cipher: :erlang.element(2, CA.CMS.decrypt(testRSA(), testPrivateKeyRSA()))]
+  def testDecryptCMS(), do: [cipher: :binary.part(:erlang.element(2, CA.CMS.testCMS()),0,48)]
   def test(),           do:
       [
-         testDecryptECC(),
-         testDecryptKEK(),
-         testDecryptRSA(),
-         testCMS(),
+        testFolder("czo"),
+        testFolder("CAdES"),
+        testFolder("certs"),
+        testFolder("cms"),
+        [
+          testDecryptECC(),
+          testDecryptKEK(),
+          testDecryptCMS(),
+          testDecryptRSA(),
+        ],
       ]
 
+  def parseKeyFile(file)  do {:ok, bin} = :file.read_file file ; list = :public_key.pem_decode(bin) ; :lists.map(fn x -> :public_key.pem_entry_decode(x) end, list) end
+
+  def testFolder(folder \\ "CAdES") do
+      :lists.map(fn x -> case :filename.extension(x) do
+         '.p7s' -> [cms: byte_size(:erlang.term_to_binary(CA.CMS.parseContentInfoFile(x))), name: x]
+         '.txt' -> [smime: byte_size(:erlang.term_to_binary(CA.CMS.parseContentInfoSMIME(x))), name: x]
+         '.key' -> [key: byte_size(:erlang.term_to_binary(CA.CMS.parseKeyFile(x))), name: x]
+         '.b64' -> [base64: byte_size(:erlang.term_to_binary(CA.CRT.parseCertB64(x))), name: x]
+         '.pem' -> [pem: byte_size(:erlang.term_to_binary(CA.CRT.parseCertPEM(x))), name: x]
+         '.cer' -> [cert: byte_size(:erlang.term_to_binary(CA.CRT.parseCertFile(x))), name: x]
+      end end, :filelib.wildcard ['test/#{folder}/*'])
+  end
+
   def testPrivateKeyECC() do
       privateKey = :public_key.pem_entry_decode(pem("test/certs/client.key"))
       {:'ECPrivateKey',_,privateKeyBin,{:namedCurve,schemeOID},_,_} = privateKey
@@ -131,7 +151,7 @@ defmodule CA.CMS do
   end
 
   def testRSA() do
-      {:ok,x} = :file.read_file "test/cms/rsa-cms.bin"
+      {:ok,x} = :file.read_file "test/cms/rsa-cms.p7s"
       :'CryptographicMessageSyntax-2010'.decode(:ContentInfo, x)
   end
 

lib/services/crt.ex

@@ -2,19 +2,21 @@ defmodule CA.CRT do
   @moduledoc "X.509 Certificates."
 
   def subj({:rdnSequence, attrs}) do
-        {:rdnSequence, :lists.map(fn
-            [{t,oid,{:uTF8String,x}}] -> [{t,oid,:asn1rt_nif.encode_ber_tlv({12, :erlang.iolist_to_binary(x)})}]
-            [{t,oid,x}] when is_list(x) -> [{t,oid,:asn1rt_nif.encode_ber_tlv({19, :erlang.iolist_to_binary(x)})}]
-            [{t,oid,x}] -> [{t,oid,x}] end, attrs)}
+      {:rdnSequence, :lists.map(fn
+          [{t,oid,{:uTF8String,x}}]   -> [{t,oid,:asn1rt_nif.encode_ber_tlv({12, :erlang.iolist_to_binary(x)})}]
+          [{t,oid,x}] when is_list(x) -> [{t,oid,:asn1rt_nif.encode_ber_tlv({19, :erlang.iolist_to_binary(x)})}]
+          [{t,oid,x}] -> [{t,oid,x}] end, attrs)}
   end
 
   def unsubj({:rdnSequence, attrs}) do
-        {:rdnSequence, :lists.map(fn [{t,oid,x}] when is_binary(x) ->
-             case :asn1rt_nif.decode_ber_tlv(x) do
-                  {{12,a},_} -> [{t,oid,{:uTF8String,a}}]
-                  {{19,a},_} -> [{t,oid,:erlang.binary_to_list(a)}]
-             end
-             x -> x end, attrs)}
+      {:rdnSequence, :lists.map(fn [{t,oid,x}] when is_binary(x) ->
+           case :asn1rt_nif.decode_ber_tlv(x) do
+                {{12,a},_} -> [{t,oid,{:uTF8String,a}}]
+                {{19,a},_} -> [{t,oid,:erlang.binary_to_list(a)}]
+           end
+           {t,oid,x} -> [{t,oid,x}]
+           x -> x
+      end, attrs)}
   end
 
   def extract(code, person) do
@@ -53,7 +55,7 @@ defmodule CA.CRT do
   def oid({2,5,29,19},v),                 do: {:basicConstraints, v}
   def oid({2,5,29,31},v),                 do: {:cRLDistributionPoints, pair(v,[])}
   def oid({2,5,29,32},v),                 do: {:certificatePolicies, :lists.map(fn x -> case isString(x) do false -> mapOid(:oid.decode(x)) ; true -> x end end, v) }
-  def oid({2,5,29,35},v),                 do: {:authorityKeyIdentifier, :base64.encode(hd(pair(v,[])))}
+  def oid({2,5,29,35},v),                 do: {:authorityKeyIdentifier, v}
   def oid({2,5,29,46},v),                 do: {:freshestCRL, pair(v,[])}
   def oid({1,2,840,113549,1,9,3},v),      do: {:contentType, CA.AT.oid(CA.EST.decodeObjectIdentifier(v)) }
   def oid({1,2,840,113549,1,9,4},v),      do: {:messageDigest, :base64.encode(:erlang.element(2,:KEP.decode(:MessageDigest, v)))}
@@ -132,7 +134,8 @@ defmodule CA.CRT do
       :lists.map(fn [{_,oid,{_,list}}] -> {rdn(oid),"#{list}"}
                     [{_,oid,list}]     -> {rdn(oid),"#{list}"}
                      {_,oid,{_,list}}  -> {rdn(oid),"#{list}"}
-                     {_,oid,   list}   -> {rdn(oid),"#{list}"} end, list)
+                     {_,oid,   list}   -> {rdn(oid),"#{list}"}
+                                     x -> x end, list)
   end
   def rdn(x),  do: "#{x}"
 

openssl/ecc/maxim.pem

@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICQDCCAcagAwIBAgIIP1c1ZmQS4PgwCgYIKoZIzj0EAwIwPTELMAkGA1UEBhMC
-VUExETAPBgNVBAcMCNCa0LjRl9CyMQ4wDAYDVQQKDAVTWU5SQzELMAkGA1UEAwwC
-Q0EwHhcNMjQxMTA1MTU1MTAzWhcNMjUxMjA1MTU1NjAzWjA8MQswCQYDVQQGEwJV
-QTENMAsGA1UECAwES3lpdjEOMAwGA1UECgwFU1lOUkMxDjAMBgNVBAMMBW1heGlt
-MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEk8qDtWXRNJujTqqOFmwlCvxWNt0qqAbG
-q8s8DVArE18J9MoXe561e6cP3AbQSjhWYv9lddk1UUk3LY/s6lnEVIYQBKD/aVn/
-tMa1LNJliTZH+vhEtiuWI68/yu/WBkwvo4GTMIGQMAkGA1UdEwQCMAAwDgYDVR0P
-AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4E
-FgQUyMWtj9H+8tmqHS6A52e5vKCIE3MwHwYDVR0jBBgwFoAU+npe8rsBPo7GqKwP
-ZWtxYncr8QwwFAYDVR0RBA0wC4IJc3lucmMuY29tMAoGCCqGSM49BAMCA2gAMGUC
-MA8fgOQtNqejMEnIGLDpdOcxmebDb1e9nFOzdNP7qe7vUN8aEj7kP0kyvDGoDMCC
-7QIxAPrr3AcPlRGSuSWvgqiFkuYTGk1E2BKZqHNTAM7jZ2I0KGY/h8qp4ythGvT+
-Ky0yig==
+MIICQDCCAcegAwIBAgIJALWPPCyHbMsQMAoGCCqGSM49BAMCMD0xCzAJBgNVBAYT
+AlVBMREwDwYDVQQHDAjQmtC40ZfQsjEOMAwGA1UECgwFU1lOUkMxCzAJBgNVBAMM
+AkNBMB4XDTI0MTEwNTE3MDEzNVoXDTI1MTIwNTE3MDYzNVowPDELMAkGA1UEBhMC
+VUExDTALBgNVBAgMBEt5aXYxDjAMBgNVBAoMBVNZTlJDMQ4wDAYDVQQDDAVtYXhp
+bTB2MBAGByqGSM49AgEGBSuBBAAiA2IABJPKg7Vl0TSbo06qjhZsJQr8VjbdKqgG
+xqvLPA1QKxNfCfTKF3uetXunD9wG0Eo4VmL/ZXXZNVFJNy2P7OpZxFSGEASg/2lZ
+/7TGtSzSZYk2R/r4RLYrliOvP8rv1gZML6OBkzCBkDAJBgNVHRMEAjAAMA4GA1Ud
+DwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0O
+BBYEFMjFrY/R/vLZqh0ugOdnubygiBNzMB8GA1UdIwQYMBaAFPp6XvK7AT6Oxqis
+D2VrcWJ3K/EMMBQGA1UdEQQNMAuCCXN5bnJjLmNvbTAKBggqhkjOPQQDAgNnADBk
+AjB+dxTb/UlE3wdatCFD7YhoCf9iwQ7lUEb0SA3fKf5FB61M9zZpWDvUlKNpzMb5
+v7wCMDYgYeVWlQkZndDy53VelnCRGpt3W5LDl5ADngKsR8APUciKB69osqdliPbR
+Pl1+EA==
 -----END CERTIFICATE-----