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
abb571f8
Unverified
Commit
abb571f8
authored
Mar 31, 2019
by
Jehonathan Thomas
Committed by
GitHub
Mar 31, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #570 from justcoding121/master
Beta
parents
f9add9fe
0f19fea8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
PULL_REQUEST_TEMPLATE.md
PULL_REQUEST_TEMPLATE.md
+1
-1
DefaultCertificateDiskCache.cs
...Titanium.Web.Proxy/Network/DefaultCertificateDiskCache.cs
+6
-0
No files found.
PULL_REQUEST_TEMPLATE.md
View file @
abb571f8
Doneness:
-
[
]
Build is okay - I made sure that this change is building successfully.
-
[
]
No Bugs - I made sure that this change is working properly as expected. It doesn't have any bugs that you are aware of.
-
[
]
Branching - If this is not a hotfix, I am making this request against master branch
-
[
]
Branching - If this is not a hotfix, I am making this request against
the
master branch
src/Titanium.Web.Proxy/Network/DefaultCertificateDiskCache.cs
View file @
abb571f8
...
...
@@ -59,6 +59,12 @@ namespace Titanium.Web.Proxy.Network
private
X509Certificate2
loadCertificate
(
string
path
,
string
password
,
X509KeyStorageFlags
storageFlags
)
{
byte
[]
exported
;
if
(!
File
.
Exists
(
path
))
{
return
null
;
}
try
{
exported
=
File
.
ReadAllBytes
(
path
);
...
...
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