Skip to content

Commit f17be10

Browse files
committed
Fix onedrive upload issue
add open browser scripts for all platforms updates for launcher apps update libraries
1 parent 2fe3967 commit f17be10

6 files changed

Lines changed: 27 additions & 17 deletions

File tree

src/SIPSorcery.csproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<ItemGroup>
43
<Compile Remove="net\RTSP\RTSPClient.cs" />
54
<Compile Remove="net\RTSP\RTSPConnection.cs" />
@@ -36,12 +35,12 @@
3635
</ItemGroup>
3736

3837
<PropertyGroup>
39-
<TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net462;net5.0;net6.0;net8.0</TargetFrameworks>
38+
<TargetFrameworks>net9.0</TargetFrameworks>
4039
<LangVersion>12.0</LangVersion>
4140
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
4241
<NoWarn>$(NoWarn);SYSLIB0050</NoWarn>
43-
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
44-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
42+
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
43+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
4544
<!-- Disable warning for missing XML doc comments. -->
4645
<NoWarn>$(NoWarn);CS1591;CS1573;CS1587</NoWarn>
4746
<Authors>Aaron Clauson, Christophe Irles, Rafael Soares &amp; Contributors</Authors>

src/app/Media/Sources/VideoTestPatternSource.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public VideoTestPatternSource(IVideoEncoder encoder = null)
9595
else
9696
{
9797
_testI420Buffer = new byte[TEST_PATTERN_WIDTH * TEST_PATTERN_HEIGHT * 3 / 2];
98-
testPatternStm.Read(_testI420Buffer, 0, _testI420Buffer.Length);
98+
testPatternStm.ReadExactly(_testI420Buffer, 0, _testI420Buffer.Length);
9999
testPatternStm.Close();
100100
_sendTestPatternTimer = new Timer(GenerateTestPattern, null, Timeout.Infinite, Timeout.Infinite);
101101
_frameSpacing = 1000 / DEFAULT_FRAMES_PER_SECOND;

src/core/SIPTransportConfig.cs

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,22 +119,31 @@ public static List<SIPChannel> ParseSIPChannelsNode(XmlNode sipChannelsNode, int
119119
return sipChannels;
120120
}
121121

122-
private static X509Certificate2 LoadCertificate(string certificateType, string certifcateLocation, string certKeyPassword)
122+
private static X509Certificate2 LoadCertificate(string certificateType, string certificateLocation, string certKeyPassword)
123123
{
124124
try
125125
{
126-
127126
if (certificateType == "file")
128127
{
129-
var serverCertificate = new X509Certificate2(certifcateLocation, certKeyPassword);
130-
//DisplayCertificateChain(m_serverCertificate);
128+
X509Certificate2 serverCertificate;
129+
130+
if (!string.IsNullOrEmpty(certKeyPassword))
131+
{
132+
serverCertificate = X509CertificateLoader.LoadPkcs12FromFile(certificateLocation, certKeyPassword);
133+
}
134+
else
135+
{
136+
serverCertificate = X509CertificateLoader.LoadCertificateFromFile(certificateLocation);
137+
}
138+
139+
//DisplayCertificateChain(serverCertificate);
131140
var verifyCert = serverCertificate.Verify();
132141
logger.LogDebug("Server Certificate loaded from file, Subject={Subject}, valid={Valid}.", serverCertificate.Subject, verifyCert);
133142
return serverCertificate;
134143
}
135144

136145
var store = (certificateType == "machinestore") ? StoreLocation.LocalMachine : StoreLocation.CurrentUser;
137-
return Crypto.LoadCertificate(store, certifcateLocation, true);
146+
return Crypto.LoadCertificate(store, certificateLocation, true);
138147
}
139148
catch (Exception excp)
140149
{

src/net/DtlsSrtp/DtlsUtils.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -424,20 +424,21 @@ public static X509Certificate2 ConvertBouncyCert(Org.BouncyCastle.X509.X509Certi
424424
{
425425
Pkcs12Store pkcs12Store = new Pkcs12StoreBuilder().Build();
426426
var certEntry = new X509CertificateEntry(bouncyCert);
427-
428427
pkcs12Store.SetCertificateEntry(bouncyCert.SerialNumber.ToString(), certEntry);
429428
pkcs12Store.SetKeyEntry(bouncyCert.SerialNumber.ToString(),
430429
new AsymmetricKeyEntry(keyPair.Private), new[] { certEntry });
431430

432431
X509Certificate2 keyedCert;
433-
434432
using (MemoryStream pfxStream = new MemoryStream())
435433
{
436434
pkcs12Store.Save(pfxStream, new char[] { }, new SecureRandom());
437435
pfxStream.Seek(0, SeekOrigin.Begin);
438-
keyedCert = new X509Certificate2(pfxStream.ToArray(), string.Empty, X509KeyStorageFlags.Exportable);
439-
}
440436

437+
keyedCert = X509CertificateLoader.LoadPkcs12(
438+
pfxStream.ToArray(),
439+
string.Empty,
440+
X509KeyStorageFlags.Exportable);
441+
}
441442
return keyedCert;
442443
}
443444

src/sys/Crypto/Crypto.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ public static string GetHash(string filepath)
269269

270270
// Buffer to read in plain text blocks.
271271
byte[] fileBuffer = new byte[fileStream.Length];
272-
fileStream.Read(fileBuffer, 0, (int)fileStream.Length);
272+
fileStream.ReadExactly(fileBuffer, 0, (int)fileStream.Length);
273273
fileStream.Close();
274274

275275
byte[] overallHash = shaM.ComputeHash(fileBuffer);

src/sys/JsonParser.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
using System.Collections;
1919
using System.Collections.Generic;
2020
using System.Reflection;
21+
using System.Runtime.CompilerServices;
2122
using System.Runtime.Serialization;
2223
using System.Text;
2324

@@ -348,7 +349,7 @@ static object ParseObject(Type type, string json)
348349
{
349350
// For .net8 this call needs to change to: RuntimeHelpers.GetUninitializedObject(type);
350351

351-
object instance = FormatterServices.GetUninitializedObject(type);
352+
object instance = RuntimeHelpers.GetUninitializedObject(type);
352353

353354
//The list is split into key/value pairs only, this means the split must be divisible by 2 to be valid JSON
354355
List<string> elems = Split(json);
@@ -386,4 +387,4 @@ static object ParseObject(Type type, string json)
386387
return instance;
387388
}
388389
}
389-
}
390+
}

0 commit comments

Comments
 (0)