Increment version

Merge pull request #1253 from Mbucari/master
Fix download error (#1252 ) I'm merging this one and releasing ASAP.
2026-01-03 03:18:27 -05:00 · 2025-05-09 21:10:38 -06:00 · 2025-05-09 21:07:59 -06:00 · 2025-05-09 21:07:01 -06:00
3 changed files with 5 additions and 5 deletions
--- a/Source/AaxDecrypter/IDownloadOptions.cs
+++ b/Source/AaxDecrypter/IDownloadOptions.cs
@@ -19,9 +19,9 @@ namespace AaxDecrypter
        public KeyData(string keyPart1, string? keyPart2 = null)
        {
            ArgumentNullException.ThrowIfNull(keyPart1, nameof(keyPart1));
-            KeyPart1 = Convert.FromBase64String(keyPart1);
+            KeyPart1 = Convert.FromHexString(keyPart1);
            if (keyPart2 != null)
-                KeyPart2 = Convert.FromBase64String(keyPart2);
+                KeyPart2 = Convert.FromHexString(keyPart2);
        }
 	}    

--- a/Source/AppScaffolding/AppScaffolding.csproj
+++ b/Source/AppScaffolding/AppScaffolding.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
    <TargetFramework>net9.0</TargetFramework>
-    <Version>12.4.2.1</Version>
+    <Version>12.4.2.2</Version>
  </PropertyGroup>
  <ItemGroup>
    <PackageReference Include="Octokit" Version="14.0.0" />
--- a/Source/FileLiberator/DownloadOptions.cs
+++ b/Source/FileLiberator/DownloadOptions.cs
@@ -108,8 +108,8 @@ namespace FileLiberator
 			ContentMetadata = licInfo.ContentMetadata;
 			InputType
 			= licInfo.DrmType is AudibleApi.Common.DrmType.Widevine ? AAXClean.FileType.Dash
-			: licInfo.DrmType is AudibleApi.Common.DrmType.Adrm && licInfo.DecryptionKeys?.Length == 1 && licInfo.DecryptionKeys[0].KeyPart1.Length == 8 && licInfo.DecryptionKeys[0].KeyPart2 is null ? AAXClean.FileType.Aax
-			: licInfo.DrmType is AudibleApi.Common.DrmType.Adrm && licInfo.DecryptionKeys?.Length == 1 && licInfo.DecryptionKeys[0].KeyPart1.Length == 32 && licInfo.DecryptionKeys[0].KeyPart2?.Length == 32 ? AAXClean.FileType.Aaxc
+			: licInfo.DrmType is AudibleApi.Common.DrmType.Adrm && licInfo.DecryptionKeys?.Length == 1 && licInfo.DecryptionKeys[0].KeyPart1.Length == 4 && licInfo.DecryptionKeys[0].KeyPart2 is null ? AAXClean.FileType.Aax
+			: licInfo.DrmType is AudibleApi.Common.DrmType.Adrm && licInfo.DecryptionKeys?.Length == 1 && licInfo.DecryptionKeys[0].KeyPart1.Length == 16 && licInfo.DecryptionKeys[0].KeyPart2?.Length == 16 ? AAXClean.FileType.Aaxc
 			: null;

 			//If DrmType is not Adrm or Widevine, the delivered file is an unencrypted mp3.
Author	SHA1	Message	Date
MBucari	35862d619a	Increment version	2025-05-09 21:10:38 -06:00
Mbucari	ac2c67985d	Merge pull request #1253 from Mbucari/master Fix download error (#1252 ) I'm merging this one and releasing ASAP.	2025-05-09 21:07:59 -06:00
MBucari	f8ae303417	Fix download error (#1252 )	2025-05-09 21:07:01 -06:00