Merge pull request #187 from eitoball/change_openssl_hmac_digest_encoding_to_binary

Watson1978 · Watson1978 · commit 4e27c8b80bd6 · 2013-02-15T06:37:12.000-08:00
Change encoding of OpenSSL::HMAC.digest result to binary
diff --git a/ext/openssl/ossl_hmac.c b/ext/openssl/ossl_hmac.c
@@ -201,7 +201,7 @@ ossl_hmac_s_digest(VALUE klass, SEL sel, VALUE digest, VALUE key, VALUE data)
     buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LEN(key),
 	       (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len);
 
-    return rb_str_new((const char *)buf, buf_len);
+    return rb_bstr_new_with_data((UInt8 *)buf, buf_len);
 }
 
 /*
diff --git a/test-mri/test/openssl/test_hmac.rb b/test-mri/test/openssl/test_hmac.rb
@@ -28,6 +28,10 @@ def test_hmac
     assert_equal(OpenSSL::HMAC.hexdigest("MD5", @key, @data), @h2.hexdigest, "hexdigest")
   end
 
+  def test_hmac_digest_encoding
+    assert_equal(Encoding::BINARY, OpenSSL::HMAC.digest("SHA1", @key, @data).encoding)
+  end
+
   def test_dup
     @h1.update(@data)
     h = @h1.dup

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ ossl_hmac_s_digest(VALUE klass, SEL sel, VALUE digest, VALUE key, VALUE data)`
`201`	`201`	`buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LEN(key),`
`202`	`202`	`(unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len);`
`203`	`203`
`204`		`- return rb_str_new((const char *)buf, buf_len);`
	`204`	`+ return rb_bstr_new_with_data((UInt8 *)buf, buf_len);`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`/*`