summaryrefslogtreecommitdiff
path: root/lib/rubygems/security
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-04 21:54:58 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-04 21:54:58 +0000
commit091c24d51b962745bf887a729c81e847b257dc11 (patch)
tree0a8cd1085f63ffa64eff0d3c4da0d5a449e0c5a1 /lib/rubygems/security
parent0454c0a2818ffc1df72e0672e4e272486b2ba536 (diff)
* lib/rubygems: Update to RubyGems 2.0.3
* test/rubygems: Tests for the above. * NEWS: Added RubyGems 2.0.3 note. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41076 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/security')
-rw-r--r--lib/rubygems/security/signer.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/rubygems/security/signer.rb b/lib/rubygems/security/signer.rb
index 29b03683b7..78455c0732 100644
--- a/lib/rubygems/security/signer.rb
+++ b/lib/rubygems/security/signer.rb
@@ -34,12 +34,12 @@ class Gem::Security::Signer
@key = key
unless @key then
- default_key = File.join Gem.user_home, 'gem-private_key.pem'
+ default_key = File.join Gem.default_key_path
@key = default_key if File.exist? default_key
end
unless @cert_chain then
- default_cert = File.join Gem.user_home, 'gem-public_cert.pem'
+ default_cert = File.join Gem.default_cert_path
@cert_chain = [default_cert] if File.exist? default_cert
end
@@ -110,15 +110,15 @@ class Gem::Security::Signer
def re_sign_key # :nodoc:
old_cert = @cert_chain.last
- disk_cert_path = File.join Gem.user_home, 'gem-public_cert.pem'
+ disk_cert_path = File.join Gem.default_cert_path
disk_cert = File.read disk_cert_path rescue nil
disk_key =
- File.read File.join(Gem.user_home, 'gem-private_key.pem') rescue nil
+ File.read File.join(Gem.default_key_path) rescue nil
if disk_key == @key.to_pem and disk_cert == old_cert.to_pem then
expiry = old_cert.not_after.strftime '%Y%m%d%H%M%S'
old_cert_file = "gem-public_cert.pem.expired.#{expiry}"
- old_cert_path = File.join Gem.user_home, old_cert_file
+ old_cert_path = File.join Gem.user_home, ".gem", old_cert_file
unless File.exist? old_cert_path then
Gem::Security.write old_cert, old_cert_path