Merge pull request #197 from kelvinmo/issues/aescgmkeywrap-null

Fix issue with null $alg in constructor of AESGCMKeyWrap
kelvinmo · Jul 6, 2024 · d1c49be · d1c49be
2 parents 5460000 + f8d7263
commit d1c49be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [Unreleased]
+
+- Fixed: Deprecation warning in constructor of AESGCMKeyWrap (#197)
+
 ## [0.9.0]
 
 - Changed: Providing invalid JSON tokens into JWT::deserialise() and
@@ -206,6 +210,7 @@ All notable changes to this project will be documented in this file.
 
 - Initial release
 
+[Unreleased]: https://github.com/kelvinmo/simplejwt/compare/v0.9.0...HEAD
 [0.9.0]: https://github.com/kelvinmo/simpleid/compare/v0.8.2...v0.9.0
 [0.8.2]: https://github.com/kelvinmo/simpleid/compare/v0.8.1...v0.8.2
 [0.8.1]: https://github.com/kelvinmo/simpleid/compare/v0.8.0...v0.8.1

diff --git a/src/SimpleJWT/Crypt/KeyManagement/AESGCMKeyWrap.php b/src/SimpleJWT/Crypt/KeyManagement/AESGCMKeyWrap.php
@@ -52,7 +52,7 @@ class AESGCMKeyWrap extends BaseAlgorithm implements KeyEncryptionAlgorithm {
     private $aesgcm;
 
     public function __construct(?string $alg) {
-        $this->aesgcm = new AESGCM(substr($alg, 0, -2));
+        $this->aesgcm = new AESGCM(($alg == null) ? null : substr($alg, 0, -2));
         parent::__construct($alg);
     }