Skip to content

Commit b2050d7

Browse files
joevanwanzeeleKFjoevanwanzeeleKF
authored
Merge pull request #10 from Keyfactor/release-1.0.0-pre
Release 1.0.0 pre
2 parents 850a330 + 1f3accc commit b2050d7

File tree

10 files changed

+55
-18
lines changed

10 files changed

+55
-18
lines changed

‎AzureKeyVault.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1414
integration-manifest.json = integration-manifest.json
1515
LICENSE = LICENSE
1616
README.md.tpl = README.md.tpl
17+
rm.md = rm.md
1718
EndProjectSection
1819
EndProject
1920
Global

‎AzureKeyVault/AzureKeyVault.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
<Reference Include="Common.Logging.Core, Version=3.4.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
4545
<HintPath>..\packages\Common.Logging.Core.3.4.1\lib\net40\Common.Logging.Core.dll</HintPath>
4646
</Reference>
47-
<Reference Include="CSS.Common, Version=1.2.0.0, Culture=neutral, PublicKeyToken=0ed89d330114ab09, processorArchitecture=MSIL">
48-
<HintPath>..\packages\CSS.Common.1.2.0\lib\net462\CSS.Common.dll</HintPath>
47+
<Reference Include="CSS.Common, Version=1.6.0.0, Culture=neutral, PublicKeyToken=0ed89d330114ab09, processorArchitecture=MSIL">
48+
<HintPath>..\packages\CSS.Common.1.6.0\lib\net462\CSS.Common.dll</HintPath>
4949
</Reference>
5050
<Reference Include="CSS.PKI, Version=2.11.0.0, Culture=neutral, PublicKeyToken=0ed89d330114ab09, processorArchitecture=MSIL">
5151
<HintPath>..\packages\CSS.PKI.2.11.0\lib\net462\CSS.PKI.dll</HintPath>
@@ -54,8 +54,8 @@
5454
<HintPath>..\packages\CERTENROLLLibx64.1.0.0.1\lib\net35\Interop.CERTENROLLLib.dll</HintPath>
5555
<EmbedInteropTypes>True</EmbedInteropTypes>
5656
</Reference>
57-
<Reference Include="Keyfactor.Platform.Extensions.Agents, Version=1.0.1.0, Culture=neutral, PublicKeyToken=0ed89d330114ab09, processorArchitecture=MSIL">
58-
<HintPath>..\packages\Keyfactor.Platform.Extensions.Agents.1.0.1\lib\net462\Keyfactor.Platform.Extensions.Agents.dll</HintPath>
57+
<Reference Include="Keyfactor.Platform.Extensions.Agents, Version=1.3.1.0, Culture=neutral, PublicKeyToken=0ed89d330114ab09, processorArchitecture=MSIL">
58+
<HintPath>..\packages\Keyfactor.Platform.Extensions.Agents.1.3.1\lib\net462\Keyfactor.Platform.Extensions.Agents.dll</HintPath>
5959
</Reference>
6060
<Reference Include="Microsoft.Azure.KeyVault, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6161
<HintPath>..\packages\Microsoft.Azure.KeyVault.3.0.3\lib\net452\Microsoft.Azure.KeyVault.dll</HintPath>
@@ -90,8 +90,8 @@
9090
<Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9191
<HintPath>..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.4.1\lib\net461\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
9292
</Reference>
93-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
94-
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
93+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
94+
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
9595
</Reference>
9696
<Reference Include="System" />
9797
<Reference Include="System.Core" />

‎AzureKeyVault/Properties/AssemblyInfo.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
[assembly: AssemblyDescription("")]
2323
[assembly: AssemblyConfiguration("")]
2424
[assembly: AssemblyCompany("Keyfactor")]
25-
[assembly: AssemblyProduct("Keyfactor.AnyAgent.AzureKeyVault")]
26-
[assembly: AssemblyCopyright("Copyright © 2020")]
25+
[assembly: AssemblyProduct("Keyfactor.Integrations.Orchestrator.AzureKeyVault")]
26+
[assembly: AssemblyCopyright("Copyright © 2021")]
2727
[assembly: AssemblyTrademark("")]
2828
[assembly: AssemblyCulture("")]
2929

@@ -45,5 +45,5 @@
4545
// You can specify all the values or you can default the Build and Revision Numbers
4646
// by using the '*' as shown below:
4747
// [assembly: AssemblyVersion("1.0.*")]
48-
[assembly: AssemblyVersion("1.0.0.7")]
49-
[assembly: AssemblyFileVersion("1.0.0.7")]
48+
[assembly: AssemblyVersion("1.0.0.0")]
49+
[assembly: AssemblyFileVersion("1.0.0.0")]

‎AzureKeyVault/app.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ and limitations under the License.
1616
</dependentAssembly>
1717
<dependentAssembly>
1818
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
19-
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
19+
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
2020
</dependentAssembly>
2121
<dependentAssembly>
2222
<assemblyIdentity name="CSS.Common" publicKeyToken="0ed89d330114ab09" culture="neutral" />
23-
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
23+
<bindingRedirect oldVersion="0.0.0.0-1.6.0.0" newVersion="1.6.0.0" />
2424
</dependentAssembly>
2525
<dependentAssembly>
2626
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />

‎AzureKeyVault/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ and limitations under the License.
1212
<package id="CERTENROLLLibx64" version="1.0.0.1" targetFramework="net462" />
1313
<package id="Common.Logging" version="3.4.1" targetFramework="net462" />
1414
<package id="Common.Logging.Core" version="3.4.1" targetFramework="net462" />
15-
<package id="CSS.Common" version="1.2.0" targetFramework="net462" />
15+
<package id="CSS.Common" version="1.6.0" targetFramework="net462" />
1616
<package id="CSS.PKI" version="2.11.0" targetFramework="net462" />
17-
<package id="Keyfactor.Platform.Extensions.Agents" version="1.0.1" targetFramework="net462" />
17+
<package id="Keyfactor.Platform.Extensions.Agents" version="1.3.1" targetFramework="net462" />
1818
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net462" />
1919
<package id="Microsoft.Azure.KeyVault" version="3.0.3" targetFramework="net462" />
2020
<package id="Microsoft.Azure.KeyVault.Core" version="3.0.3" targetFramework="net462" />
@@ -28,5 +28,5 @@ and limitations under the License.
2828
<package id="Microsoft.Rest.ClientRuntime" version="2.3.20" targetFramework="net462" />
2929
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.18" targetFramework="net462" />
3030
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.4.1" targetFramework="net462" />
31-
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net462" />
31+
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net462" />
3232
</packages>

‎AzureKeyVaultTests/AzureKeyVaultTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="CSS.Common" Version="1.7.0" />
10+
<PackageReference Include="CSS.Common" Version="1.6.0" />
1111
<PackageReference Include="FluentAssertions" Version="5.10.3" />
1212
<PackageReference Include="Keyfactor.Platform.Extensions.Agents" Version="1.3.1" />
1313
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.5" />

‎AzureKeyVaultTests/packages.config‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Copyright 2021 Keyfactor
4+
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6+
Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
7+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
8+
and limitations under the License.
9+
-->
10+
<packages>
11+
<package id="BouncyCastle" version="1.8.5" targetFramework="net462" />
12+
<package id="CERTENROLLLibx64" version="1.0.0.1" targetFramework="net462" />
13+
<package id="Common.Logging" version="3.4.1" targetFramework="net462" />
14+
<package id="Common.Logging.Core" version="3.4.1" targetFramework="net462" />
15+
<package id="CSS.Common" version="1.6.0" targetFramework="net462" />
16+
<package id="CSS.PKI" version="2.11.0" targetFramework="net462" />
17+
<package id="Keyfactor.Platform.Extensions.Agents" version="1.3.1" targetFramework="net462" />
18+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net462" />
19+
<package id="Microsoft.Azure.KeyVault" version="3.0.3" targetFramework="net462" />
20+
<package id="Microsoft.Azure.KeyVault.Core" version="3.0.3" targetFramework="net462" />
21+
<package id="Microsoft.Azure.KeyVault.WebKey" version="3.0.3" targetFramework="net462" />
22+
<package id="Microsoft.Azure.Management.KeyVault" version="2.4.3" targetFramework="net462" />
23+
<package id="Microsoft.Azure.Management.ResourceManager.Fluent" version="1.37.0" targetFramework="net462" />
24+
<package id="Microsoft.CSharp" version="4.0.1" targetFramework="net462" />
25+
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="4.5.1" targetFramework="net462" />
26+
<package id="Microsoft.IdentityModel.Logging" version="1.1.2" targetFramework="net462" />
27+
<package id="Microsoft.IdentityModel.Tokens" version="5.1.2" targetFramework="net462" />
28+
<package id="Microsoft.Rest.ClientRuntime" version="2.3.20" targetFramework="net462" />
29+
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.18" targetFramework="net462" />
30+
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.4.1" targetFramework="net462" />
31+
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net462" />
32+
</packages>

‎Images/vault-perms.png‎

35 KB
Loading

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,9 @@ Navigate to Certificate Locations =\> Certificate Stores within Keyfactor Comman
132132
2. Click on Access Policies
133133
3. Click add new
134134
4. Ensure it has the proper permissions
135+
136+
<img src="Images/vault-perms.png" alt="Vault Perms" style="width:500px;"/>
137+
135138
5. Select the application registered in (3) as the principal
136139
6. Click Ok
137140
7. Click Save
@@ -148,7 +151,6 @@ Navigate to Certificate Locations =\> Certificate Stores within Keyfactor Comman
148151
- While Azure Key Vault will automatically renew certs from DigiCert, GlobalSign, and D-Trust, they only send emails for certificates from other certificate providers
149152
- You have the option to specify that the key pair be generated as non-exportable and generated inside an HSM. If you do this then you cannot distribute your certificate and private key to your app nodes as illustrated in the end-to-end flow example above.
150153
- The Azure App Services platform periodically polls your key vault to check if there is an updated certificate. If it finds one it reads the new one and rebinds SSL/TLS for your app.
151-
- There are
152154
***
153155

154156
### License

‎README.md.tpl‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,9 @@ Navigate to Certificate Locations =\> Certificate Stores within Keyfactor Comman
132132
2. Click on Access Policies
133133
3. Click add new
134134
4. Ensure it has the proper permissions
135+
136+
<img src="Images/vault-perms.png" alt="Vault Perms" style="width:500px;"/>
137+
135138
5. Select the application registered in (3) as the principal
136139
6. Click Ok
137140
7. Click Save
@@ -148,7 +151,6 @@ Navigate to Certificate Locations =\> Certificate Stores within Keyfactor Comman
148151
- While Azure Key Vault will automatically renew certs from DigiCert, GlobalSign, and D-Trust, they only send emails for certificates from other certificate providers
149152
- You have the option to specify that the key pair be generated as non-exportable and generated inside an HSM. If you do this then you cannot distribute your certificate and private key to your app nodes as illustrated in the end-to-end flow example above.
150153
- The Azure App Services platform periodically polls your key vault to check if there is an updated certificate. If it finds one it reads the new one and rebinds SSL/TLS for your app.
151-
- There are
152154
***
153155

154156
### License

0 commit comments

Comments
 (0)