Use OpenSSL::HMAC in preference to Digest::HMAC

.travis.yml

@@ -3,4 +3,6 @@ script: rake
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1
+  - 2.2
   - jruby-19mode

lib/openid/cryptutil.rb

@@ -37,7 +37,9 @@ def CryptUtil.sha1(text)
     end
 
     def CryptUtil.hmac_sha1(key, text)
-      if Digest.const_defined? :HMAC, false
+      if defined?(OpenSSL) && OpenSSL.const_defined?(:HMAC) && OpenSSL::HMAC.respond_to?(:digest)
+        OpenSSL::HMAC.digest("sha1", key, text)
+      elsif Digest.const_defined? :HMAC, false
         Digest::HMAC.new(key,Digest::SHA1).update(text).digest
       else
         return HMAC::SHA1.digest(key, text)
@@ -49,7 +51,9 @@ def CryptUtil.sha256(text)
     end
 
     def CryptUtil.hmac_sha256(key, text)
-      if Digest.const_defined? :HMAC, false
+      if defined?(OpenSSL) && OpenSSL.const_defined?(:HMAC) && OpenSSL::HMAC.respond_to?(:digest)
+        OpenSSL::HMAC.digest("sha256", key, text)
+      elsif Digest.const_defined? :HMAC, false
         Digest::HMAC.new(key,Digest::SHA256).update(text).digest
       else
         return HMAC::SHA256.digest(key, text)

lib/openid/trustroot.rb

@@ -174,7 +174,7 @@ def TrustRoot._parse_url(url)
         begin
           url = URINorm.urinorm(url)
         rescue URI::InvalidURIError
-          nil
+          return nil
         end
 
         begin
@@ -210,7 +210,7 @@ def TrustRoot.parse(trust_root)
         return nil if parts.nil?
 
         proto, host, port, path = parts
-        return nil if host[0] == '.'
+        return nil if host[0] == '.' || host.include?('*')
 
         # check for URI fragment
         if path and !path.index('#').nil?

test/test_trustroot.rb

@@ -12,7 +12,7 @@ def _test_sanity(case_, sanity, desc)
       assert tr.sane?, [case_, desc].join(' ')
       assert OpenID::TrustRoot::TrustRoot.check_sanity(case_), [case_, desc].join(' ')
     elsif sanity == 'insane'
-      assert !tr.sane?, [case_, desc].join(' ')
+      assert tr.nil? || !tr.sane?, [case_, desc].join(' ')
       assert !OpenID::TrustRoot::TrustRoot.check_sanity(case_), [case_, desc].join(' ')
     else
       assert tr.nil?, case_