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
33d86a59
Commit
33d86a59
authored
Jan 22, 2020
by
Honfika
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ciphers list updated, null check in proxy settings
parent
25383a4f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
2 deletions
+22
-2
SystemProxy.cs
src/Titanium.Web.Proxy/Helpers/SystemProxy.cs
+2
-2
SslCiphers.cs
src/Titanium.Web.Proxy/StreamExtended/Models/SslCiphers.cs
+20
-0
No files found.
src/Titanium.Web.Proxy/Helpers/SystemProxy.cs
View file @
33d86a59
...
@@ -345,9 +345,9 @@ namespace Titanium.Web.Proxy.Helpers
...
@@ -345,9 +345,9 @@ namespace Titanium.Web.Proxy.Helpers
/// <summary>
/// <summary>
/// Opens the registry key with the internet settings
/// Opens the registry key with the internet settings
/// </summary>
/// </summary>
private
static
RegistryKey
openInternetSettingsKey
()
private
static
RegistryKey
?
openInternetSettingsKey
()
{
{
return
Registry
.
CurrentUser
.
OpenSubKey
(
regKeyInternetSettings
,
true
);
return
Registry
.
CurrentUser
?
.
OpenSubKey
(
regKeyInternetSettings
,
true
);
}
}
}
}
}
}
src/Titanium.Web.Proxy/StreamExtended/Models/SslCiphers.cs
View file @
33d86a59
...
@@ -173,6 +173,12 @@ namespace Titanium.Web.Proxy.StreamExtended.Models
...
@@ -173,6 +173,12 @@ namespace Titanium.Web.Proxy.StreamExtended.Models
{
0x00C4
,
"TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256"
},
{
0x00C4
,
"TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256"
},
{
0x00C5
,
"TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256"
},
{
0x00C5
,
"TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256"
},
{
0x00FF
,
"TLS_EMPTY_RENEGOTIATION_INFO_SCSV"
},
{
0x00FF
,
"TLS_EMPTY_RENEGOTIATION_INFO_SCSV"
},
// RFC 8446
{
0x1301
,
"TLS_AES_128_GCM_SHA256"
},
{
0x1302
,
"TLS_AES_256_GCM_SHA384"
},
{
0x1303
,
"TLS_CHACHA20_POLY1305_SHA256"
},
{
0x1304
,
"TLS_AES_128_CCM_SHA256"
},
{
0x1305
,
"TLS_AES_128_CCM_8_SHA256"
},
{
0x5600
,
"TLS_FALLBACK_SCSV"
},
{
0x5600
,
"TLS_FALLBACK_SCSV"
},
// RFC 4492
// RFC 4492
{
0xC001
,
"TLS_ECDH_ECDSA_WITH_NULL_SHA"
},
{
0xC001
,
"TLS_ECDH_ECDSA_WITH_NULL_SHA"
},
...
@@ -353,6 +359,15 @@ namespace Titanium.Web.Proxy.StreamExtended.Models
...
@@ -353,6 +359,15 @@ namespace Titanium.Web.Proxy.StreamExtended.Models
{
0xC0AD
,
"TLS_ECDHE_ECDSA_WITH_AES_256_CCM"
},
{
0xC0AD
,
"TLS_ECDHE_ECDSA_WITH_AES_256_CCM"
},
{
0xC0AE
,
"TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8"
},
{
0xC0AE
,
"TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8"
},
{
0xC0AF
,
"TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8"
},
{
0xC0AF
,
"TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8"
},
{
0xC0B0
,
"TLS_ECCPWD_WITH_AES_128_GCM_SHA256"
},
{
0xC0B1
,
"TLS_ECCPWD_WITH_AES_256_GCM_SHA384"
},
{
0xC0B2
,
"TLS_ECCPWD_WITH_AES_128_CCM_SHA256"
},
{
0xC0B3
,
"TLS_ECCPWD_WITH_AES_256_CCM_SHA384"
},
{
0xC0B4
,
"TLS_SHA256_SHA256"
},
{
0xC0B5
,
"TLS_SHA384_SHA384"
},
{
0xC100
,
"TLS_GOSTR341112_256_WITH_KUZNYECHIK_CTR_OMAC"
},
{
0xC101
,
"TLS_GOSTR341112_256_WITH_MAGMA_CTR_OMAC"
},
{
0xC102
,
"TLS_GOSTR341112_256_WITH_28147_CNT_IMIT"
},
// old numbers used in the beginning http://tools.ietf.org/html/draft-agl-tls-chacha20poly1305
// old numbers used in the beginning http://tools.ietf.org/html/draft-agl-tls-chacha20poly1305
{
0xCC13
,
"TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256"
},
{
0xCC13
,
"TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256"
},
{
0xCC14
,
"TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256"
},
{
0xCC14
,
"TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256"
},
...
@@ -365,6 +380,11 @@ namespace Titanium.Web.Proxy.StreamExtended.Models
...
@@ -365,6 +380,11 @@ namespace Titanium.Web.Proxy.StreamExtended.Models
{
0xCCAC
,
"TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256"
},
{
0xCCAC
,
"TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256"
},
{
0xCCAD
,
"TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256"
},
{
0xCCAD
,
"TLS_DHE_PSK_WITH_CHACHA20_POLY1305_SHA256"
},
{
0xCCAE
,
"TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256"
},
{
0xCCAE
,
"TLS_RSA_PSK_WITH_CHACHA20_POLY1305_SHA256"
},
// RFC 8442
{
0xD001
,
"TLS_ECDHE_PSK_WITH_AES_128_GCM_SHA256"
},
{
0xD002
,
"TLS_ECDHE_PSK_WITH_AES_256_GCM_SHA384"
},
{
0xD003
,
"TLS_ECDHE_PSK_WITH_AES_128_CCM_8_SHA256"
},
{
0xD005
,
"TLS_ECDHE_PSK_WITH_AES_128_CCM_SHA256"
},
// http://tools.ietf.org/html/draft-josefsson-salsa20-tls
// http://tools.ietf.org/html/draft-josefsson-salsa20-tls
{
0xE410
,
"TLS_RSA_WITH_ESTREAM_SALSA20_SHA1"
},
{
0xE410
,
"TLS_RSA_WITH_ESTREAM_SALSA20_SHA1"
},
{
0xE411
,
"TLS_RSA_WITH_SALSA20_SHA1"
},
{
0xE411
,
"TLS_RSA_WITH_SALSA20_SHA1"
},
...
...
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