certificate-transparency 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39b2b99f63286dade01640df20a331e7c1281018
-  data.tar.gz: 98f432392e75038c15eaa17090e239501dc8011e
+  metadata.gz: 11f886387e3fe45724a6bfba907989cf2a947511
+  data.tar.gz: 2cd7d9db7a182db68e07ebb2b6eae5de0a002e14
 SHA512:
-  metadata.gz: 4b1d533fafad47199195eaf133fe8cdbcc7889897fd413336ed8d48bbbaf466bcc566f2238cd16c459df2a0f34020d356556b6b623ccbf9a05dded51cd67ab2f
-  data.tar.gz: d49e9c47f74b63f6c8b5bf1c063d34f730abd84dd7282beb8bb06ac28162f988bd01b46acb026f5d0aad2977964cd30954f79a99bb4b1b8b14ff75b58772b91e
+  metadata.gz: a686b0ea5debd3874535bbd71041b4e03ac57407ac2e8c6c19ae027b48e04f67520a13668468b7b6293bd1707df75669447858eb26d341061e6ea26703543bf0
+  data.tar.gz: e687144e67b46d75ffe422f0b3693f061f65a00958746eee335d041be5ec4d28db077e33238e49cb23659de8e9bad50d53759ac9af5bed7a31c29d12915919d5

data/lib/certificate-transparency.rb

@@ -32,5 +32,6 @@ require_relative 'certificate-transparency/extensions/string'
 require_relative 'certificate-transparency/extensions/time'
 
 require_relative 'certificate-transparency/merkle_tree_leaf'
+require_relative 'certificate-transparency/pre_cert'
 require_relative 'certificate-transparency/signed_tree_head'
 require_relative 'certificate-transparency/timestamped_entry'

data/lib/certificate-transparency/pre_cert.rb

@@ -0,0 +1,52 @@
+# An RFC6962 `PreCert` structure.
+#
+class CertificateTransparency::PreCert
+	attr_accessor :issuer_key_hash, :tbs_certificate
+
+	# Parse a binary blob into a PreCert structure.
+	#
+	# It is uncommon to call this directly.  Because of the way that the
+	# PreCert is encoded, you have to parse the component parts out of the
+	# `TimestampedEntry`; however, this method is here if you need it.
+	#
+	# @param blob [String]
+	#
+	# @return [CertificateTransparency::PreCert]
+	#
+	def self.from_blob(blob)
+		new.tap do |pc|
+			pc.issuer_key_hash, tbs_blob = blob.unpack("a32a*")
+			tbs_opaque, rest = TLS::Opaque.from_blob(tbs_blob, 2**24-1)
+			unless rest == ""
+				raise ArgumentError,
+				      "Invalid blob (extra data after end of structure: #{rest.inspect}"
+			end
+
+			pc.tbs_certificate = tbs_opaque.value
+		end
+	end
+
+	# Turn this structure into an encoded binary blob.
+	#
+	# @return [String]
+	#
+	# @raise [RuntimeError] if some of the fields in the structure aren't
+	#   filled out.
+	#
+	def to_blob
+		if @issuer_key_hash.nil?
+			raise RuntimeError,
+			      "issuer_key_hash is not set"
+		end
+
+		if @tbs_certificate.nil?
+			raise RuntimeError,
+			      "tbs_certificate is not set"
+		end
+
+		[
+		 @issuer_key_hash,
+		 TLS::Opaque.new(@tbs_certificate, 2**24-1).to_blob
+		].pack("a32a*")
+	end
+end

data/lib/certificate-transparency/timestamped_entry.rb

@@ -65,7 +65,7 @@ class CertificateTransparency::TimestampedEntry
 				ikh, tbsc_len_hi, tbsc_len_lo, rest = rest.unpack("a32nCa*")
 				tbsc_len = tbsc_len_hi * 256 + tbsc_len_lo
 				tbsc, rest = rest.unpack("a#{tbsc_len}a*")
-				te.precert_entry = ::CertificateTransparency::PreCert.new do |ctpc|
+				te.precert_entry = ::CertificateTransparency::PreCert.new.tap do |ctpc|
 					ctpc.issuer_key_hash = ikh
 					ctpc.tbs_certificate = tbsc
 				end

data/lib/tls/opaque.rb

@@ -48,6 +48,7 @@ class TLS::Opaque
 	# larger than `maxlen`.
 	#
 	def self.from_blob(blob, maxlen)
+		blob = blob.dup.force_encoding("BINARY")
 		len_bytes = lenlen(maxlen)
 
 		len = blob[0..len_bytes-1].split('').inject(0) do |total, c|
@@ -59,7 +60,7 @@ class TLS::Opaque
 			      "Encoded length (#{len}) is greater than maxlen (#{maxlen})"
 		end
 
-		if len > blob[len_bytes..-1].length
+		if len > blob[len_bytes..-1].bytesize
 			raise ArgumentError,
 			      "Encoded length (#{len}) is greater than the number of bytes available"
 		end
@@ -70,12 +71,14 @@ class TLS::Opaque
 	end
 
 	def initialize(str, maxlen)
+		str = str.dup.force_encoding("BINARY")
+
 		unless maxlen.is_a? Integer
 			raise ArgumentError,
 			      "maxlen must be an Integer"
 		end
 
-		if str.length > maxlen
+		if str.bytesize > maxlen
 			raise ArgumentError,
 			      "value given is longer than maxlen (#{maxlen})"
 		end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: certificate-transparency
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -160,6 +160,7 @@ files:
 - lib/certificate-transparency/extensions/string.rb
 - lib/certificate-transparency/extensions/time.rb
 - lib/certificate-transparency/merkle_tree_leaf.rb
+- lib/certificate-transparency/pre_cert.rb
 - lib/certificate-transparency/signed_tree_head.rb
 - lib/certificate-transparency/timestamped_entry.rb
 - lib/tls.rb