Browse Source

Merge branch 'main' into fix/rsa_private_key

Gonçalo Frade 6 months ago
parent
commit
8bcf97a8ae
100 changed files with 154 additions and 109 deletions
  1. 21 0
      .github/workflows/android.yml
  2. 1 1
      CONTRIBUTING.md
  3. 9 0
      CONTRIBUTORS.txt
  4. 1 1
      CryptoSwift-TestHostApp/AppDelegate.swift
  5. 2 2
      CryptoSwift.podspec
  6. 0 7
      Package.swift
  7. 4 4
      README.md
  8. 1 1
      Sources/CryptoSwift/AEAD/AEAD.swift
  9. 1 1
      Sources/CryptoSwift/AEAD/AEADChaCha20Poly1305.swift
  10. 1 1
      Sources/CryptoSwift/AES.Cryptors.swift
  11. 1 1
      Sources/CryptoSwift/AES.swift
  12. 1 1
      Sources/CryptoSwift/Array+Extension.swift
  13. 1 1
      Sources/CryptoSwift/Authenticator.swift
  14. 1 1
      Sources/CryptoSwift/BatchedCollection.swift
  15. 1 1
      Sources/CryptoSwift/Bit.swift
  16. 1 1
      Sources/CryptoSwift/BlockCipher.swift
  17. 1 1
      Sources/CryptoSwift/BlockDecryptor.swift
  18. 1 1
      Sources/CryptoSwift/BlockEncryptor.swift
  19. 1 1
      Sources/CryptoSwift/BlockMode/BlockMode.swift
  20. 1 1
      Sources/CryptoSwift/BlockMode/BlockModeOptions.swift
  21. 1 1
      Sources/CryptoSwift/BlockMode/CBC.swift
  22. 3 1
      Sources/CryptoSwift/BlockMode/CCM.swift
  23. 1 1
      Sources/CryptoSwift/BlockMode/CFB.swift
  24. 1 1
      Sources/CryptoSwift/BlockMode/CTR.swift
  25. 1 1
      Sources/CryptoSwift/BlockMode/CipherModeWorker.swift
  26. 1 1
      Sources/CryptoSwift/BlockMode/ECB.swift
  27. 2 2
      Sources/CryptoSwift/BlockMode/GCM.swift
  28. 1 1
      Sources/CryptoSwift/BlockMode/OFB.swift
  29. 1 1
      Sources/CryptoSwift/BlockMode/PCBC.swift
  30. 1 1
      Sources/CryptoSwift/Blowfish.swift
  31. 1 1
      Sources/CryptoSwift/CBCMAC.swift
  32. 1 1
      Sources/CryptoSwift/CMAC.swift
  33. 1 1
      Sources/CryptoSwift/CS_BigInt/BigInt.swift
  34. 1 1
      Sources/CryptoSwift/CS_BigInt/BigUInt.swift
  35. 1 1
      Sources/CryptoSwift/CS_BigInt/CS.swift
  36. 1 1
      Sources/CryptoSwift/ChaCha20.swift
  37. 1 1
      Sources/CryptoSwift/Checksum.swift
  38. 1 1
      Sources/CryptoSwift/Cipher.swift
  39. 1 1
      Sources/CryptoSwift/Collection+Extension.swift
  40. 1 1
      Sources/CryptoSwift/CompactMap.swift
  41. 1 1
      Sources/CryptoSwift/Cryptor.swift
  42. 3 1
      Sources/CryptoSwift/Cryptors.swift
  43. 1 1
      Sources/CryptoSwift/Digest.swift
  44. 1 1
      Sources/CryptoSwift/DigestType.swift
  45. 1 1
      Sources/CryptoSwift/Foundation/AES+Foundation.swift
  46. 1 1
      Sources/CryptoSwift/Foundation/Array+Foundation.swift
  47. 1 1
      Sources/CryptoSwift/Foundation/Blowfish+Foundation.swift
  48. 1 1
      Sources/CryptoSwift/Foundation/ChaCha20+Foundation.swift
  49. 1 1
      Sources/CryptoSwift/Foundation/Data+Extension.swift
  50. 1 1
      Sources/CryptoSwift/Foundation/HMAC+Foundation.swift
  51. 1 1
      Sources/CryptoSwift/Foundation/Rabbit+Foundation.swift
  52. 1 1
      Sources/CryptoSwift/Foundation/String+FoundationExtension.swift
  53. 1 1
      Sources/CryptoSwift/Foundation/Utils+Foundation.swift
  54. 1 1
      Sources/CryptoSwift/Generics.swift
  55. 3 1
      Sources/CryptoSwift/HKDF.swift
  56. 1 1
      Sources/CryptoSwift/HMAC.swift
  57. 3 1
      Sources/CryptoSwift/Int+Extension.swift
  58. 1 1
      Sources/CryptoSwift/MD5.swift
  59. 1 1
      Sources/CryptoSwift/NoPadding.swift
  60. 1 1
      Sources/CryptoSwift/Operators.swift
  61. 1 1
      Sources/CryptoSwift/PKCS/PBKDF1.swift
  62. 3 1
      Sources/CryptoSwift/PKCS/PBKDF2.swift
  63. 1 1
      Sources/CryptoSwift/PKCS/PKCS1v15.swift
  64. 1 1
      Sources/CryptoSwift/PKCS/PKCS5.swift
  65. 1 1
      Sources/CryptoSwift/PKCS/PKCS7.swift
  66. 1 1
      Sources/CryptoSwift/PKCS/PKCS7Padding.swift
  67. 1 1
      Sources/CryptoSwift/Padding.swift
  68. 1 1
      Sources/CryptoSwift/Poly1305.swift
  69. 1 1
      Sources/CryptoSwift/RSA/RSA+Cipher.swift
  70. 1 1
      Sources/CryptoSwift/RSA/RSA+Signature.swift
  71. 1 1
      Sources/CryptoSwift/RSA/RSA.swift
  72. 1 1
      Sources/CryptoSwift/Rabbit.swift
  73. 1 1
      Sources/CryptoSwift/SHA1.swift
  74. 1 1
      Sources/CryptoSwift/SHA2.swift
  75. 3 1
      Sources/CryptoSwift/SHA3.swift
  76. 1 1
      Sources/CryptoSwift/Scrypt.swift
  77. 7 1
      Sources/CryptoSwift/SecureBytes.swift
  78. 1 1
      Sources/CryptoSwift/Signature.swift
  79. 1 1
      Sources/CryptoSwift/StreamDecryptor.swift
  80. 1 1
      Sources/CryptoSwift/StreamEncryptor.swift
  81. 1 1
      Sources/CryptoSwift/String+Extension.swift
  82. 1 1
      Sources/CryptoSwift/UInt128.swift
  83. 1 1
      Sources/CryptoSwift/UInt16+Extension.swift
  84. 3 1
      Sources/CryptoSwift/UInt32+Extension.swift
  85. 1 1
      Sources/CryptoSwift/UInt64+Extension.swift
  86. 3 1
      Sources/CryptoSwift/UInt8+Extension.swift
  87. 1 1
      Sources/CryptoSwift/Updatable.swift
  88. 1 1
      Sources/CryptoSwift/Utils.swift
  89. 1 1
      Sources/CryptoSwift/ZeroPadding.swift
  90. 1 1
      Tests/CryptoSwiftTests/AESCCMTests.swift
  91. 1 1
      Tests/CryptoSwiftTests/AESTests.swift
  92. 1 1
      Tests/CryptoSwiftTests/AESTestsPerf.swift
  93. 1 1
      Tests/CryptoSwiftTests/Access.swift
  94. 1 1
      Tests/CryptoSwiftTests/BlowfishTests.swift
  95. 1 1
      Tests/CryptoSwiftTests/Bridging.h
  96. 1 1
      Tests/CryptoSwiftTests/CMACTests.swift
  97. 1 1
      Tests/CryptoSwiftTests/ChaCha20Poly1305Tests.swift
  98. 1 1
      Tests/CryptoSwiftTests/ChaCha20Tests.swift
  99. 1 1
      Tests/CryptoSwiftTests/ChaCha20TestsPerf.swift
  100. 1 1
      Tests/CryptoSwiftTests/DigestTests.swift

+ 21 - 0
.github/workflows/android.yml

@@ -0,0 +1,21 @@
+name: Android
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    - name: Run tests
+      uses: skiptools/swift-android-action@v2

+ 1 - 1
CONTRIBUTING.md

@@ -18,7 +18,7 @@ For new files, please use the correct file header:
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.
 //
-//  Permission is granted to anyone to use this software for any purpose,including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+//  Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
 //
 //  - The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation is required.
 //  - Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.

+ 9 - 0
CONTRIBUTORS.txt

@@ -4,6 +4,7 @@ organizations who have contributed source code to CryptoSwift.
 ### Contributors
 
 - 0xabhisek <128348758+0xabhisek@users.noreply.github.com>
+- Adin Cebic <cebic.ad@gmail.com>
 - Adolfo Martinelli <adolfo@airmap.com>
 - Aidan Woods <aidantwoods@gmail.com>
 - Alejandro Isaza <alejandro.isaza@gmail.com>
@@ -35,6 +36,7 @@ organizations who have contributed source code to CryptoSwift.
 - Dima Kalachov <dima.kalachov@gmail.com>
 - Dusan Klinec <dusan.klinec@gmail.com>
 - Elaine Lyons <e.lyons@fetchrewards.com>
+- Elias Rad <146735585+nnsW3@users.noreply.github.com>
 - Eneko Alonso <eneko.alonso@gmail.com>
 - Eugene Berdnikov <eberdnikov@outlook.com>
 - Evan Maloney <emaloney@gilt.com>
@@ -58,8 +60,10 @@ organizations who have contributed source code to CryptoSwift.
 - K.K. POON <noopkk@gmail.com>
 - Katrin Annuk <katrin.annuk@lab.mobi>
 - Keith Smiley <keithbsmiley@gmail.com>
+- Kenji Wada <ch3cooh393@gmail.com>
 - Koray Koska <koray@koska.at>
 - Kyle Fuller <kyle@fuller.li>
+- LamTrinh.Dev <me@lamtrinh.dev>
 - Lex Tang <lexrus@gmail.com>
 - Logan Wright <logan.william.wright@gmail.com>
 - Ludo Galabru <ludovic@galabru.com>
@@ -98,6 +102,7 @@ organizations who have contributed source code to CryptoSwift.
 - Ronald Mannak <ronaldmannak@me.com>
 - SLboat <toaier@me.com>
 - Sali0m <jehan.vossen@gmail.com>
+- Sam <sam.a.judd@gmail.com>
 - Sam Soffes <sam@soff.es>
 - Samuel GRAU <samuel.grau@gmail.com>
 - ScottieY <scottieyan@gmail.com>
@@ -114,15 +119,19 @@ organizations who have contributed source code to CryptoSwift.
 - WFrost3 <134406901+WFrost3@users.noreply.github.com>
 - Xavier Matos <matos.xav@gmail.com>
 - Yannick Loriot <yannick.loriot@gmail.com>
+- YinYuGuang <yin.yuguang@immomo.com>
 - Yury Lapitsky <yury.lapitsky@gmail.com>
 - Zsombor Szabo <zsombor@gmail.com>
 - Zsombor Szabo <zsombor@proxy.com>
 - akreutz <27BBsan08!>
+- dropbigfish <fillfish@foxmail.com>
 - jose <nextgenappsllc@gmail.com>
 - mrahmiao <mrahmiao@gmail.com>
+- planetBoy <140164174+Guayaba221@users.noreply.github.com>
 - spatno <seanpatno@gmail.com>
 - sweepty <adie0423@gmail.com>
 - venj <im.venj@gmail.com>
+- Исаев Владислав Игоревич <viisayev@mts.ru>
 
 **Updating this list**
 

+ 1 - 1
CryptoSwift-TestHostApp/AppDelegate.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 2 - 2
CryptoSwift.podspec

@@ -1,13 +1,13 @@
 Pod::Spec.new do |s|
   s.name         = "CryptoSwift"
-  s.version      = "1.8.3"
+  s.version      = "1.8.4"
   s.source       = { :git => "https://github.com/krzyzanowskim/CryptoSwift.git", :tag => "#{s.version}" }
   s.summary      = "Cryptography in Swift. SHA, MD5, CRC, PBKDF, Poly1305, HMAC, CMAC, HDKF, Scrypt, ChaCha20, Rabbit, Blowfish, AES, RSA."
   s.description  = "Cryptography functions and helpers for Swift implemented in Swift. SHA-1, SHA-2, SHA-3, MD5, PBKDF1, PBKDF2, Scrypt, CRC, Poly1305, HMAC, ChaCha20, Rabbit, Blowfish, AES, RSA"
   s.homepage     = "https://github.com/krzyzanowskim/CryptoSwift"
   s.license      = {:type => "Attribution", :file => "LICENSE"}
   s.authors      = {'Marcin Krzyżanowski' => 'marcin@krzyzanowskim.com'}
-  s.social_media_url = "https://twitter.com/krzyzanowskim"
+  s.social_media_url = "https://x.com/krzyzanowskim"
   s.cocoapods_version = '>= 1.10.0'
   s.swift_version = "5.6"
   s.ios.deployment_target = "11.0"

+ 0 - 7
Package.swift

@@ -19,10 +19,3 @@ let package = Package(
   ],
   swiftLanguageVersions: [.v5]
 )
-
-#if swift(>=5.6)
-  // Add the documentation compiler plugin if possible
-  package.dependencies.append(
-    .package(url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.3.0")
-  )
-#endif

+ 4 - 4
README.md

@@ -1,4 +1,4 @@
-[![Platform](https://img.shields.io/badge/Platforms-iOS%20%7C%20Android%20%7CmacOS%20%7C%20watchOS%20%7C%20tvOS%20%7C%20Linux-4E4E4E.svg?colorA=28a745)](#installation)
+[![Platform](https://img.shields.io/badge/Platforms-iOS%20%7C%20Android%20%7C%20macOS%20%7C%20watchOS%20%7C%20tvOS%20%7C%20Linux-4E4E4E.svg?colorA=28a745)](#installation)
 
 [![Swift support](https://img.shields.io/badge/Swift-3.1%20%7C%203.2%20%7C%204.0%20%7C%204.1%20%7C%204.2%20%7C%205.0-lightgrey.svg?colorA=28a745&colorB=4E4E4E)](#swift-versions-support)
 [![Swift Package Manager compatible](https://img.shields.io/badge/SPM-compatible-brightgreen.svg?style=flat&colorA=28a745&&colorB=4E4E4E)](https://github.com/swiftlang/swift-package-manager)
@@ -316,7 +316,7 @@ try CMAC(key: key).authenticate(bytes)
 let password: Array<UInt8> = Array("s33krit".utf8)
 let salt: Array<UInt8> = Array("nacllcan".utf8)
 
-let key = try PKCS5.PBKDF2(password: password, salt: salt, iterations: 4096, keyLength: 32, variant: .sha256).calculate()
+let key = try PKCS5.PBKDF2(password: password, salt: salt, iterations: 4096, keyLength: 32, variant: .sha2(.sha256)).calculate()
 ```
 
 ```swift
@@ -656,7 +656,7 @@ let rsaKey = try RSA(rawRepresentation: cfdata as Data)
 
 CryptoSwift is owned and maintained by [Marcin Krzyżanowski](https://www.krzyzanowskim.com)
 
-You can follow me on Twitter at [@krzyzanowskim](https://twitter.com/krzyzanowskim) for project updates and releases.
+You can follow me on Twitter at [@krzyzanowskim](https://x.com/krzyzanowskim) for project updates and releases.
 
 # Cryptography Notice
 
@@ -664,7 +664,7 @@ This distribution includes cryptographic software. The country in which you curr
 
 ## License
 
-Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 This software is provided 'as-is', without any express or implied warranty.
 
 In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/AEAD/AEAD.swift

@@ -2,7 +2,7 @@
 //  AEAD.swift
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/AEAD/AEADChaCha20Poly1305.swift

@@ -2,7 +2,7 @@
 //  AEADChaCha20Poly1305.swift
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/AES.Cryptors.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/AES.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/Array+Extension.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/Authenticator.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/BatchedCollection.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/Bit.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/BlockCipher.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/BlockDecryptor.swift

@@ -1,6 +1,6 @@
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/BlockEncryptor.swift

@@ -1,6 +1,6 @@
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/BlockMode/BlockMode.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/BlockMode/BlockModeOptions.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/BlockMode/CBC.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 3 - 1
Sources/CryptoSwift/BlockMode/CCM.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.
@@ -19,6 +19,8 @@
 
 #if canImport(Darwin)
 import Darwin
+#elseif canImport(Android)
+import Android
 #elseif canImport(Glibc)
 import Glibc
 #elseif canImport(Musl)

+ 1 - 1
Sources/CryptoSwift/BlockMode/CFB.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/BlockMode/CTR.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/BlockMode/CipherModeWorker.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/BlockMode/ECB.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 2 - 2
Sources/CryptoSwift/BlockMode/GCM.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.
@@ -128,7 +128,7 @@ final class GCMModeWorker: BlockModeWorker, FinalizingEncryptModeWorker, Finaliz
       self.additionalBufferSize = 0
     }
 
-    // Assume nonce is 12 bytes long, otherwise initial counter would be calulated from GHASH
+    // Assume nonce is 12 bytes long, otherwise initial counter would be calculated from GHASH
     // counter = GF.ghash(aad: [UInt8](), ciphertext: nonce)
     if iv.count == GCMModeWorker.nonceSize {
       self.counter = makeCounter(nonce: Array(self.iv))

+ 1 - 1
Sources/CryptoSwift/BlockMode/OFB.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/BlockMode/PCBC.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/Blowfish.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/CBCMAC.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/CMAC.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/CS_BigInt/BigInt.swift

@@ -10,7 +10,7 @@
 
 extension CS {
 
-  /// An arbitary precision signed integer type, also known as a "big integer".
+  /// An arbitrary precision signed integer type, also known as a "big integer".
   ///
   /// Operations on big integers never overflow, but they might take a long time to execute.
   /// The amount of memory (and address space) available is the only constraint to the magnitude of these numbers.

+ 1 - 1
Sources/CryptoSwift/CS_BigInt/BigUInt.swift

@@ -8,7 +8,7 @@
 
 extension CS {
 
-  /// An arbitary precision unsigned integer type, also known as a "big integer".
+  /// An arbitrary precision unsigned integer type, also known as a "big integer".
   ///
   /// Operations on big integers never overflow, but they may take a long time to execute.
   /// The amount of memory (and address space) available is the only constraint to the magnitude of these numbers.

+ 1 - 1
Sources/CryptoSwift/CS_BigInt/CS.swift

@@ -1,6 +1,6 @@
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/ChaCha20.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/Checksum.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/Cipher.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/Collection+Extension.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/CompactMap.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/Cryptor.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 3 - 1
Sources/CryptoSwift/Cryptors.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.
@@ -15,6 +15,8 @@
 
 #if canImport(Darwin)
 import Darwin
+#elseif canImport(Android)
+import Android
 #elseif canImport(Glibc)
 import Glibc
 #elseif canImport(Musl)

+ 1 - 1
Sources/CryptoSwift/Digest.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/DigestType.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/Foundation/AES+Foundation.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/Foundation/Array+Foundation.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/Foundation/Blowfish+Foundation.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/Foundation/ChaCha20+Foundation.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/Foundation/Data+Extension.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/Foundation/HMAC+Foundation.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/Foundation/Rabbit+Foundation.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/Foundation/String+FoundationExtension.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/Foundation/Utils+Foundation.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/Generics.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 3 - 1
Sources/CryptoSwift/HKDF.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.
@@ -18,6 +18,8 @@
 
 #if canImport(Darwin)
 import Darwin
+#elseif canImport(Android)
+import Android
 #elseif canImport(Glibc)
 import Glibc
 #elseif canImport(Musl)

+ 1 - 1
Sources/CryptoSwift/HMAC.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 3 - 1
Sources/CryptoSwift/Int+Extension.swift

@@ -2,7 +2,7 @@
 //  CryptoSwift
 //
 //  Created by Marcin Krzyzanowski on 12/08/14.
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.
@@ -16,6 +16,8 @@
 
 #if canImport(Darwin)
 import Darwin
+#elseif canImport(Android)
+import Android
 #elseif canImport(Glibc)
 import Glibc
 #elseif canImport(Musl)

+ 1 - 1
Sources/CryptoSwift/MD5.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/NoPadding.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/Operators.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/PKCS/PBKDF1.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 3 - 1
Sources/CryptoSwift/PKCS/PBKDF2.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.
@@ -18,6 +18,8 @@
 
 #if canImport(Darwin)
 import Darwin
+#elseif canImport(Android)
+import Android
 #elseif canImport(Glibc)
 import Glibc
 #elseif canImport(Musl)

+ 1 - 1
Sources/CryptoSwift/PKCS/PKCS1v15.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/PKCS/PKCS5.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/PKCS/PKCS7.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/PKCS/PKCS7Padding.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/Padding.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/Poly1305.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/RSA/RSA+Cipher.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/RSA/RSA+Signature.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/RSA/RSA.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/Rabbit.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/SHA1.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/SHA2.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 3 - 1
Sources/CryptoSwift/SHA3.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.
@@ -19,6 +19,8 @@
 
 #if canImport(Darwin)
 import Darwin
+#elseif canImport(Android)
+import Android
 #elseif canImport(Glibc)
 import Glibc
 #elseif canImport(Musl)

+ 1 - 1
Sources/CryptoSwift/Scrypt.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 7 - 1
Sources/CryptoSwift/SecureBytes.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.
@@ -15,6 +15,8 @@
 
 #if canImport(Darwin)
 import Darwin
+#elseif canImport(Android)
+import Android
 #elseif canImport(Glibc)
 import Glibc
 #elseif canImport(Musl)
@@ -39,6 +41,8 @@ final class SecureBytes {
         VirtualLock(UnsafeMutableRawPointer(mutating: pointer.baseAddress), SIZE_T(pointer.count))
       #elseif os(WASI)
         // not supported on WASI
+      #elseif os(Android)
+        mlock(pointer.baseAddress!, pointer.count)
       #else
         mlock(pointer.baseAddress, pointer.count)
       #endif
@@ -51,6 +55,8 @@ final class SecureBytes {
         VirtualUnlock(UnsafeMutableRawPointer(mutating: pointer.baseAddress), SIZE_T(pointer.count))
       #elseif os(WASI)
         // not supported on WASI
+      #elseif os(Android)
+        munlock(pointer.baseAddress!, pointer.count)
       #else
         munlock(pointer.baseAddress, pointer.count)
       #endif

+ 1 - 1
Sources/CryptoSwift/Signature.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/StreamDecryptor.swift

@@ -1,6 +1,6 @@
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/StreamEncryptor.swift

@@ -1,6 +1,6 @@
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/String+Extension.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/UInt128.swift

@@ -1,7 +1,7 @@
 //
 //  UInt128.swift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/UInt16+Extension.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 3 - 1
Sources/CryptoSwift/UInt32+Extension.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.
@@ -15,6 +15,8 @@
 
 #if canImport(Darwin)
 import Darwin
+#elseif canImport(Android)
+import Android
 #elseif canImport(Glibc)
 import Glibc
 #elseif canImport(Musl)

+ 1 - 1
Sources/CryptoSwift/UInt64+Extension.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 3 - 1
Sources/CryptoSwift/UInt8+Extension.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.
@@ -15,6 +15,8 @@
 
 #if canImport(Darwin)
 import Darwin
+#elseif canImport(Android)
+import Android
 #elseif canImport(Glibc)
 import Glibc
 #elseif canImport(Musl)

+ 1 - 1
Sources/CryptoSwift/Updatable.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/Utils.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Sources/CryptoSwift/ZeroPadding.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Tests/CryptoSwiftTests/AESCCMTests.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Tests/CryptoSwiftTests/AESTests.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Tests/CryptoSwiftTests/AESTestsPerf.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Tests/CryptoSwiftTests/Access.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Tests/CryptoSwiftTests/BlowfishTests.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Tests/CryptoSwiftTests/Bridging.h

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Tests/CryptoSwiftTests/CMACTests.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Tests/CryptoSwiftTests/ChaCha20Poly1305Tests.swift

@@ -2,7 +2,7 @@
 //  ChaCha20Poly1305Tests.swift
 //  CryptoSwiftTests
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Tests/CryptoSwiftTests/ChaCha20Tests.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Tests/CryptoSwiftTests/ChaCha20TestsPerf.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

+ 1 - 1
Tests/CryptoSwiftTests/DigestTests.swift

@@ -1,7 +1,7 @@
 //
 //  CryptoSwift
 //
-//  Copyright (C) 2014-2022 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
+//  Copyright (C) 2014-2025 Marcin Krzyżanowski <marcin@krzyzanowskim.com>
 //  This software is provided 'as-is', without any express or implied warranty.
 //
 //  In no event will the authors be held liable for any damages arising from the use of this software.

Some files were not shown because too many files changed in this diff