[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  7ab09630cd069af0fe06a762e5d85b3e827b3b88 (commit)
      from  80e0ecbf580e1455cdd6ccdb6f8f918295dca81c (commit)


- Log -----------------------------------------------------------------
commit 7ab09630cd069af0fe06a762e5d85b3e827b3b88
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Dec 23 09:45:02 2015 +0000

    Fix inline build failure
    
    After the recent change to use ossl_inline, builds were failing on some
    platforms due to a missing usage of "inline".
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 ssl/statem/statem_clnt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 733a683..e7c9413 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -164,7 +164,7 @@
 # include <openssl/engine.h>
 #endif
 
-static inline int cert_req_allowed(SSL *s);
+static ossl_inline int cert_req_allowed(SSL *s);
 static int key_exchange_expected(SSL *s);
 static int ssl_set_version(SSL *s);
 static int ca_dn_cmp(const X509_NAME *const *a, const X509_NAME *const *b);
@@ -179,7 +179,7 @@ static int ssl_cipher_list_to_bytes(SSL *s, STACK_OF(SSL_CIPHER) *sk,
  *  1: Yes
  *  0: No
  */
-static inline int cert_req_allowed(SSL *s)
+static ossl_inline int cert_req_allowed(SSL *s)
 {
     /* TLS does not like anon-DH with client cert */
     if ((s->version > SSL3_VERSION