Changeset: aecfc07d877c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/aecfc07d877c
Modified Files:
clients/mapilib/connect_openssl.c
common/stream/openssl_stream.c
Branch: monetdburl
Log Message:
Adapt to older OpenSSL versions
diffs (49 lines):
diff --git a/clients/mapilib/connect_openssl.c
b/clients/mapilib/connect_openssl.c
--- a/clients/mapilib/connect_openssl.c
+++ b/clients/mapilib/connect_openssl.c
@@ -67,7 +67,7 @@ make_ssl_context(Mapi mid, SSL_CTX **ctx
break;
case verify_cert:
cert = msetting_string(mid->settings, MP_CERT);
- if (1 != SSL_CTX_load_verify_file(ctx, cert)) {
+ if (1 != SSL_CTX_load_verify_locations(ctx, cert,
NULL)) {
SSL_CTX_free(ctx);
return croak(mid, __func__,
"SSL_CTX_load_verify_file: %s", cert);
}
diff --git a/common/stream/openssl_stream.c b/common/stream/openssl_stream.c
--- a/common/stream/openssl_stream.c
+++ b/common/stream/openssl_stream.c
@@ -71,14 +71,14 @@ ostream_read(stream *restrict s, void *r
// iterate in order to read a complete number of items
size_t pos = 0;
do {
- size_t nread;
- if (!BIO_read_ex(bio, start + pos, size - pos, &nread))
+ int nread = BIO_read(bio, start + pos, size - pos);
+ if (nread < 0)
return ostream_error(s, MNSTR_READ_ERROR);
if (nread == 0) {
s->eof = 0;
break;
}
- pos += nread;
+ pos += (size_t)nread;
// adjust pos to the smallest multiple of elmsize.
// example 1: size=4 pos=7 (-7)%4=1, newsize=8
@@ -99,12 +99,12 @@ ostream_write(stream *restrict s, const
size_t size = elmsize * cnt;
size_t pos = 0;
while (pos < size) {
- size_t nwritten;
- if (!BIO_write_ex(bio, start + pos, size - pos, &nwritten))
+ int nwritten = BIO_write(bio, start + pos, size - pos);
+ if (nwritten < 0)
return ostream_error(s, MNSTR_WRITE_ERROR);
if (nwritten == 0 && !BIO_should_retry(bio))
break;
- pos += nwritten;
+ pos += (size_t)nwritten;
}
return (ssize_t) (pos / elmsize);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
