|
 |
63ca9e3 |
From c7bd0361565f70caf621f588e38bfc6cc196c432 Mon Sep 17 00:00:00 2001
|
|
|
63ca9e3 |
From: Kamil Dudka <kdudka@redhat.com>
|
|
|
63ca9e3 |
Date: Tue, 5 Mar 2013 17:51:01 +0100
|
|
|
63ca9e3 |
Subject: [PATCH 1/2] nss: fix misplaced code enabling non-blocking socket mode
|
|
|
63ca9e3 |
|
|
|
63ca9e3 |
The option needs to be set on the SSL socket. Setting it on the model
|
|
|
63ca9e3 |
takes no effect. Note that the non-blocking mode is still not enabled
|
|
|
63ca9e3 |
for the handshake because the code is not yet ready for that.
|
|
|
63ca9e3 |
|
|
|
63ca9e3 |
[upstream commit 9d0af3018c5db25f5adda216dbcad6056b4a3107]
|
|
|
63ca9e3 |
---
|
|
|
63ca9e3 |
lib/nss.c | 12 ++++++------
|
|
|
63ca9e3 |
1 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
63ca9e3 |
|
|
|
63ca9e3 |
diff --git a/lib/nss.c b/lib/nss.c
|
|
|
63ca9e3 |
index efa578c..0ad1863 100644
|
|
|
63ca9e3 |
--- a/lib/nss.c
|
|
|
63ca9e3 |
+++ b/lib/nss.c
|
|
|
63ca9e3 |
@@ -1240,12 +1240,6 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
|
|
|
63ca9e3 |
goto error;
|
|
|
63ca9e3 |
model = SSL_ImportFD(NULL, model);
|
|
|
63ca9e3 |
|
|
|
63ca9e3 |
- /* make the socket nonblocking */
|
|
|
63ca9e3 |
- sock_opt.option = PR_SockOpt_Nonblocking;
|
|
|
63ca9e3 |
- sock_opt.value.non_blocking = PR_TRUE;
|
|
|
63ca9e3 |
- if(PR_SetSocketOption(model, &sock_opt) != PR_SUCCESS)
|
|
|
63ca9e3 |
- goto error;
|
|
|
63ca9e3 |
-
|
|
|
63ca9e3 |
if(SSL_OptionSet(model, SSL_SECURITY, PR_TRUE) != SECSuccess)
|
|
|
63ca9e3 |
goto error;
|
|
|
63ca9e3 |
if(SSL_OptionSet(model, SSL_HANDSHAKE_AS_SERVER, PR_FALSE) != SECSuccess)
|
|
|
63ca9e3 |
@@ -1420,6 +1414,12 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
|
|
|
63ca9e3 |
goto error;
|
|
|
63ca9e3 |
}
|
|
|
63ca9e3 |
|
|
|
63ca9e3 |
+ /* switch the SSL socket into non-blocking mode */
|
|
|
63ca9e3 |
+ sock_opt.option = PR_SockOpt_Nonblocking;
|
|
|
63ca9e3 |
+ sock_opt.value.non_blocking = PR_TRUE;
|
|
|
63ca9e3 |
+ if(PR_SetSocketOption(connssl->handle, &sock_opt) != PR_SUCCESS)
|
|
|
63ca9e3 |
+ goto error;
|
|
|
63ca9e3 |
+
|
|
|
63ca9e3 |
connssl->state = ssl_connection_complete;
|
|
|
63ca9e3 |
conn->recv[sockindex] = nss_recv;
|
|
|
63ca9e3 |
conn->send[sockindex] = nss_send;
|
|
|
63ca9e3 |
--
|
|
|
63ca9e3 |
1.7.1
|
|
|
63ca9e3 |
|
|
|
63ca9e3 |
|
|
|
63ca9e3 |
From f3a5d46280264965ca096c9b3efba481d4883d0e Mon Sep 17 00:00:00 2001
|
|
|
63ca9e3 |
From: Daniel Stenberg <daniel@haxx.se>
|
|
|
63ca9e3 |
Date: Tue, 7 May 2013 23:30:52 +0200
|
|
|
63ca9e3 |
Subject: [PATCH 2/2] nss: give PR_INTERVAL_NO_WAIT instead of -1 to PR_Recv/PR_Send
|
|
|
63ca9e3 |
|
|
|
63ca9e3 |
Reported by: David Strauss
|
|
|
63ca9e3 |
Bug: http://curl.haxx.se/mail/lib-2013-05/0088.html
|
|
|
63ca9e3 |
|
|
|
63ca9e3 |
[upstream commit 01a2abedd7e3a2075de70979003302313570c58c]
|
|
|
63ca9e3 |
|
|
|
63ca9e3 |
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
|
63ca9e3 |
---
|
|
|
63ca9e3 |
lib/nss.c | 11 ++++-------
|
|
|
63ca9e3 |
1 files changed, 4 insertions(+), 7 deletions(-)
|
|
|
63ca9e3 |
|
|
|
63ca9e3 |
diff --git a/lib/nss.c b/lib/nss.c
|
|
|
63ca9e3 |
index 0ad1863..f69a888 100644
|
|
|
63ca9e3 |
--- a/lib/nss.c
|
|
|
63ca9e3 |
+++ b/lib/nss.c
|
|
|
63ca9e3 |
@@ -1487,10 +1487,8 @@ static ssize_t nss_send(struct connectdata *conn, /* connection data */
|
|
|
63ca9e3 |
size_t len, /* amount to write */
|
|
|
63ca9e3 |
CURLcode *curlcode)
|
|
|
63ca9e3 |
{
|
|
|
63ca9e3 |
- int rc;
|
|
|
63ca9e3 |
-
|
|
|
63ca9e3 |
- rc = PR_Send(conn->ssl[sockindex].handle, mem, (int)len, 0, -1);
|
|
|
63ca9e3 |
-
|
|
|
63ca9e3 |
+ ssize_t rc = PR_Send(conn->ssl[sockindex].handle, mem, (int)len, 0,
|
|
|
63ca9e3 |
+ PR_INTERVAL_NO_WAIT);
|
|
|
63ca9e3 |
if(rc < 0) {
|
|
|
63ca9e3 |
PRInt32 err = PR_GetError();
|
|
|
63ca9e3 |
if(err == PR_WOULD_BLOCK_ERROR)
|
|
|
63ca9e3 |
@@ -1518,9 +1516,8 @@ static ssize_t nss_recv(struct connectdata * conn, /* connection data */
|
|
|
63ca9e3 |
size_t buffersize, /* max amount to read */
|
|
|
63ca9e3 |
CURLcode *curlcode)
|
|
|
63ca9e3 |
{
|
|
|
63ca9e3 |
- ssize_t nread;
|
|
|
63ca9e3 |
-
|
|
|
63ca9e3 |
- nread = PR_Recv(conn->ssl[num].handle, buf, (int)buffersize, 0, -1);
|
|
|
63ca9e3 |
+ ssize_t nread = PR_Recv(conn->ssl[num].handle, buf, (int)buffersize, 0,
|
|
|
63ca9e3 |
+ PR_INTERVAL_NO_WAIT);
|
|
|
63ca9e3 |
if(nread < 0) {
|
|
|
63ca9e3 |
/* failed SSL read */
|
|
|
63ca9e3 |
PRInt32 err = PR_GetError();
|
|
|
63ca9e3 |
--
|
|
|
63ca9e3 |
1.7.1
|
|
|
63ca9e3 |
|