summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ext/digest/lib/digest.rb18
2 files changed, 16 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 1265469..2f47fcd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb 14 19:22:15 2007 Akinori MUSHA <knu@iDaemons.org>
+
+ * ext/digest/lib/digest.rb (Digest::self.const_missing): Drop
+ autoloads for sha2 classes in favor of handling in
+ const_missing(), to work around a problem exposed on OS X.
+
Tue Feb 13 02:21:12 2007 Sam Roberts <sroberts@uniserve.com>
* io.c (rb_f_syscall): Fix buffer overflow with syscall
diff --git a/ext/digest/lib/digest.rb b/ext/digest/lib/digest.rb
index 578c6f5..244cd43 100644
--- a/ext/digest/lib/digest.rb
+++ b/ext/digest/lib/digest.rb
@@ -1,19 +1,21 @@
require 'digest.so'
module Digest
- autoload "SHA256", "digest/sha2.so"
- autoload "SHA384", "digest/sha2.so"
- autoload "SHA512", "digest/sha2.so"
-
def self.const_missing(name)
- begin
- require File.join('digest', name.to_s.downcase)
+ case name
+ when :SHA256, :SHA384, :SHA512
+ lib = 'digest/sha2.so'
+ else
+ lib = File.join('digest', name.to_s.downcase)
+ end
- return Digest.const_get(name) if Digest.const_defined?(name)
+ begin
+ require lib
rescue LoadError => e
+ raise LoadError, "library not found for class Digest::#{name} -- #{lib}"
end
- raise NameError, "Digest class not found: Digest::#{name}"
+ Digest.const_get(name)
end
class ::Digest::Class