Merge pull request #538 from rhenium/ky/hmac-evp-use-raw-private-key

hmac: use EVP_PKEY_new_raw_private_key() if available
ruby · Sep 2, 2022 · ab4d58e · ab4d58e
2 parents d52549a + 4293f18
commit ab4d58e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
@@ -169,6 +169,7 @@ def find_openssl_library
 
 # added in 1.1.1
 have_func("EVP_PKEY_check")
+have_func("EVP_PKEY_new_raw_private_key")
 
 # added in 3.0.0
 have_func("SSL_set0_tmp_dh_pkey")

diff --git a/ext/openssl/ossl_hmac.c b/ext/openssl/ossl_hmac.c
@@ -97,11 +97,19 @@ ossl_hmac_initialize(VALUE self, VALUE key, VALUE digest)
 
  GetHMAC(self, ctx);
  StringValue(key);
+#ifdef HAVE_EVP_PKEY_NEW_RAW_PRIVATE_KEY
+ pkey = EVP_PKEY_new_raw_private_key(EVP_PKEY_HMAC, NULL,
+ (unsigned char *)RSTRING_PTR(key),
+ RSTRING_LENINT(key));
+ if (!pkey)
+ ossl_raise(eHMACError, "EVP_PKEY_new_raw_private_key");
+#else
  pkey = EVP_PKEY_new_mac_key(EVP_PKEY_HMAC, NULL,
  (unsigned char *)RSTRING_PTR(key),
  RSTRING_LENINT(key));
  if (!pkey)
  ossl_raise(eHMACError, "EVP_PKEY_new_mac_key");
+#endif
  if (EVP_DigestSignInit(ctx, NULL, ossl_evp_get_digestbyname(digest),
  NULL, pkey) != 1) {
  EVP_PKEY_free(pkey);

diff --git a/test/openssl/test_hmac.rb b/test/openssl/test_hmac.rb
@@ -63,6 +63,14 @@ def test_singleton_methods
  b64digest = OpenSSL::HMAC.base64digest("MD5", key, "Hi There")
  assert_equal "kpRyejY4uxwT9I74FYv8nQ==", b64digest
  end
+
+ def test_zero_length_key
+ # Empty string as the key
+ hexdigest = OpenSSL::HMAC.hexdigest("SHA256", "\0"*32, "test")
+ assert_equal "43b0cef99265f9e34c10ea9d3501926d27b39f57c6d674561d8ba236e7a819fb", hexdigest
+ hexdigest = OpenSSL::HMAC.hexdigest("SHA256", "", "test")
+ assert_equal "43b0cef99265f9e34c10ea9d3501926d27b39f57c6d674561d8ba236e7a819fb", hexdigest
+ end
 end
 
 end