From 9544853522a351371d466c966c06ee7b24d18d9a Mon Sep 17 00:00:00 2001
From: Gonzalo <grzuy0@gmail.com>
Date: Sun, 14 Mar 2021 17:36:48 -0300
Subject: [PATCH] Bump gem version to v2.5.0

---
 CHANGELOG.md                  | 14 ++++++++++++++
 SECURITY.md                   |  3 ++-
 lib/webauthn/version.rb       |  2 +-
 spec/conformance/Gemfile.lock |  9 +++++----
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa5ab353..7746403d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,17 @@
 
 - Ability to define multiple relying parties with the introduction of the `WebAuthn::RelyingParty` class ([@padulafacundo], [@brauliomartinezlm])
 
+## [v2.5.0] - 2021-03-14
+
+### Added
+
+- Support 'apple' attestation statement format ([#343](https://github.com/cedarcode/webauthn-ruby/pull/343) / [@juanarias93], [@santiagorodriguez96])
+- Allow specifying an array of ids as `allow_credentials:` for `FakeClient#get` method ([#335](https://github.com/cedarcode/webauthn-ruby/pull/335) / [@kingjan1999])
+
+### Removed
+
+- No longer accept "removed from the WebAuthn spec" options `rp: { icon: }` and `user: { icon: }` for `WebAuthn::Credential.options_for_create` method ([#326](https://github.com/cedarcode/webauthn-ruby/pull/326) / [@santiagorodriguez96])
+
 ## [v2.4.1] - 2021-02-15
 
 ### Fixed
@@ -314,6 +325,7 @@ Note: Both additions should help making it compatible with Chrome for Android 70
 - Works with ruby 2.5
 
 [v3.0.0.alpha1]: https://github.com/cedarcode/webauthn-ruby/compare/2-stable...v3.0.0.alpha1/
+[v2.5.0]: https://github.com/cedarcode/webauthn-ruby/compare/v2.4.1...v2.5.0/
 [v2.4.1]: https://github.com/cedarcode/webauthn-ruby/compare/v2.4.0...v2.4.1/
 [v2.4.0]: https://github.com/cedarcode/webauthn-ruby/compare/v2.3.0...v2.4.0/
 [v2.3.0]: https://github.com/cedarcode/webauthn-ruby/compare/v2.2.1...v2.3.0/
@@ -353,3 +365,5 @@ Note: Both additions should help making it compatible with Chrome for Android 70
 [@padulafacundo]: https://github.com/padulafacundo
 [@santiagorodriguez96]: https://github.com/santiagorodriguez96
 [@lgarron]: https://github.com/lgarron
+[@juanarias93]: https://github.com/juanarias93
+[@kingjan1999]: https://github.com/@kingjan1999
diff --git a/SECURITY.md b/SECURITY.md
index 72f52881..84d1ce96 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -4,9 +4,10 @@
 
 | Version | Supported          |
 | ------- | ------------------ |
+| 2.5.z    | :white_check_mark: |
 | 2.4.z    | :white_check_mark: |
 | 2.3.z    | :white_check_mark: |
-| 2.2.z    | :white_check_mark: |
+| 2.2.z    | :x: |
 | 2.1.z    | :x: |
 | 2.0.z    | :x: |
 | 1.18.z   | :white_check_mark: |
diff --git a/lib/webauthn/version.rb b/lib/webauthn/version.rb
index 946b4a5e..9ca2fab7 100644
--- a/lib/webauthn/version.rb
+++ b/lib/webauthn/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WebAuthn
-  VERSION = "2.4.1"
+  VERSION = "2.5.0"
 end
diff --git a/spec/conformance/Gemfile.lock b/spec/conformance/Gemfile.lock
index 88e45802..d29387ef 100644
--- a/spec/conformance/Gemfile.lock
+++ b/spec/conformance/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    webauthn (2.4.1)
+    webauthn (2.5.0)
       android_key_attestation (~> 0.3.0)
       awrence (~> 1.1)
       bindata (~> 2.4)
@@ -16,9 +16,9 @@ GEM
   remote: https://rubygems.org/
   specs:
     android_key_attestation (0.3.0)
-    awrence (1.1.1)
+    awrence (1.2.1)
     backports (3.15.0)
-    bindata (2.4.7)
+    bindata (2.4.8)
     byebug (11.0.1)
     cbor (0.5.9.6)
     cose (1.2.0)
@@ -31,7 +31,8 @@ GEM
     mustermann (1.1.0)
       ruby2_keywords (~> 0.0.1)
     openssl (2.2.0)
-    openssl-signature_algorithm (1.0.0)
+    openssl-signature_algorithm (1.1.1)
+      openssl (~> 2.0)
     rack (2.0.8)
     rack-contrib (2.1.0)
       rack (~> 2.0)