Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 562050 | Differences between
and this patch

Collapse All | Expand All

(-)a/config.tests/unix/openssl11/openssl.cpp (-1 / +1 lines)
Lines 39-45 Link Here
39 

          39
          

        

        

          40
          
#include <openssl/opensslv.h>

          40
          
#include <openssl/opensslv.h>

        

        

          41
          

          41
          

        

          
            

              42
              
#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L


              42
              
#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)

            

        

          43
          
#  error "OpenSSL >= 1.1 is required"

          43
          
#  error "OpenSSL >= 1.1 is required"

        

        

          44
          
#endif

          44
          
#endif

        

        

          45
          

          45
          

        



(-)a/src/network/ssl/qsslcontext_openssl.cpp
      (-1 / +1 lines)




  

    
      
            Lines 248-254
          void QSslContext::applyBackendConfig(QSslContext *sslContext)
      
      
        Link Here
      
    
  

        

          248
          
    if (sslContext->sslConfiguration.backendConfiguration().isEmpty())

          248
          
    if (sslContext->sslConfiguration.backendConfiguration().isEmpty())

        

        

          249
          
        return;

          249
          
        return;

        

        

          250
          

          250
          

        

          
            

              251
              
#if OPENSSL_VERSION_NUMBER >= 0x10002000L


              251
              
#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)

            

        

          252
          
    if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) {

          252
          
    if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) {

        

        

          253
          
        QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);

          253
          
        QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);

        

        

          254
          
        if (cctx) {

          254
          
        if (cctx) {

        



(-)a/src/network/ssl/qsslsocket_openssl_symbols.cpp
      (-1 / +1 lines)




  

    
      
            Lines 402-408
          DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a, EVP_PKEY *b, b, return -
      
      
        Link Here
      
    
  

        

          402
          
DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)

          402
          
DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)

        

        

          403
          
DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)

          403
          
DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)

        

        

          404
          
DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return 0, return)

          404
          
DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return 0, return)

        

          
            

              405
              
#if OPENSSL_VERSION_NUMBER >= 0x10002000L


              405
              
#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)

            

        

          406
          
DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return 0, return);

          406
          
DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return 0, return);

        

        

          407
          
DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);

          407
          
DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);

        

        

          408
          
DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);

          408
          
DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);

        



(-)a/src/network/ssl/qsslsocket_openssl_symbols_p.h
      (-1 / +1 lines)




  

    
      
            Lines 352-358
          int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
      
      
        Link Here
      
    
  

        

          352
          
int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);

          352
          
int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);

        

        

          353
          
int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);

          353
          
int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);

        

        

          354
          
X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);

          354
          
X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);

        

          
            

              355
              
#if OPENSSL_VERSION_NUMBER >= 0x10002000L


              355
              
#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)

            

        

          356
          
SSL_CONF_CTX *q_SSL_CONF_CTX_new();

          356
          
SSL_CONF_CTX *q_SSL_CONF_CTX_new();

        

        

          357
          
void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);

          357
          
void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);

        

        

          358
          
void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);

          358
          
void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);

        






  

  Return to bug 562050