Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
Titanium-Web-Proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Titanium-Web-Proxy
Commits
e7acdc65
Unverified
Commit
e7acdc65
authored
Jul 15, 2019
by
honfika
Committed by
GitHub
Jul 15, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #604 from justcoding121/honfika-patch-1
Mono fix?
parents
f863fdc4
c653a8ef
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
2 deletions
+10
-2
BCCertificateMaker.cs
...anium.Web.Proxy/Network/Certificate/BCCertificateMaker.cs
+10
-2
No files found.
src/Titanium.Web.Proxy/Network/Certificate/BCCertificateMaker.cs
View file @
e7acdc65
...
@@ -143,8 +143,16 @@ namespace Titanium.Web.Proxy.Network.Certificate
...
@@ -143,8 +143,16 @@ namespace Titanium.Web.Proxy.Network.Certificate
#if NET45
#if NET45
// Set private key onto certificate instance
// Set private key onto certificate instance
var
x509Certificate
=
new
X509Certificate2
(
certificate
.
GetEncoded
());
X509Certificate2
x509Certificate
;
x509Certificate
.
PrivateKey
=
DotNetUtilities
.
ToRSA
(
rsaparams
);
if
(
RunTime
.
IsRunningOnMono
)
{
x509Certificate
=
withPrivateKey
(
certificate
,
rsaparams
);
}
else
{
x509Certificate
=
new
X509Certificate2
(
certificate
.
GetEncoded
());
x509Certificate
.
PrivateKey
=
DotNetUtilities
.
ToRSA
(
rsaparams
);
}
#else
#else
var
x509Certificate
=
withPrivateKey
(
certificate
,
rsaparams
);
var
x509Certificate
=
withPrivateKey
(
certificate
,
rsaparams
);
#endif
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment