[M-git] Mahogany sources repository. branch master updated. v0.67-728-g899afa9

[Nerijus Baliūn. <mah...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Mahogany sources repository.".

The branch, master has been updated
       via  899afa9f6fadefcc59159fd68c9be8b6d1b2a611 (commit)
      from  d0aa4fb059d620163879625b1d31d20ffb2d75dc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 899afa9f6fadefcc59159fd68c9be8b6d1b2a611
Author: Nerijus Baliunas <ne...@us...>
Date:   Fri Mar 25 13:20:34 2016 +0200

    fixed compilation with OpenSSL 1.0.2g

diff --git a/.gitignore b/.gitignore
old mode 100755
new mode 100644
diff --git a/src/util/ssl.cpp b/src/util/ssl.cpp
index 985ac8f..c8b3889 100644
--- a/src/util/ssl.cpp
+++ b/src/util/ssl.cpp
@@ -76,6 +76,12 @@ extern const MOption MP_SSL_DLL_SSL;
    #define ssl_STACK STACK
    #define sk_value_t char *
 #endif
+// OpenSSL 1.0.2g
+#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x1000207fL)
+   #define ssl_const3 const
+#else
+   #define ssl_const3
+#endif
 
 /* This is our interface to the library and auth_ssl.c in c-client
    which are all in "C" */
@@ -136,7 +142,7 @@ SSL_DEF( sk_value_t, sk_value, (const ssl_STACK *s, int n), (s, n) );
 
 SSL_DEF_VOID( RAND_seed, (const void *buf,int num), (buf, num) );
 SSL_DEF( BIO *, BIO_new_socket, (int sock, int close_flag), (sock, close_flag) );
-SSL_DEF( BIO *, BIO_new_mem_buf, (void *buf, int len), (buf, len) );
+SSL_DEF( BIO *, BIO_new_mem_buf, (ssl_const3 void *buf, int len), (buf, len) );
 SSL_DEF( int, BIO_free, (BIO *a), (a) );
 SSL_DEF( long, SSL_CTX_ctrl, (SSL_CTX *ctx,int cmd, long larg, ssl_parg parg), (ctx,cmd,larg,parg) );
 SSL_DEF_VOID( SSL_CTX_set_verify, (SSL_CTX *ctx,int mode, int (*callback)(int, X509_STORE_CTX *)), (ctx,mode,callback) );

-----------------------------------------------------------------------

Summary of changes:
 src/util/ssl.cpp |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
 mode change 100755 => 100644 .gitignore


hooks/post-receive
-- 
Mahogany sources repository.