Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support rsa-pkcs1v15-sha256 keys #86

Merged
merged 2 commits into from
Aug 22, 2024
Merged

Support rsa-pkcs1v15-sha256 keys #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b18c186
Support rsa-pkcs1v15-sha256 keys
segiddins Aug 21, 2024
1af261b
Merge branch 'main' into segiddins/support-rsa-pkcs1v15-sha256-keys
segiddins Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/sigstore/internal/key.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def initialize(...)
raise ArgumentError, "key must be an OpenSSL::PKey::RSA" unless @key.is_a?(OpenSSL::PKey::RSA)

case @schema
when "rsassa-pss-sha256"
when "rsassa-pss-sha256", "rsa-pkcs1v15-sha256"
# supported
else
raise ArgumentError, "Unsupported schema #{schema}"
Expand All @@ -115,6 +115,8 @@ def verify(_algo, signature, data)
case @schema
when "rsassa-pss-sha256"
@key.verify_pss("sha256", signature, data, salt_length: :auto, mgf1_hash: "SHA256")
when "rsa-pkcs1v15-sha256"
super
else
raise ArgumentError, "Unsupported schema #{schema}"
end
Expand Down
6 changes: 4 additions & 2 deletions lib/sigstore/tuf/roles.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def verify_delegate(type, bytes, signatures)
signatures.each do |signature|
key_id = signature.fetch("keyid")
unless @keys.include?(key_id)
logger.warn "Unknown key_id=#{key_id.inspect} missing from #{@keys}"
logger.warn "Unknown key_id=#{key_id.inspect} missing from #{@keys.keys}"
next
end

Expand All @@ -90,7 +90,9 @@ def verify_delegate(type, bytes, signatures)
verified = key.verify("sha256", signature_bytes, bytes)

added = verified_key_ids.add?(key_id) if verified
logger.debug { "key_id=#{key_id.inspect} type=#{type} verified=#{verified} added=#{added.inspect}" }
logger.debug do
"key_id=#{key_id.inspect} type=#{type} verified=#{verified} added=#{added.nil? ? added.inspect : true}"
end
end
count = verified_key_ids.size

Expand Down
2 changes: 1 addition & 1 deletion lib/sigstore/tuf/trusted_metadata_set.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def update_delegated_targets(data, role, parent_role)
check_final_snapshot

delegator = @trusted_set.fetch(parent_role)
logger.debug { "Updating #{role} delegated by #{parent_role.inspect} to #{delegator.inspect}" }
logger.debug { "Updating #{role} delegated by #{parent_role.inspect} to #{delegator.class}" }
raise Error::BadUpdateOrder, "cannot load targets before delegator" unless delegator

logger.debug { "Updating #{role} delegated by #{parent_role}" }
Expand Down
Loading