Fix download error (#1252 )
This commit is contained in:
parent
0d24caeac2
commit
f8ae303417
@ -19,9 +19,9 @@ namespace AaxDecrypter
|
|||||||
public KeyData(string keyPart1, string? keyPart2 = null)
|
public KeyData(string keyPart1, string? keyPart2 = null)
|
||||||
{
|
{
|
||||||
ArgumentNullException.ThrowIfNull(keyPart1, nameof(keyPart1));
|
ArgumentNullException.ThrowIfNull(keyPart1, nameof(keyPart1));
|
||||||
KeyPart1 = Convert.FromBase64String(keyPart1);
|
KeyPart1 = Convert.FromHexString(keyPart1);
|
||||||
if (keyPart2 != null)
|
if (keyPart2 != null)
|
||||||
KeyPart2 = Convert.FromBase64String(keyPart2);
|
KeyPart2 = Convert.FromHexString(keyPart2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -108,8 +108,8 @@ namespace FileLiberator
|
|||||||
ContentMetadata = licInfo.ContentMetadata;
|
ContentMetadata = licInfo.ContentMetadata;
|
||||||
InputType
|
InputType
|
||||||
= licInfo.DrmType is AudibleApi.Common.DrmType.Widevine ? AAXClean.FileType.Dash
|
= 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 == 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 == 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 == 16 && licInfo.DecryptionKeys[0].KeyPart2?.Length == 16 ? AAXClean.FileType.Aaxc
|
||||||
: null;
|
: null;
|
||||||
|
|
||||||
//If DrmType is not Adrm or Widevine, the delivered file is an unencrypted mp3.
|
//If DrmType is not Adrm or Widevine, the delivered file is an unencrypted mp3.
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user