Fix warning: shadowing outer local variable
Versions of ruby deal with shadowing in different ways. Best to avoid it when possible. Addresses the following warnings: lib/google/api_client/auth/key_utils.rb:34: warning: shadowing outer local variable - passphrase lib/google/api_client/auth/key_utils.rb:52: warning: shadowing outer local variable - passphrase
This commit is contained in:
parent
4d81ad116a
commit
3eb18d6011
|
@ -25,44 +25,44 @@ module Google
|
||||||
#
|
#
|
||||||
# @param [String] keyfile
|
# @param [String] keyfile
|
||||||
# Path of the PKCS12 file to load. If not a path to an actual file,
|
# Path of the PKCS12 file to load. If not a path to an actual file,
|
||||||
# assumes the string is the content of the file itself.
|
# assumes the string is the content of the file itself.
|
||||||
# @param [String] passphrase
|
# @param [String] passphrase
|
||||||
# Passphrase for unlocking the private key
|
# Passphrase for unlocking the private key
|
||||||
#
|
#
|
||||||
# @return [OpenSSL::PKey] The private key for signing assertions.
|
# @return [OpenSSL::PKey] The private key for signing assertions.
|
||||||
def self.load_from_pkcs12(keyfile, passphrase)
|
def self.load_from_pkcs12(keyfile, passphrase)
|
||||||
load_key(keyfile, passphrase) do |content, passphrase|
|
load_key(keyfile, passphrase) do |content, pass_phrase|
|
||||||
OpenSSL::PKCS12.new(content, passphrase).key
|
OpenSSL::PKCS12.new(content, pass_phrase).key
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
##
|
##
|
||||||
# Loads a key from a PEM file.
|
# Loads a key from a PEM file.
|
||||||
#
|
#
|
||||||
# @param [String] keyfile
|
# @param [String] keyfile
|
||||||
# Path of the PEM file to load. If not a path to an actual file,
|
# Path of the PEM file to load. If not a path to an actual file,
|
||||||
# assumes the string is the content of the file itself.
|
# assumes the string is the content of the file itself.
|
||||||
# @param [String] passphrase
|
# @param [String] passphrase
|
||||||
# Passphrase for unlocking the private key
|
# Passphrase for unlocking the private key
|
||||||
#
|
#
|
||||||
# @return [OpenSSL::PKey] The private key for signing assertions.
|
# @return [OpenSSL::PKey] The private key for signing assertions.
|
||||||
#
|
#
|
||||||
def self.load_from_pem(keyfile, passphrase)
|
def self.load_from_pem(keyfile, passphrase)
|
||||||
load_key(keyfile, passphrase) do | content, passphrase|
|
load_key(keyfile, passphrase) do | content, pass_phrase|
|
||||||
OpenSSL::PKey::RSA.new(content, passphrase)
|
OpenSSL::PKey::RSA.new(content, pass_phrase)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
##
|
##
|
||||||
# Helper for loading keys from file or memory. Accepts a block
|
# Helper for loading keys from file or memory. Accepts a block
|
||||||
# to handle the specific file format.
|
# to handle the specific file format.
|
||||||
#
|
#
|
||||||
# @param [String] keyfile
|
# @param [String] keyfile
|
||||||
# Path of thefile to load. If not a path to an actual file,
|
# Path of thefile to load. If not a path to an actual file,
|
||||||
# assumes the string is the content of the file itself.
|
# assumes the string is the content of the file itself.
|
||||||
# @param [String] passphrase
|
# @param [String] passphrase
|
||||||
# Passphrase for unlocking the private key
|
# Passphrase for unlocking the private key
|
||||||
#
|
#
|
||||||
|
@ -86,8 +86,8 @@ module Google
|
||||||
block.call(content, passphrase)
|
block.call(content, passphrase)
|
||||||
rescue OpenSSL::OpenSSLError
|
rescue OpenSSL::OpenSSLError
|
||||||
raise ArgumentError.new("Invalid keyfile or passphrase")
|
raise ArgumentError.new("Invalid keyfile or passphrase")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue