certificate-transparency-client 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47620dc3af464cdf41a23e61a5e8fc6c202ecef4
-  data.tar.gz: b3896f7606a3649d2b0b8e7dfd635dfde2ab72ce
+  metadata.gz: b148e845e7c72e833e0378091a24ff6783e9dc2e
+  data.tar.gz: b9ffaec32c0e670213f9a52d48cd152a8134ede2
 SHA512:
-  metadata.gz: fcc2872a2084a1c6f578729438223e028cc2cbb4387b35b193d6600b75444bdb7a3235f56c8cbc3cd3d4cc7df8666fe724d818ff18798aa93bb00da3ba9d331c
-  data.tar.gz: f852386120c2a3c7803e1aba575c6c61734d5a68132a0d41f93e09399113471d11229dffd6cbdd577db9c2c4a53f6b46a04c46413e787cd0c393b92e7ad2da12
+  metadata.gz: e1e6b53c49dcbbb1311027f5f33aee7686798f460a416a2adae70cd863481622aabeb2ba361b722cd2a309be4dd9732456ae98b8065c77752f3b6c2b3fb94f87
+  data.tar.gz: 57b496fb3c0b11473a127af8c4ef8d6b7c93659330c60f0be0b5dbccb1b0db2c7c77b410a39c6e573f6bd200124855246eb90c66e37a54dca527663346467d3b

data/lib/certificate-transparency/client.rb

@@ -19,7 +19,7 @@ class CertificateTransparency::Client
 
 	# The public key of the log, as specified in the constructor.
 	#
-	# @return [OpenSSL::PKey]
+	# @return [OpenSSL::PKey::PKey]
 	#
 	attr_reader :public_key
 
@@ -42,15 +42,23 @@ class CertificateTransparency::Client
 		end
 
 		if opts[:public_key]
-			begin
-				@public_key = if opts[:public_key].valid_encoding? && opts[:public_key] =~ /^[A-Za-z0-9+\/]+=*$/
-					OpenSSL::PKey::EC.new(opts[:public_key].unpack("m").first)
-				else
-					OpenSSL::PKey::EC.new(opts[:public_key])
+			pkdata = if opts[:public_key].valid_encoding? && opts[:public_key] =~ /^[A-Za-z0-9+\/]+=*$/
+				opts[:public_key].unpack("m").first
+			else
+				opts[:public_key]
+			end
+
+			@public_key = begin
+				OpenSSL::PKey::EC.new(pkdata)
+			rescue ArgumentError
+				begin
+					OpenSSL::PKey::RSA.new(pkdata)
+				rescue StandardError => ex
+					raise "Invalid public key: #{ex.message} (#{ex.class})"
 				end
-			rescue OpenSSL::PKey::ECError
+			rescue StandardError => ex
 				raise ArgumentError,
-				      "Invalid public key"
+				      "Invalid public key: #{ex.message} (#{ex.class})"
 			end
 		end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: certificate-transparency-client
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-13 00:00:00.000000000 Z
+date: 2015-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: certificate-transparency