poly_pseudo 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f73daa683f2a0b467bbc8ae993c69ef723ef310ce7ebecbfc0d3eff8df314fdf
-  data.tar.gz: 957b1b0be8958587deee6cbc0a5047f8ffc71f272946ec305744540bef4f26b8
+  metadata.gz: 4d249e4591da0413414ed62b3acc5d092ba82abe6e680a285510ff4e32bbbdab
+  data.tar.gz: c879e52bd77278d75f175d3be05f12657ed8ac1154d250d80d6c1cb6c5c71b0a
 SHA512:
-  metadata.gz: 835eaecef1864eaee59bd5bdb7950775d29eeecad180c4e5381bc295b84c80d0440727d5ee187108ecb669415ebcda4107daf4f0b98b5ee89ad93e96ea83fbb5
-  data.tar.gz: a7ab8150b864b1f5e9484ef6bfc3f7dabd2116c8de7ffbe86c6ba327e5271a851f0b3d8f011642f22bec543acfd2d76562c2396af81e4fd93fb74332eab65ffe
+  metadata.gz: c705f80284dde04eed0d3c965b2162f47faafd4bd329ddf68cb2878d5cfb270071eec8de6cc343ec793c48e23594017622a92163ba0b438431cab4c264515a67
+  data.tar.gz: f03bda21cccb82709652f94bb384467103cf6dc513df5c06aee72b4055fc2e4865c1e1d3c861da2eeb39175aea2116948b4b58c8eb93c578294861ff4891861d

data/lib/poly_pseudo/identity.rb

@@ -2,6 +2,21 @@ module PolyPseudo
   class Identity
     include PolyPseudo::PseudoId
 
+    def self.from_asn1(asn1)
+      attributes = {}
+      attributes["Type"]                   = asn1.value[0].value.to_s
+      attributes["SchemaVersion"]          = asn1.value[1].value.to_i
+      attributes["SchemaKeyVersion"]       = asn1.value[2].value.to_i
+      attributes["Creator"]                = asn1.value[3].value.to_s
+      attributes["Recipient"]              = asn1.value[4].value.to_s
+      attributes["RecipientKeySetVersion"] = asn1.value[5].value.to_i
+      attributes["Point1"]                 = OpenSSL::PKey::EC::Point.new(PolyPseudo.config.group, OpenSSL::BN.new(asn1.value[6].value[0].value, 2))
+      attributes["Point2"]                 = OpenSSL::PKey::EC::Point.new(PolyPseudo.config.group, OpenSSL::BN.new(asn1.value[6].value[1].value, 2))
+      attributes["Point3"]                 = OpenSSL::PKey::EC::Point.new(PolyPseudo.config.group, OpenSSL::BN.new(asn1.value[6].value[2].value, 2))
+
+      new(attributes)
+    end
+
     # @param [PolyPseudo::Key] key
     def decrypt(key)
       PolyPseudo.init!

data/lib/poly_pseudo/pseudo_id.rb

@@ -1,26 +1,17 @@
 module PolyPseudo
   module PseudoId
     def self.from_asn1(encoded)
-      attributes                           = {}
-      asn1                                 = OpenSSL::ASN1.decode(Base64.decode64(encoded))
-      attributes["Type"]                   = asn1.value[0].value.to_s
-      attributes["SchemaVersion"]          = asn1.value[1].value.to_i
-      attributes["SchemaKeyVersion"]       = asn1.value[2].value.to_i
-      attributes["Creator"]                = asn1.value[3].value.to_s
-      attributes["Recipient"]              = asn1.value[4].value.to_s
-      attributes["RecipientKeySetVersion"] = asn1.value[5].value.to_i
-      attributes["Point1"]                 = OpenSSL::PKey::EC::Point.new(PolyPseudo.config.group,
-                                                                          OpenSSL::BN.new(asn1.value[6].value[0].value, 2))
-      attributes["Point2"]                 = OpenSSL::PKey::EC::Point.new(PolyPseudo.config.group,
-                                                                          OpenSSL::BN.new(asn1.value[6].value[1].value, 2))
-      attributes["Point3"]                 = OpenSSL::PKey::EC::Point.new(PolyPseudo.config.group,
-                                                                          OpenSSL::BN.new(asn1.value[6].value[2].value, 2))
+      asn1 = OpenSSL::ASN1.decode(Base64.decode64(encoded))
 
-      case attributes["Type"]
+      case asn1.value[0].value.to_s
       when /\A.*1\.2\.1\Z/
-        Identity.new(attributes)
+        Identity.from_asn1(asn1)
       when /\A.*1\.2\.2\Z/
-        Pseudonym.new(attributes)
+        Pseudonym.from_asn1(asn1)
+      when /\A.*1\.2\.3\Z/
+        Identity.from_asn1(asn1.value[1].value[0])
+      when /\A.*1\.2\.4\Z/
+        Pseudonym.from_asn1(asn1.value[1].value[0])
       else
         raise "Invalid type"
       end

data/lib/poly_pseudo/pseudonym.rb

@@ -2,6 +2,21 @@ module PolyPseudo
   class Pseudonym
     include PolyPseudo::PseudoId
 
+    def self.from_asn1(asn1)
+      attributes = {}
+      attributes["Type"]                   = asn1.value[0].value.to_s
+      attributes["SchemaVersion"]          = asn1.value[1].value.to_i
+      attributes["SchemaKeyVersion"]       = asn1.value[2].value.to_i
+      attributes["Creator"]                = asn1.value[3].value.to_s
+      attributes["Recipient"]              = asn1.value[4].value.to_s
+      attributes["RecipientKeySetVersion"] = asn1.value[5].value.to_i
+      attributes["Point1"]                 = OpenSSL::PKey::EC::Point.new(PolyPseudo.config.group, OpenSSL::BN.new(asn1.value[7].value[0].value, 2))
+      attributes["Point2"]                 = OpenSSL::PKey::EC::Point.new(PolyPseudo.config.group, OpenSSL::BN.new(asn1.value[7].value[1].value, 2))
+      attributes["Point3"]                 = OpenSSL::PKey::EC::Point.new(PolyPseudo.config.group, OpenSSL::BN.new(asn1.value[7].value[2].value, 2))
+
+      new(attributes)
+    end
+
     # @param [PolyPseudo::Key] closing_key
     def decrypt(decryption_key, closing_key)
       PolyPseudo.init!

data/lib/poly_pseudo/version.rb

@@ -1,3 +1,3 @@
 module PolyPseudo
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poly_pseudo
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Benoist Claassen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-05 00:00:00.000000000 Z
+date: 2018-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler