diff options
| author | Steve Bennett <steveb@workware.net.au> | 2016-02-01 15:42:09 +1000 |
|---|---|---|
| committer | Steve Bennett <steveb@workware.net.au> | 2016-02-01 15:52:10 +1000 |
| commit | 2d39166b9970cd0954238ee80e8ab63a8d0bb47d (patch) | |
| tree | bb045da71fdaa7eae928cefca94c24d70ee86def /examples | |
| parent | 54697b4bebf26e80d60e7a10d42fc5f4f00b9fdd (diff) | |
| download | jimtcl-2d39166b9970cd0954238ee80e8ab63a8d0bb47d.zip jimtcl-2d39166b9970cd0954238ee80e8ab63a8d0bb47d.tar.gz jimtcl-2d39166b9970cd0954238ee80e8ab63a8d0bb47d.tar.bz2 | |
aio: fix aio ssl support
The following changes were not merged:
- commit examples/{certificate,key}.pem
- return AioFile from JimMakeChannel to allow ssl-specific settings to be set
- improve examples/ssl.{client,server} so they work out-of-the-box
Signed-off-by: Steve Bennett <steveb@workware.net.au>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/certificate.pem | 14 | ||||
| -rw-r--r-- | examples/key.pem | 9 | ||||
| -rw-r--r-- | examples/ssl.client | 6 | ||||
| -rw-r--r-- | examples/ssl.server | 3 |
4 files changed, 31 insertions, 1 deletions
diff --git a/examples/certificate.pem b/examples/certificate.pem new file mode 100644 index 0000000..9d7ac23 --- /dev/null +++ b/examples/certificate.pem @@ -0,0 +1,14 @@ +-----BEGIN CERTIFICATE----- +MIICLDCCAdYCAQAwDQYJKoZIhvcNAQEEBQAwgaAxCzAJBgNVBAYTAlBUMRMwEQYD +VQQIEwpRdWVlbnNsYW5kMQ8wDQYDVQQHEwZMaXNib2ExFzAVBgNVBAoTDk5ldXJv +bmlvLCBMZGEuMRgwFgYDVQQLEw9EZXNlbnZvbHZpbWVudG8xGzAZBgNVBAMTEmJy +dXR1cy5uZXVyb25pby5wdDEbMBkGCSqGSIb3DQEJARYMc2FtcG9AaWtpLmZpMB4X +DTk2MDkwNTAzNDI0M1oXDTk2MTAwNTAzNDI0M1owgaAxCzAJBgNVBAYTAlBUMRMw +EQYDVQQIEwpRdWVlbnNsYW5kMQ8wDQYDVQQHEwZMaXNib2ExFzAVBgNVBAoTDk5l +dXJvbmlvLCBMZGEuMRgwFgYDVQQLEw9EZXNlbnZvbHZpbWVudG8xGzAZBgNVBAMT +EmJydXR1cy5uZXVyb25pby5wdDEbMBkGCSqGSIb3DQEJARYMc2FtcG9AaWtpLmZp +MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAL7+aty3S1iBA/+yxjxv4q1MUTd1kjNw +L4lYKbpzzlmC5beaQXeQ2RmGMTXU+mDvuqItjVHOK3DvPK7lTcSGftUCAwEAATAN +BgkqhkiG9w0BAQQFAANBAFqPEKFjk6T6CKTHvaQeEAsX0/8YHPHqH/9AnhSjrwuX +9EBc0n6bVGhN7XaXd6sJ7dym9sbsWxb+pJdurnkxjx4= +-----END CERTIFICATE----- diff --git a/examples/key.pem b/examples/key.pem new file mode 100644 index 0000000..239ad66 --- /dev/null +++ b/examples/key.pem @@ -0,0 +1,9 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIBPAIBAAJBAL7+aty3S1iBA/+yxjxv4q1MUTd1kjNwL4lYKbpzzlmC5beaQXeQ +2RmGMTXU+mDvuqItjVHOK3DvPK7lTcSGftUCAwEAAQJBALjkK+jc2+iihI98riEF +oudmkNziSRTYjnwjx8mCoAjPWviB3c742eO3FG4/soi1jD9A5alihEOXfUzloenr +8IECIQD3B5+0l+68BA/6d76iUNqAAV8djGTzvxnCxycnxPQydQIhAMXt4trUI3nc +a+U8YL2HPFA3gmhBsSICbq2OptOCnM7hAiEA6Xi3JIQECob8YwkRj29DU3/4WYD7 +WLPgsQpwo1GuSpECICGsnWH5oaeD9t9jbFoSfhJvv0IZmxdcLpRcpslpeWBBAiEA +6/5B8J0GHdJq89FHwEG/H2eVVUYu5y/aD6sgcm+0Avg= +-----END RSA PRIVATE KEY----- diff --git a/examples/ssl.client b/examples/ssl.client index f0699b4..58be7b3 100644 --- a/examples/ssl.client +++ b/examples/ssl.client @@ -2,7 +2,11 @@ load_ssl_certs /etc/ssl/certs set s [[socket stream 127.0.0.1:20000] ssl] -$s verify +try { + $s verify +} on error msg { + stderr puts $msg +} foreach i [range 1 20] { $s puts "1 << $i" diff --git a/examples/ssl.server b/examples/ssl.server index cc162a2..7ccb101 100644 --- a/examples/ssl.server +++ b/examples/ssl.server @@ -18,6 +18,9 @@ $s readable { # Get the request (max 80 chars) - need the source address while {[$sock gets buf] >= 0} { + if {$buf eq ""} { + break + } set buf [string trim $buf] puts -nonewline "read '$buf'" |