diff --git a/src/en/OInt/coverage/Modules/Coverage_ОпределениеПокрытия.os b/src/en/OInt/coverage/Modules/Coverage_ОпределениеПокрытия.os index 89e3e3aa65..8ac6e2d8e5 100644 --- a/src/en/OInt/coverage/Modules/Coverage_ОпределениеПокрытия.os +++ b/src/en/OInt/coverage/Modules/Coverage_ОпределениеПокрытия.os @@ -1,27 +1,23 @@ #Use 1commands #Use coverage #Use fs -#Use oint -FS.EnsureEmptyDirectory("./OInt/coverage/data"); -PathToStat = FS.FullPath("./OInt/coverage/data/stat.json"); +FS.EnsureEmptyDirectory("coverage\data"); +PathToStat = "coverage\stat.json"; Command = New Command; Command.SetCommand("oscript"); Command.AddParameter(StrTemplate("-codestat=%1", PathToStat)); -Command.AddParameter(FS.FullPath("./OInt/tests/Modules/Coverage_RunAllTests.os")); // File start tests +Command.AddParameter("D:\REPOS\OpenIntegrations\src\ru\OInt\tests\Modules\Coverage_ЗапуwithtoInwithехTestоin.os"); // File start tests Command.ShowOutputImmediately(True); -ReturnCode = Command.Execute(); File_Stat = New File(PathToStat); -PackageName = "oint"; GenerationProcessor = New CoverageReportGenerator(); Message(File_Stat.FullName); -ProcessorObject = GenerationProcessor.StatisticsFile(File_Stat.FullName); -ProcessorObject = ProcessorObject.SourceDirectory(FS.FullPath("./OInt")); -ProcessorObject = ProcessorObject.WorkingDirectory(FS.FullPath("./OInt/coverage/data")); -ProcessorObject = ProcessorObject.GenericCoverage(); - -ProcessorObject.Formulate(); +GenerationProcessor.ОтноwithительныеPaths() + .StatisticsFile(File_Stat.FullName) + .SourceDirectory("D:\REPOS\OpenIntegrations\src\ru\OInt\core") + .GenericCoverage() + .Formulate(); diff --git a/src/en/OInt/tools/Modules/internal/Modules/OPI_Cryptography.os b/src/en/OInt/tools/Modules/internal/Modules/OPI_Cryptography.os index 27e9946f98..1ff4e36c60 100644 --- a/src/en/OInt/tools/Modules/internal/Modules/OPI_Cryptography.os +++ b/src/en/OInt/tools/Modules/internal/Modules/OPI_Cryptography.os @@ -77,10 +77,10 @@ Function HMAC(Val Key, Val Data, Type, BlockSize) Export Ipad = GetBinaryDataBufferFromHexString(RepeatString("36", BlockSize)); Opad = GetBinaryDataBufferFromHexString(RepeatString("5c", BlockSize)); - Ipad.WriteBitwiseExclusiveOr(0, Key); + Ipad.WriteBitwiseXor(0, Key); Ikeypad = GetBinaryDataFromBinaryDataBuffer(ipad); - Opad.WriteBitwiseExclusiveOr(0, Key); + Opad.WriteBitwiseXor(0, Key); Okeypad = GetBinaryDataFromBinaryDataBuffer(opad); Return Hash(UniteBinaryData(okeypad, Hash(UniteBinaryData(ikeypad, Data), Type)), Type); diff --git a/src/en/OPI/src/CommonModules/OPI_Cryptography/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Cryptography/Module.bsl index d25802708c..43a399fb1f 100644 --- a/src/en/OPI/src/CommonModules/OPI_Cryptography/Module.bsl +++ b/src/en/OPI/src/CommonModules/OPI_Cryptography/Module.bsl @@ -77,10 +77,10 @@ Function HMAC(Val Key, Val Data, Type, BlockSize) Export Ipad = GetBinaryDataBufferFromHexString(RepeatString("36", BlockSize)); Opad = GetBinaryDataBufferFromHexString(RepeatString("5c", BlockSize)); - Ipad.WriteBitwiseExclusiveOr(0, Key); + Ipad.WriteBitwiseXor(0, Key); Ikeypad = GetBinaryDataFromBinaryDataBuffer(ipad); - Opad.WriteBitwiseExclusiveOr(0, Key); + Opad.WriteBitwiseXor(0, Key); Okeypad = GetBinaryDataFromBinaryDataBuffer(opad); Return Hash(UniteBinaryData(okeypad, Hash(UniteBinaryData(ikeypad, Data), Type)), Type);