Merge branch 'develop' into feature/scp11

Yubico · Nov 28, 2024 · 224b1e9 · 224b1e9
2 parents 11b87d9 + 1b5578a
commit 224b1e9
Show file tree

Hide file tree

Showing 11 changed files with 381 additions and 123 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -0,0 +1,16 @@
+{
+  "image": "mcr.microsoft.com/devcontainers/universal:2",
+  "features": {
+    "ghcr.io/devcontainers/features/dotnet:2": {
+      "version":"6.0"
+    }
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-dotnettools.vscode-dotnet-runtime",
+        "ms-dotnettools.csharp"
+      ]
+    }
+  }
+}
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -22,7 +22,7 @@ Please describe the tests that you ran to verify your changes. Provide instructi
 
 ## Checklist:
 
-- [ ] My code follows the [style guidelines](https://raw.githubusercontent.com/Yubico/Yubico.NET.SDK/043119ad1d19e0e6e66556c970a81d0c1aba36c8/CONTRIBUTING.md) of this project 
+- [ ] My code follows the [style guidelines](https://raw.githubusercontent.com/Yubico/Yubico.NET.SDK/CONTRIBUTING.md) of this project 
 - [ ] I have performed a self-review of my own code
 - [ ] I have run `dotnet format` to format my code
 - [ ] I have commented my code, particularly in hard-to-understand areas

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,145 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "build project: Yubico.Yubikey",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "build",
+        "${workspaceFolder}/Yubico.YubiKey/src/Yubico.YubiKey.csproj",
+        "/property:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile"
+    },
+    {
+      "label": "run tests: unit",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "test",
+        "${workspaceFolder}/Yubico.YubiKey/tests/unit/Yubico.YubiKey.UnitTests.csproj",
+        "/property:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile",
+      "group": {
+        "kind": "test",
+        "isDefault": true
+      }
+    },
+    {
+      "type": "dotnet",
+      "task": "build",
+      "group": "build",
+      "problemMatcher": [],
+      "label": "dotnet: build"
+    },
+    {
+      "label": "run tests: integration (RequiresTouch)",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "test",
+        "${workspaceFolder}/Yubico.YubiKey/tests/integration/Yubico.YubiKey.IntegrationTests.csproj",
+        "--filter",
+        "Category=RequiresTouch",
+        "/property:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile",
+      "group": "test"
+    },
+    {
+      "label": "run tests: integration (Simple)",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "test",
+        "${workspaceFolder}/Yubico.YubiKey/tests/integration/Yubico.YubiKey.IntegrationTests.csproj",
+        "--filter",
+        "Category=Simple",
+        "/property:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile",
+      "group": "test"
+    },
+    {
+      "label": "run tests: integration (Elevated)",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "test",
+        "${workspaceFolder}/Yubico.YubiKey/tests/integration/Yubico.YubiKey.IntegrationTests.csproj",
+        "--filter",
+        "Category=Elevated",
+        "/property:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile",
+      "group": "test"
+    },
+    {
+      "label": "run tests: integration (RequiresBio)",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "test",
+        "${workspaceFolder}/Yubico.YubiKey/tests/integration/Yubico.YubiKey.IntegrationTests.csproj",
+        "--filter",
+        "Category=RequiresBio",
+        "/property:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile",
+      "group": "test"
+    },
+    {
+      "label": "run tests: integration (RequiresSetup)",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "test",
+        "${workspaceFolder}/Yubico.YubiKey/tests/integration/Yubico.YubiKey.IntegrationTests.csproj",
+        "--filter",
+        "Category=RequiresSetup",
+        "/property:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile",
+      "group": "test"
+    },
+    {
+      "label": "run tests: integration (RequiresStepDebug)",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "test",
+        "${workspaceFolder}/Yubico.YubiKey/tests/integration/Yubico.YubiKey.IntegrationTests.csproj",
+        "--filter",
+        "Category=RequiresStepDebug",
+        "/property:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile",
+      "group": "test"
+    },
+    {
+      "label": "run tests: integration (RequiresFips)",
+      "command": "dotnet",
+      "type": "process",
+      "args": [
+        "test",
+        "${workspaceFolder}/Yubico.YubiKey/tests/integration/Yubico.YubiKey.IntegrationTests.csproj",
+        "--filter",
+        "Category=RequiresFips",
+        "/property:GenerateFullPaths=true",
+        "/consoleloggerparameters:NoSummary"
+      ],
+      "problemMatcher": "$msCompile",
+      "group": "test"
+    }
+  ]
+}
diff --git a/README.md b/README.md
@@ -25,6 +25,9 @@ This is a cross-platform, all encompassing SDK for the YubiKey aimed at large to
 customers. This version is written against .NET Core, and will eventually include bindings to languages
 outside the direct .NET ecosystem.
 
+## SDK Support
+The SDK is targetting net47, netstandard2.0 and netstandard2.1. This means the SDK can be loaded in NET Framework, NET6 and upwards.
+
 ## Documentation
 
 The public documentation for this project is located

diff --git a/Yubico.YubiKey/docs/users-manual/application-piv/apdu/auth-sign.md b/Yubico.YubiKey/docs/users-manual/application-piv/apdu/auth-sign.md
@@ -20,7 +20,7 @@ limitations under the License. -->
 | :-: | :-: | :---------: | :-----------: | :--------: | :------------------------------: | :------: |
 | 00  | 87  | _algorithm_ | _slot number_ | _data len_ | _encoded digest of data to sign_ | (absent) |
 
-The _algorithm_ is either `06` (RSA-1024), `07` (RSA-2048), `05` (RSA 3072), `16` (RSA 4096), `11` (ECC-P256), or `14`
+The *algorithm* is either `06` (RSA-1024), `07` (RSA-2048), `05` (RSA 3072), `16` (RSA 4096), `11` (ECC-P256), or `14`
 (ECC-P384).
 
 The _slot number_ can be the number of any slot that holds a private key, other than `F9`.