You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by jk...@apache.org on 2017/09/05 01:23:15 UTC
thrift git commit: THRIFT-4247: Fix compilation with OpenSSL 1.1
Client: c_glib
Repository: thrift
Updated Branches:
refs/heads/master d7142b7e4 -> 722f8e950
THRIFT-4247: Fix compilation with OpenSSL 1.1
Client: c_glib
This closes #1308
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/722f8e95
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/722f8e95
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/722f8e95
Branch: refs/heads/master
Commit: 722f8e95065aa19a1c5d9846f698d52e6d4d82fc
Parents: d7142b7
Author: Josip Sokcevic <in...@sokac.net>
Authored: Sat Jul 8 16:29:41 2017 -0700
Committer: James E. King, III <jk...@apache.org>
Committed: Mon Sep 4 18:22:03 2017 -0700
----------------------------------------------------------------------
.gitignore | 1 +
.../thrift/c_glib/transport/thrift_ssl_socket.c | 21 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/722f8e95/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 9948724..3fd7826 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@
*.swp
*.hi
*~
+tags
.*project
junit*.properties
http://git-wip-us.apache.org/repos/asf/thrift/blob/722f8e95/lib/c_glib/src/thrift/c_glib/transport/thrift_ssl_socket.c
----------------------------------------------------------------------
diff --git a/lib/c_glib/src/thrift/c_glib/transport/thrift_ssl_socket.c b/lib/c_glib/src/thrift/c_glib/transport/thrift_ssl_socket.c
index 1de4a43..be8637d 100644
--- a/lib/c_glib/src/thrift/c_glib/transport/thrift_ssl_socket.c
+++ b/lib/c_glib/src/thrift/c_glib/transport/thrift_ssl_socket.c
@@ -383,17 +383,16 @@ gboolean thrift_ssl_load_cert_from_buffer(ThriftSSLSocket *ssl_socket, const cha
X509_STORE *cert_store = SSL_CTX_get_cert_store(ssl_socket->ctx);
if(cert_store!=NULL){
- int index = 0;
- while ((cacert = PEM_read_bio_X509(mem, NULL, 0, NULL))!=NULL) {
- if(cacert) {
- g_debug("Our certificate name is %s", cacert->name);
- X509_STORE_add_cert(cert_store, cacert);
- X509_free(cacert);
- cacert=NULL;
- } /* Free immediately */
- index++;
- }
- retval=TRUE;
+ int index = 0;
+ while ((cacert = PEM_read_bio_X509(mem, NULL, 0, NULL))!=NULL) {
+ if(cacert) {
+ X509_STORE_add_cert(cert_store, cacert);
+ X509_free(cacert);
+ cacert=NULL;
+ } /* Free immediately */
+ index++;
+ }
+ retval=TRUE;
}
BIO_free(mem);
return retval;