Merge pull request #192 from JuliaWeb/tan/fix191

avoid blocking on unnecessary eof check

.travis.yml

@@ -7,6 +7,7 @@ os:
   - linux
   - osx
 julia:
+  - 1.0
   - 0.7
   - nightly
 notifications:

appveyor.yml

@@ -1,6 +1,7 @@
 environment:
   matrix:
   - julia_version: 0.7
+  - julia_version: 1.0
   - julia_version: latest
 
 platform:

src/ssl.jl

@@ -436,7 +436,7 @@ function Base.readbytes!(ctx::SSLContext, buf::Vector{UInt8}, nbytes::UInt;
     nread = 0
     while nread < nbytes
         nread += ssl_unsafe_read(ctx, pointer(buf) + nread, nbytes - nread)
-        if !all || eof(ctx)
+        if (nread == nbytes) || !all || eof(ctx)
             break
         end
     end                                                                         ;@😬 "readbytes! ⬅️  $nread"

test/clntsrvr/clntsrvr.jl

@@ -0,0 +1,52 @@
+using Test
+using Sockets
+using MbedTLS
+
+function sslaccept(server, certfile, keyfile)
+    sslconfig = MbedTLS.SSLConfig(certfile, keyfile)
+    conn = accept(server)
+    sslconn = MbedTLS.SSLContext()
+    MbedTLS.setup!(sslconn, sslconfig)
+    MbedTLS.associate!(sslconn, conn)
+    MbedTLS.handshake!(sslconn)
+    return sslconn
+end
+
+function sslconnect(dest, port)
+    conn = connect(dest, port)
+    sslconfig = MbedTLS.SSLConfig(false)
+    sslconn = MbedTLS.SSLContext()
+    MbedTLS.setup!(sslconn, sslconfig)
+    MbedTLS.set_bio!(sslconn, conn)
+    MbedTLS.handshake!(sslconn)
+    return sslconn
+end     
+
+function testclntsrvr(certfile, keyfile)
+    outbuff = ones(UInt8, 100) * UInt8(65)
+    trigger = Channel{Bool}(1)
+    port = UInt16(0)
+
+    @async begin
+        (port, server) = listenany(8000)
+        @info("listening on port $port")
+        put!(trigger, true)
+        srvrconn = sslaccept(server, certfile, keyfile)
+        inbuff = read(srvrconn, 100)
+        @test inbuff == outbuff
+        put!(trigger, true)
+    end
+
+    take!(trigger)
+    @info("connecting to port $port")
+    clntconn = sslconnect("127.0.0.1", port)
+    @test write(clntconn, outbuff) == 100
+    @async begin
+        sleep(10)
+        put!(trigger, false)
+    end
+
+    @test take!(trigger)
+end
+
+testclntsrvr(joinpath(dirname(@__FILE__), "test.cert"), joinpath(dirname(@__FILE__), "test.key"))

test/clntsrvr/test.cert

@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFgDCCA2igAwIBAgIJAPzuyJ6GLrRFMA0GCSqGSIb3DQEBCwUAMFUxCzAJBgNV
+BAYTAklOMRIwEAYDVQQIDAlLYXJuYXRha2ExEjAQBgNVBAcMCUJhbmdhbG9yZTEO
+MAwGA1UECgwFSnVsaWExDjAMBgNVBAMMBXRhbmx0MB4XDTE5MDEyMzA2MzMwN1oX
+DTI5MDEyMDA2MzMwN1owVTELMAkGA1UEBhMCSU4xEjAQBgNVBAgMCUthcm5hdGFr
+YTESMBAGA1UEBwwJQmFuZ2Fsb3JlMQ4wDAYDVQQKDAVKdWxpYTEOMAwGA1UEAwwF
+dGFubHQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC/24addgduwK6H
+qBK1QiC54gf48J6Y0OoMMTZzSiavFg74QASgoUwG2LLIt+9HDWMv/VysFJGG//5Y
+6NECc9/87uULKpcPoIMf0oGOZ2pFbyVLxaVndUtsZK3xX+gesGhHQeMAkA5THXeo
+FhU4JFE/UINwaxPJIoLc3hg9v/abT/25E+CrTxrgz82LOdboal+TjXN0Bl+s3xKP
+NMtRe/P/EPZV+hV66V2D9hRabIgoiweJd7TvrPLaNsVzHwyANtyNTm3Uqfz37y43
+BoHVzSzTp1qxwNvefTP1Y+CbS40VQ8YL2RQisaSLlRaTobeYvyjIqWVfBFq7TMSi
+Xw6szsrxdKgnpDj+QIawzn0h2jvDGdcAxX/v4/AJy8kKpxHEi0xUW/uGW2LlsoNI
+fDW4jrfAEBeMzsEsLwTEh0Oin0r3uWlYLl4UZsUpvurlWTlVbJ6wR93rn4yPQau6
+I4T9hsAL5es88naVkgjQJnkeGXsrV23K61kfqyYIMA1hGKCh/JkXWm88IeBdJdwm
+XI0sTexig5tJuLghWoas1abosHsFZoUFtDI/1N0HNfxsjx3D7hkdyzQ/gxr5EHVV
+bWU1YaXe00erCjFZlawILuxgAjzuHmKTk5YSQ3R0bMv+dtOW0cXY4sLk78zOUUWN
+qv+UHuO4d5Fov/iJ5D0RoIAPfyIKqQIDAQABo1MwUTAdBgNVHQ4EFgQUqc6rqyG1
+5AESve6Af/iGQefHggAwHwYDVR0jBBgwFoAUqc6rqyG15AESve6Af/iGQefHggAw
+DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAHlMjLGE9VC1fZbrL
+SV23VlQ6v71Geby0eYxu7OzHf8wQrx4ajVsHyqvCuKQORFI7Ai4aeaf3mqHsu7X7
+rI2PhVXPVJdwfPQpFoLE76KKLsyZuag2WiP2abyLuwOWmcL7bG4skmnCIGqTrXMm
+3RvdkbZW76O5B0dirCv5dOTijuKBFyOHAes7ayV/UCru2GKwwy1Buc+NKrUCtyT4
+BO/o+EbqmZ3TC1PaXNJXY1IHKv8kUGPFneJUYtHMpD9ngI+LrmTvAGf8DEitN2Eb
+LW7rgplaVEwrslSL7G27xKf1fMMDwNP5x20RU3FyR8zoGtbUQE8jlRmyPKb4+S5+
+SnC/7mpvbXyMTZkg4h5LLQe5RtCehVI/ATgqJWNyKdLmOPVyt/pTLNbw6p0Ib8mP
+i3l+QMEUD77VyDBqtC98XKIF9BPpFYm5KTH+odJYE+cep/B6DUldoVwWcyleZrox
+o5ESsZDUbrtMxKmCKuvOcNEbFoUPABlV0EC+hqqLZhRK2NOfNb84XBp0a4zmKBDr
+AxG+WLGsJ98z1Z5fEkuWukh0qnKXrOpAuMsVv3DNEmDpgx2dxCIHk/VtohBhN5/X
+Yk+8+aUsMe1PsxiQ5XR0HnHk8cAmwCjDcZEoc0SffFXuJBaWJRea+TyjGKAJQuak
+b/ONbolarLJICekZot3L9pTRYrk=
+-----END CERTIFICATE-----

test/clntsrvr/test.key

@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+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
+jcWJWBIQzJf4b0KYq5zewDH/ro66og==
+-----END PRIVATE KEY-----

test/runtests.jl

@@ -253,5 +253,8 @@ mktempdir() do d
     buf = String(read(ctx, 100))
     @test occursin(r"^HTTP/1.1 200 OK", buf)
     @test occursin(r"^CLIENT_RANDOM [0-9a-f]{64} [0-9a-f]{96}$", read(f, String))
+end
 
+let
+    include("clntsrvr/clntsrvr.jl")
 end