generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cyassl: Use CYASSL_MAX_ERROR_SZ for error buffer size

Browse Source 
Also fix it so that all ERR_error_string calls use an error buffer.
CyaSSL's implementation of ERR_error_string only writes the error when
an error buffer is passed.

http://www.yassl.com/forums/topic599-openssl-compatibility-and-errerrorstring.html
This commit is contained in:
Jay Satiro
2015-04-04 02:12:03 -04:00
committed by Daniel Stenberg
parent a30be951d6
commit d363c07912
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/vtls/cyassl.c
View File

@@ -58,6 +58,10 @@
#include "curl_memory.h" #include "curl_memory.h"
#include "memdebug.h" #include "memdebug.h"
#if LIBCYASSL_VERSION_HEX < 0x02007002 /* < 2.7.2 */
#define CYASSL_MAX_ERROR_SZ 80
#endif
static Curl_recv cyassl_recv; static Curl_recv cyassl_recv;
static Curl_send cyassl_send; static Curl_send cyassl_send;
@@ -81,6 +85,7 @@ static CURLcode
cyassl_connect_step1(struct connectdata *conn, cyassl_connect_step1(struct connectdata *conn,
int sockindex) int sockindex)
{ {
char error_buffer[CYASSL_MAX_ERROR_SZ];
struct SessionHandle *data = conn->data; struct SessionHandle *data = conn->data;
struct ssl_connect_data* conssl = &conn->ssl[sockindex]; struct ssl_connect_data* conssl = &conn->ssl[sockindex];
SSL_METHOD* req_method = NULL; SSL_METHOD* req_method = NULL;
@@ -256,7 +261,7 @@ cyassl_connect_step1(struct connectdata *conn,
/* we got a session id, use it! */ /* we got a session id, use it! */
if(!SSL_set_session(conssl->handle, ssl_sessionid)) { if(!SSL_set_session(conssl->handle, ssl_sessionid)) {
failf(data, "SSL: SSL_set_session failed: %s", failf(data, "SSL: SSL_set_session failed: %s",
ERR_error_string(SSL_get_error(conssl->handle, 0), NULL)); ERR_error_string(SSL_get_error(conssl->handle, 0), error_buffer));
return CURLE_SSL_CONNECT_ERROR; return CURLE_SSL_CONNECT_ERROR;
} }
/* Informational message */ /* Informational message */
@@ -294,7 +299,7 @@ cyassl_connect_step2(struct connectdata *conn,
ret = SSL_connect(conssl->handle); ret = SSL_connect(conssl->handle);
if(ret != 1) { if(ret != 1) {
char error_buffer[80]; char error_buffer[CYASSL_MAX_ERROR_SZ];
int detail = SSL_get_error(conssl->handle, ret); int detail = SSL_get_error(conssl->handle, ret);
if(SSL_ERROR_WANT_READ == detail) { if(SSL_ERROR_WANT_READ == detail) {
@@ -406,7 +411,7 @@ static ssize_t cyassl_send(struct connectdata *conn,
size_t len, size_t len,
CURLcode *curlcode) CURLcode *curlcode)
{ {
char error_buffer[80]; char error_buffer[CYASSL_MAX_ERROR_SZ];
int memlen = (len > (size_t)INT_MAX) ? INT_MAX : (int)len; int memlen = (len > (size_t)INT_MAX) ? INT_MAX : (int)len;
int rc = SSL_write(conn->ssl[sockindex].handle, mem, memlen); int rc = SSL_write(conn->ssl[sockindex].handle, mem, memlen);
@@ -451,7 +456,7 @@ static ssize_t cyassl_recv(struct connectdata *conn,
size_t buffersize, size_t buffersize,
CURLcode *curlcode) CURLcode *curlcode)
{ {
char error_buffer[80]; char error_buffer[CYASSL_MAX_ERROR_SZ];
int buffsize = (buffersize > (size_t)INT_MAX) ? INT_MAX : (int)buffersize; int buffsize = (buffersize > (size_t)INT_MAX) ? INT_MAX : (int)buffersize;
int nread = SSL_read(conn->ssl[num].handle, buf, buffsize); int nread = SSL_read(conn->ssl[num].handle, buf, buffsize);