pq_crypto 0.6.6 → 0.6.8

data/lib/pq_crypto/spki.rb

@@ -26,7 +26,7 @@ module PQCrypto
           ]),
           OpenSSL::ASN1::BitString.new(bytes),
         ]).to_der.b
-      rescue OpenSSL::ASN1::ASN1Error => e
+      rescue OpenSSL::OpenSSLError, TypeError => e
         raise SerializationError, e.message
       end
 
@@ -39,43 +39,58 @@ module PQCrypto
       def decode_der(der)
         input = String(der).b
         outer = decode_asn1(input)
+        algorithm_identifier, subject_public_key = spki_elements(outer, input)
+        algorithm = decode_algorithm_identifier(algorithm_identifier)
+        [algorithm, decode_subject_public_key(algorithm, subject_public_key)]
+      rescue OpenSSL::OpenSSLError, TypeError => e
+        raise SerializationError, e.message
+      end
+
+      def decode_pem(pem)
+        der = der_from_pem(pem)
+        decode_der(der)
+      end
+
+      private
+
+      def decode_asn1(der)
+        OpenSSL::ASN1.decode(der)
+      rescue OpenSSL::OpenSSLError, TypeError => e
+        raise SerializationError, e.message
+      end
+
+      def spki_elements(outer, input)
         raise SerializationError, "SPKI DER contains trailing data" unless outer.to_der.b == input
         raise SerializationError, "SPKI must be an ASN.1 SEQUENCE" unless outer.is_a?(OpenSSL::ASN1::Sequence)
         raise SerializationError, "SPKI SEQUENCE must contain exactly 2 elements" unless outer.value.size == 2
 
-        algorithm_identifier, subject_public_key = outer.value
-        algorithm = decode_algorithm_identifier(algorithm_identifier)
+        outer.value
+      end
+
+      def decode_subject_public_key(algorithm, subject_public_key)
         entry = AlgorithmRegistry.fetch(algorithm)
         validate_public_key_algorithm!(algorithm, entry)
+        validate_subject_public_key!(subject_public_key)
 
+        bytes = String(subject_public_key.value).b
+        validate_public_key_length!(algorithm, bytes, entry.fetch(:public_key_bytes))
+        bytes
+      end
+
+      def validate_subject_public_key!(subject_public_key)
         unless subject_public_key.is_a?(OpenSSL::ASN1::BitString)
           raise SerializationError, "SPKI subjectPublicKey must be a BIT STRING"
         end
-        unless subject_public_key.unused_bits.zero?
-          raise SerializationError, "SPKI subjectPublicKey must have zero unused bits"
-        end
-
-        bytes = String(subject_public_key.value).b
-        expected = entry.fetch(:public_key_bytes)
-        unless bytes.bytesize == expected
-          raise SerializationError,
-                "Invalid #{algorithm.inspect} SPKI public key length: expected #{expected}, got #{bytes.bytesize}"
-        end
+        return if subject_public_key.unused_bits.zero?
 
-        [algorithm, bytes]
+        raise SerializationError, "SPKI subjectPublicKey must have zero unused bits"
       end
 
-      def decode_pem(pem)
-        der = der_from_pem(pem)
-        decode_der(der)
-      end
+      def validate_public_key_length!(algorithm, bytes, expected)
+        return if bytes.bytesize == expected
 
-      private
-
-      def decode_asn1(der)
-        OpenSSL::ASN1.decode(der)
-      rescue OpenSSL::ASN1::ASN1Error => e
-        raise SerializationError, e.message
+        raise SerializationError,
+              "Invalid #{algorithm.inspect} SPKI public key length: expected #{expected}, got #{bytes.bytesize}"
       end
 
       def decode_algorithm_identifier(value)

data/lib/pq_crypto/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PQCrypto
-  VERSION = "0.6.6"
+  VERSION = "0.6.8"
 end

data/lib/pq_crypto.rb

@@ -65,6 +65,15 @@ module PQCrypto
       ml_kem_1024_keypair_from_seed
       ml_kem_1024_encapsulate
       ml_kem_1024_decapsulate
+      ml_kem_check_public_key
+      ml_kem_check_secret_key
+      ml_kem_512_check_public_key
+      ml_kem_512_check_secret_key
+      ml_kem_1024_check_public_key
+      ml_kem_1024_check_secret_key
+      ml_dsa_check_secret_key
+      ml_dsa_44_check_secret_key
+      ml_dsa_87_check_secret_key
       hybrid_kem_keypair
       hybrid_kem_encapsulate
       hybrid_kem_expand_secret_key

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pq_crypto
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.8
 platform: ruby
 authors:
 - Roman Haydarov