From 5720619390dc0497589315f3c96a9c9af1666698 Mon Sep 17 00:00:00 2001 From: Egon Zemmer Date: Fri, 2 Oct 2020 15:59:13 +0200 Subject: [PATCH] Adapt HMAC to JWK RSA code style. --- lib/jwt/jwk/hmac.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/jwt/jwk/hmac.rb b/lib/jwt/jwk/hmac.rb index 8ba66e1a..10c4fec1 100644 --- a/lib/jwt/jwk/hmac.rb +++ b/lib/jwt/jwk/hmac.rb @@ -9,7 +9,7 @@ def initialize(keypair, kid = nil) raise ArgumentError, 'keypair must be of type String' unless keypair.is_a?(String) super - @kid = kid || generate_kid(@keypair) + @kid = kid || generate_kid end def private? @@ -22,22 +22,22 @@ def public_key # See https://tools.ietf.org/html/rfc7517#appendix-A.3 def export(options = {}) - ret = { + exported_hash = { kty: KTY, kid: kid } - return ret unless private? && options[:include_private] == true + return exported_hash unless private? && options[:include_private] == true - ret.merge( + exported_hash.merge( k: keypair ) end private - def generate_kid(hmac_key) - sequence = OpenSSL::ASN1::Sequence([OpenSSL::ASN1::UTF8String.new(hmac_key), + def generate_kid + sequence = OpenSSL::ASN1::Sequence([OpenSSL::ASN1::UTF8String.new(keypair), OpenSSL::ASN1::UTF8String.new(KTY)]) OpenSSL::Digest::SHA256.hexdigest(sequence.to_der) end