Browse Source
Merge pull request #21860 from abpframework/auto-merge/prerel-9-0/3379
Merge branch dev with prerel-9.1
pull/21870/head
maliming
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
2 additions and
2 deletions
-
modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Microsoft/Extensions/DependencyInjection/OpenIddictServerBuilderExtensions.cs
|
|
@ -13,8 +13,8 @@ public static class OpenIddictServerBuilderExtensions |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
var certificate = flag != null |
|
|
var certificate = flag != null |
|
|
? new X509Certificate2(fileName, passPhrase, flag.Value) |
|
|
? X509CertificateLoader.LoadPkcs12FromFile(fileName, passPhrase, flag.Value) |
|
|
: new X509Certificate2(fileName, passPhrase); |
|
|
: X509CertificateLoader.LoadPkcs12FromFile(fileName, passPhrase); |
|
|
|
|
|
|
|
|
builder.AddSigningCertificate(certificate); |
|
|
builder.AddSigningCertificate(certificate); |
|
|
builder.AddEncryptionCertificate(certificate); |
|
|
builder.AddEncryptionCertificate(certificate); |
|
|
|
