diff --git a/.gitignore b/.gitignore index 4c358ad..46db126 100644 --- a/.gitignore +++ b/.gitignore @@ -41,4 +41,5 @@ Back/skydiveLogs-api/Data/JumpsDb.db Back/skydiveLogs-api/Data/JumpsDb-log.db /Back/skydiveLogs-api.Domain/bin/Release/net5.0/skydiveLogs-api.Domain.deps.json /Back/skydiveLogs-api.Domain/bin/Debug/net6.0 +/Back/skydiveLogs-api.Domain/bin/Debug/net7.0 Back/skydiveLogs-api/Data/JumpsDb.db diff --git a/Back/skydiveLogs-api.Domain/skydiveLogs-api.Domain.csproj b/Back/skydiveLogs-api.Domain/skydiveLogs-api.Domain.csproj index db21197..5874690 100644 --- a/Back/skydiveLogs-api.Domain/skydiveLogs-api.Domain.csproj +++ b/Back/skydiveLogs-api.Domain/skydiveLogs-api.Domain.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 skydiveLogs_api.Domain diff --git a/Back/skydiveLogs-api.DomainBusiness/UserService.cs b/Back/skydiveLogs-api.DomainBusiness/UserService.cs index 9dd0bdb..d5c5272 100644 --- a/Back/skydiveLogs-api.DomainBusiness/UserService.cs +++ b/Back/skydiveLogs-api.DomainBusiness/UserService.cs @@ -68,7 +68,9 @@ namespace skydiveLogs_api.DomainBusiness using (Aes encryptor = Aes.Create()) { Rfc2898DeriveBytes pdb = new Rfc2898DeriveBytes(encryptionKey, - new byte[] { 0x49, 0x76, 0x61, 0x6e, 0x20, 0x4d, 0x65, 0x64, 0x76, 0x65, 0x64, 0x65, 0x76 }); + new byte[] { 0x49, 0x76, 0x61, 0x6e, 0x20, 0x4d, 0x65, 0x64, 0x76, 0x65, 0x64, 0x65, 0x76 }, + 3, + HashAlgorithmName.SHA256); encryptor.Key = pdb.GetBytes(32); encryptor.IV = pdb.GetBytes(16); using (MemoryStream ms = new MemoryStream()) diff --git a/Back/skydiveLogs-api.DomainBusiness/skydiveLogs-api.DomainBusiness.csproj b/Back/skydiveLogs-api.DomainBusiness/skydiveLogs-api.DomainBusiness.csproj index e389a13..99d785a 100644 --- a/Back/skydiveLogs-api.DomainBusiness/skydiveLogs-api.DomainBusiness.csproj +++ b/Back/skydiveLogs-api.DomainBusiness/skydiveLogs-api.DomainBusiness.csproj @@ -1,12 +1,12 @@  - net6.0 + net7.0 skydiveLogs_api.DomainBusiness - + diff --git a/Back/skydiveLogs-api.DomainService/skydiveLogs-api.DomainService.csproj b/Back/skydiveLogs-api.DomainService/skydiveLogs-api.DomainService.csproj index c28dbac..589ddb3 100644 --- a/Back/skydiveLogs-api.DomainService/skydiveLogs-api.DomainService.csproj +++ b/Back/skydiveLogs-api.DomainService/skydiveLogs-api.DomainService.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 skydiveLogs_api.DomainService diff --git a/Back/skydiveLogs-api.Infrastructure/skydiveLogs-api.Infrastructure.csproj b/Back/skydiveLogs-api.Infrastructure/skydiveLogs-api.Infrastructure.csproj index 391b48d..2277d48 100644 --- a/Back/skydiveLogs-api.Infrastructure/skydiveLogs-api.Infrastructure.csproj +++ b/Back/skydiveLogs-api.Infrastructure/skydiveLogs-api.Infrastructure.csproj @@ -1,12 +1,12 @@  - net6.0 + net7.0 skydiveLogs_api.Infrastructure - + diff --git a/Back/skydiveLogs-api.Ioc/skydiveLogs-api.Ioc.csproj b/Back/skydiveLogs-api.Ioc/skydiveLogs-api.Ioc.csproj index 46b3090..98cde9b 100644 --- a/Back/skydiveLogs-api.Ioc/skydiveLogs-api.Ioc.csproj +++ b/Back/skydiveLogs-api.Ioc/skydiveLogs-api.Ioc.csproj @@ -1,14 +1,14 @@  - net6.0 + net7.0 skydiveLogs_api.Ioc - - + + diff --git a/Back/skydiveLogs-api/skydiveLogs-api.csproj b/Back/skydiveLogs-api/skydiveLogs-api.csproj index 37e990b..ae4c71b 100644 --- a/Back/skydiveLogs-api/skydiveLogs-api.csproj +++ b/Back/skydiveLogs-api/skydiveLogs-api.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 InProcess skydiveLogs_api 9d7d268e-ee4d-43a2-a9b7-5b00b516f6f8 @@ -18,11 +18,11 @@ - - - - - + + + + +