Drop1 2 (#56)

* Modify set of things changed * Fix the version number and copyright notice * Update to -13 of OSCORE Try and get all of the -13 changes in the code. * Bugs found during client testing * Allow CoapClient to be passed a NULL URL on construction * Get the callbacks to work better for DTLS interfacing. * Change OSCORE option from 21 to 9 - Still not final value. * We need to be able to change the code on a message - set things up to allow this. * Fix problems with observe processing in OSCORE * Get netstardard 1.3 work Get the multiple frame work build running correct. Still need to figure out a story for testing. * Fix to use new build file * New version of nuget * Change version of nunit runners again * Package needs nunit installed * try again * restore on appveyor * Get newer nuget * correct section * copy it in by hand. * add package name * Try this way to get the package installed * Add more packages. * typo * Add more references * Add dependencies to client code * Kill unused file * Update the packages we need. * Find out wihch is failing Remove 2.0 The 2.0 build does not work correctly on Linux but is fine on iOS. It appears to be an issue with nuget not restoring things correctly as I have the same issue on both platforms for COSE.
Com-AugustCellars · Sep 17, 2018 · e25bc63 · e25bc63
1 parent d4de9ce
commit e25bc63
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 30 deletions.
diff --git a/CoAP.Example/CoAP.Client/CoAP.Client.Std10.csproj b/CoAP.Example/CoAP.Client/CoAP.Client.Std10.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -64,17 +64,14 @@
     <Reference Include="System.Numerics" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="BouncyCastle.Crypto, Version=1.8.2.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
-      <HintPath>..\packages\Portable.BouncyCastle.1.8.2\lib\net40\BouncyCastle.Crypto.dll</HintPath>
-    </Reference>
     <Reference Include="CBOR, Version=3.0.3.0, Culture=neutral, PublicKeyToken=9cd62db60ea5554c, processorArchitecture=MSIL">
-      <HintPath>..\packages\PeterO.Cbor.3.0.3\lib\netstandard1.0\CBOR.dll</HintPath>
-    </Reference>
-    <Reference Include="COSE, Version=1.2.0.0, Culture=neutral, PublicKeyToken=feba232d7e8953ed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Com.AugustCellars.COSE.1.2.0\lib\netstandard1.0\COSE.dll</HintPath>
+      <HintPath>..\..\packages\PeterO.Cbor.3.0.3\lib\netstandard1.0\CBOR.dll</HintPath>
     </Reference>
     <Reference Include="Numbers, Version=1.0.2.0, Culture=neutral, PublicKeyToken=9cd62db60ea5554c, processorArchitecture=MSIL">
-      <HintPath>..\packages\PeterO.Numbers.1.0.2\lib\netstandard1.0\Numbers.dll</HintPath>
+      <HintPath>..\..\packages\PeterO.Numbers.1.0.2\lib\netstandard1.0\Numbers.dll</HintPath>
+    </Reference>
+    <Reference Include="COSE, Version=1.3.0.0, Culture=neutral, PublicKeyToken=feba232d7e8953ed">
+      <HintPath>..\..\packages\Com.AugustCellars.COSE.1.3.0\lib\netstandard1.0\COSE.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@@ -85,4 +82,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/CoAP.Example/CoAP.Client/packages.config b/CoAP.Example/CoAP.Client/packages.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Com.AugustCellars.COSE" version="1.2.0" targetFramework="net45" />
+  <package id="Com.AugustCellars.COSE" version="1.3.0" targetFramework="net462" />
   <package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net45" />
   <package id="NETStandard.Library" version="1.6.1" targetFramework="net45" />
   <package id="PeterO.Cbor" version="3.0.3" targetFramework="net45" />
   <package id="PeterO.Numbers" version="1.0.2" targetFramework="net45" />
-  <package id="Portable.BouncyCastle" version="1.8.2" targetFramework="net45" />
+  <package id="Portable.BouncyCastle" version="1.8.3" targetFramework="net462" />
   <package id="System.Collections" version="4.3.0" targetFramework="net45" />
   <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net45" />
   <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net45" />
@@ -35,4 +35,4 @@
   <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net45" />
   <package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net45" requireReinstallation="true" />
   <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net45" />
-</packages>
+</packages>
diff --git a/CoAP.NET/CoAP.Std10.csproj b/CoAP.NET/CoAP.Std10.csproj
@@ -214,7 +214,7 @@ This project is NOT intended to be used for commercial purposes.  It is intented
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Com.AugustCellars.COSE" Version="1.2.0" />
+    <PackageReference Include="Com.AugustCellars.COSE" Version="1.3.0" />
     <PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
     <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
     <PackageReference Include="System.Net.Primitives" Version="4.3.0" />

diff --git a/CoAP.NET/DTLS/DTLSClient.cs b/CoAP.NET/DTLS/DTLSClient.cs
@@ -401,7 +401,7 @@ public virtual TlsCredentials GetClientCredentials(CertificateRequest certificat
         };
         protected virtual TlsKeyExchange CreatePskKeyExchange(int keyExchange)
         {
-            return new TlsPskKeyExchange(keyExchange, mSupportedSignatureAlgorithms, _mPskIdentity, null, null, mNamedCurves,
+            return new TlsPskKeyExchange(keyExchange, mSupportedSignatureAlgorithms, _mPskIdentity, null, null, null, mNamedCurves,
                 mClientECPointFormats, mServerECPointFormats);
         }
 

diff --git a/CoAP.NET/DTLS/DtlsServer.cs b/CoAP.NET/DTLS/DtlsServer.cs
@@ -186,7 +186,7 @@ public override TlsKeyExchange GetKeyExchange()
 
         protected virtual TlsKeyExchange CreatePskKeyExchange(int keyExchange)
         {
-            return new TlsPskKeyExchange(keyExchange, mSupportedSignatureAlgorithms, null, mPskIdentityManager,
+            return new TlsPskKeyExchange(keyExchange, mSupportedSignatureAlgorithms, null, mPskIdentityManager, null,
                 GetDHParameters(), mNamedCurves, mClientECPointFormats, mServerECPointFormats);
         }
 

diff --git a/CoAP.Test/CoAP.Test.Std10.csproj b/CoAP.Test/CoAP.Test.Std10.csproj
@@ -96,18 +96,16 @@
       <HintPath>..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="BouncyCastle.Crypto, Version=1.8.2.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
-      <HintPath>..\packages\Portable.BouncyCastle.1.8.2\lib\net40\BouncyCastle.Crypto.dll</HintPath>
-    </Reference>
     <Reference Include="CBOR, Version=3.0.3.0, Culture=neutral, PublicKeyToken=9cd62db60ea5554c, processorArchitecture=MSIL">
       <HintPath>..\packages\PeterO.Cbor.3.0.3\lib\netstandard1.0\CBOR.dll</HintPath>
     </Reference>
-    <Reference Include="COSE, Version=1.2.0.0, Culture=neutral, PublicKeyToken=feba232d7e8953ed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Com.AugustCellars.COSE.1.2.0\lib\netstandard1.0\COSE.dll</HintPath>
-    </Reference>
     <Reference Include="Numbers, Version=1.0.2.0, Culture=neutral, PublicKeyToken=9cd62db60ea5554c, processorArchitecture=MSIL">
       <HintPath>..\packages\PeterO.Numbers.1.0.2\lib\netstandard1.0\Numbers.dll</HintPath>
     </Reference>
+    <Reference Include="COSE, Version=1.3.0.0, Culture=neutral, PublicKeyToken=feba232d7e8953ed">
+      <HintPath>..\packages\Com.AugustCellars.COSE.1.3.0\lib\netstandard1.0\COSE.dll
+      </HintPath>
+    </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/CoAP.Test/packages.config b/CoAP.Test/packages.config
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Com.AugustCellars.COSE" version="1.3.0" targetFramework="net462" />
   <package id="NUnit" version="3.5.0" targetFramework="net40" requireReinstallation="true" />
   <package id="PeterO.Cbor" version="3.0.3" targetFramework="net45" />
   <package id="PeterO.Numbers" version="1.0.2" targetFramework="net45" />
-  <package id="Com.AugustCellars.COSE" version="1.2.0"/>
-</packages>
+  <package id="Portable.BouncyCastle" version="1.8.3" targetFramework="net462" />
+</packages>
diff --git a/MigrationBackup/daa814bd/CoAP.Test.Std10/packages.config b/MigrationBackup/daa814bd/CoAP.Test.Std10/packages.config