Skip to content

Commit

Permalink
Made all stubs support the new calling convention
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mamietti
Mamietti committed Jul 26, 2016
1 parent 7e58320 commit 2aceee0
Show file tree
Hide file tree
Showing 31 changed files with 346 additions and 346 deletions.
4 changes: 2 additions & 2 deletions stubs/FSharp-net/Run.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ let main(args) = //host, port, no support for ca-bundle at the moment
let url = String.Format("https://{0}:{1}", host, port)
try
let req = HttpWebRequest.Create(url).GetResponse()
printfn "VERIFY SUCCESS"; 0
printfn "ACCEPT"; 0
with
| :? System.Net.WebException as ex ->
if ex.Message.Contains("NameResolutionFailure") then
printfn "%s" ex.Message; 1
else
printfn "VERIFY FAILURE"; 0
printfn "REJECT"; 0
| _ as ex->
printfn "%s" ex.Message; 1
| [|_; _; _|] ->
Expand Down
74 changes: 37 additions & 37 deletions stubs/FSharp-net/results.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,45 +37,45 @@ platform: Linux (Ubuntu 16.04)
runner: simplerunner
stub: FSharp-Net 'Run.exe'
[F#-Net][ PASS ][VERIFY SUCCESS][ Valid cert ][google.com]
[F#-Net][ PASS ][ACCEPT][ Valid cert ][google.com]
[F#-Net][ PASS ][VERIFY FAILURE][ dh480 ][dh480.badssl.com]
[F#-Net][ PASS ][VERIFY FAILURE][ dsdtestprovider ][dsdtestprovider.badssl.com]
[F#-Net][ PASS ][VERIFY FAILURE][ edellroot ][edellroot.badssl.com]
[F#-Net][ PASS ][VERIFY FAILURE][ expired ][expired.badssl.com]
[F#-Net][ PASS ][VERIFY FAILURE][ self-signed ][self-signed.badssl.com]
[F#-Net][ PASS ][VERIFY FAILURE][ superfish ][superfish.badssl.com]
[F#-Net][ PASS ][VERIFY FAILURE][ untrusted-root ][untrusted-root.badssl.com]
[F#-Net][ PASS ][VERIFY FAILURE][ wrong host ][wrong.host.badssl.com]
[F#-Net][ PASS ][VERIFY SUCCESS][ sha-256 ][sha256.badssl.com]
[F#-Net][ PASS ][VERIFY SUCCESS][ supports SNI ][badssl.com]
[F#-Net][ PASS ][REJECT][ dh480 ][dh480.badssl.com]
[F#-Net][ PASS ][REJECT][ dsdtestprovider ][dsdtestprovider.badssl.com]
[F#-Net][ PASS ][REJECT][ edellroot ][edellroot.badssl.com]
[F#-Net][ PASS ][REJECT][ expired ][expired.badssl.com]
[F#-Net][ PASS ][REJECT][ self-signed ][self-signed.badssl.com]
[F#-Net][ PASS ][REJECT][ superfish ][superfish.badssl.com]
[F#-Net][ PASS ][REJECT][ untrusted-root ][untrusted-root.badssl.com]
[F#-Net][ PASS ][REJECT][ wrong host ][wrong.host.badssl.com]
[F#-Net][ PASS ][ACCEPT][ sha-256 ][sha256.badssl.com]
[F#-Net][ PASS ][ACCEPT][ supports SNI ][badssl.com]
[F#-Net][ OK? ][ UNSUPPORTED ][ disable ca-bundles ][badssl.com]
[F#-Net][ OK? ][VERIFY FAILURE][ dh1024 ][dh1024.badssl.com]
[F#-Net][ OK? ][VERIFY FAILURE][ dh-small-subgroup ][dh-small-subgroup.badssl.com]
[F#-Net][ OK? ][VERIFY FAILURE][ incomplete-chain ][incomplete-chain.badssl.com]
[F#-Net][ OK? ][VERIFY FAILURE][ mozilla-intermediate ][mozilla-intermidiate.badssl.com]
[F#-Net][ OK? ][VERIFY FAILURE][ mozilla-modern ][mozilla-modern.badssl.com]
[F#-Net][ OK? ][VERIFY FAILURE][ subdomain.preloaded-hsts ][subdomain.preloaded-hsts.badssl.com]
[F#-Net][ OK? ][VERIFY SUCCESS][ cbc ][cbc.badssl.com]
[F#-Net][ OK? ][VERIFY SUCCESS][ hsts ][hsts.badssl.com]
[F#-Net][ OK? ][VERIFY SUCCESS][ mixed ][mixed.badssl.com]
[F#-Net][ OK? ][VERIFY SUCCESS][ mixed-favicon ][mixed-favicon.badssl.com]
[F#-Net][ OK? ][VERIFY SUCCESS][ mixed-script ][mixed-script.badssl.com]
[F#-Net][ OK? ][VERIFY SUCCESS][ mozilla-old ][mozilla-old.badssl.com]
[F#-Net][ OK? ][VERIFY SUCCESS][ pinning-test ][pinning-test.badssl.com]
[F#-Net][ OK? ][VERIFY SUCCESS][ preloaded-hsts ][preloaded-hsts.badssl.com]
[F#-Net][ OK? ][VERIFY SUCCESS][ rc4 ][rc4.badssl.com]
[F#-Net][ OK? ][VERIFY SUCCESS][ rsa8192 ][rsa8192.badssl.com]
[F#-Net][ OK? ][VERIFY SUCCESS][ sha1-2016 ][sha1-2016.badssl.com]
[F#-Net][ OK? ][VERIFY SUCCESS][ sha1-2017 ][sha1-2017.badssl.com]
[F#-Net][ OK? ][VERIFY SUCCESS][ upgrade ][upgrade.badssl.com]
[F#-Net][ OK? ][VERIFY SUCCESS][ very ][very.badssl.com]
[F#-Net][ FAIL ][VERIFY FAILURE][ 10000-sans (Bad in ten years) ][10000-sans.badssl.com]
[F#-Net][ FAIL ][VERIFY FAILURE][ 1000-sans ][1000-sans.badssl.com]
[F#-Net][ FAIL ][VERIFY FAILURE][ dh2048 ][dh2048.badssl.com]
[F#-Net][ OK? ][REJECT][ dh1024 ][dh1024.badssl.com]
[F#-Net][ OK? ][REJECT][ dh-small-subgroup ][dh-small-subgroup.badssl.com]
[F#-Net][ OK? ][REJECT][ incomplete-chain ][incomplete-chain.badssl.com]
[F#-Net][ OK? ][REJECT][ mozilla-intermediate ][mozilla-intermidiate.badssl.com]
[F#-Net][ OK? ][REJECT][ mozilla-modern ][mozilla-modern.badssl.com]
[F#-Net][ OK? ][REJECT][ subdomain.preloaded-hsts ][subdomain.preloaded-hsts.badssl.com]
[F#-Net][ OK? ][ACCEPT][ cbc ][cbc.badssl.com]
[F#-Net][ OK? ][ACCEPT][ hsts ][hsts.badssl.com]
[F#-Net][ OK? ][ACCEPT][ mixed ][mixed.badssl.com]
[F#-Net][ OK? ][ACCEPT][ mixed-favicon ][mixed-favicon.badssl.com]
[F#-Net][ OK? ][ACCEPT][ mixed-script ][mixed-script.badssl.com]
[F#-Net][ OK? ][ACCEPT][ mozilla-old ][mozilla-old.badssl.com]
[F#-Net][ OK? ][ACCEPT][ pinning-test ][pinning-test.badssl.com]
[F#-Net][ OK? ][ACCEPT][ preloaded-hsts ][preloaded-hsts.badssl.com]
[F#-Net][ OK? ][ACCEPT][ rc4 ][rc4.badssl.com]
[F#-Net][ OK? ][ACCEPT][ rsa8192 ][rsa8192.badssl.com]
[F#-Net][ OK? ][ACCEPT][ sha1-2016 ][sha1-2016.badssl.com]
[F#-Net][ OK? ][ACCEPT][ sha1-2017 ][sha1-2017.badssl.com]
[F#-Net][ OK? ][ACCEPT][ upgrade ][upgrade.badssl.com]
[F#-Net][ OK? ][ACCEPT][ very ][very.badssl.com]
[F#-Net][ FAIL ][REJECT][ 10000-sans (Bad in ten years) ][10000-sans.badssl.com]
[F#-Net][ FAIL ][REJECT][ 1000-sans ][1000-sans.badssl.com]
[F#-Net][ FAIL ][REJECT][ dh2048 ][dh2048.badssl.com]
[F#-Net][ PASS ][VERIFY FAILURE][ OS X vulnerability ][www.ssllabs.com]
[F#-Net][ PASS ][VERIFY FAILURE][ Freak ][www.ssllabs.com]
[F#-Net][ PASS ][VERIFY FAILURE][ Logjam ][www.ssllabs.com]
[F#-Net][ PASS ][REJECT][ OS X vulnerability ][www.ssllabs.com]
[F#-Net][ PASS ][REJECT][ Freak ][www.ssllabs.com]
[F#-Net][ PASS ][REJECT][ Logjam ][www.ssllabs.com]
```
12 changes: 6 additions & 6 deletions stubs/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ operating system.
Stubs should attempt to establish a **secure** connection to the given
service(host + port) and catch possible errors and exceptions to determine if the connection was successful.

The last string the stub should print is the verdict (UNSUPPORTED, VERIFY SUCCESS etc.). If you want the stub to print additional context such as the reason to accept/reject connection or an error message, the stub should print them before the verdict.
The last string the stub should print is the verdict (UNSUPPORTED, ACCEPT etc.). If you want the stub to print additional context such as the reason to accept/reject connection or an error message, the stub should print them before the verdict.

The data outputted by the stub should follow the following set of instructions or a similar one.

Expand All @@ -43,10 +43,10 @@ The data outputted by the stub should follow the following set of instructions o
print "UNSUPPORTED"
return zero
3.0 else if [the stub could connect to the service] then
print "VERIFY SUCCESS"
print "ACCEPT"
return zero
4.0 else if [the stub could not connect to the service] then
print "VERIFY FAILURE"
print "REJECT"
return zero
5.0 else ("fatal error occured")
(optional error message)
Expand All @@ -71,14 +71,14 @@ Connecting to `google.com` on HTTPS port should be success:

```sh
$ run.test google.com 443
VERIFY SUCCESS or UNSUPPORTED
ACCEPT or UNSUPPORTED
```

Connecting to `badssl.com`'s `untrusted-root` should be failure:

```sh
$ run.test untrusted-root.badssl.com 443
VERIFY FAILURE or UNSUPPORTED
REJECT or UNSUPPORTED
```

If these simple tests work, your stub is ready to be tested with
Expand All @@ -94,7 +94,7 @@ https://mkcert.org/generate/`) and then test:

```sh
$ run.test google.com 443 ca-bundle.pem
VERIFY SUCCESS
ACCEPT
```

---
Expand Down
Loading

0 comments on commit 2aceee0

Please sign in to comment.